Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
iMSTK
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ben Boeckel
iMSTK
Commits
d71faea9
Commit
d71faea9
authored
8 years ago
by
Sreekanth Arikatla
Browse files
Options
Downloads
Patches
Plain Diff
STYLE: Style changes to forceModelConfig class
Style changes to forceModelConfig class in class definitions
parent
8e4148c9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Base/ForceModel/imstkForceModelConfig.cpp
+9
-6
9 additions, 6 deletions
Base/ForceModel/imstkForceModelConfig.cpp
Base/ForceModel/imstkForceModelConfig.h
+2
-0
2 additions, 0 deletions
Base/ForceModel/imstkForceModelConfig.h
with
11 additions
and
6 deletions
Base/ForceModel/imstkForceModelConfig.cpp
+
9
−
6
View file @
d71faea9
...
...
@@ -37,7 +37,8 @@ ForceModelConfig::ForceModelConfig(const std::string &configFileName) : m_loadSu
}
};
bool
ForceModelConfig
::
parseConfig
(
const
std
::
string
&
configFileName
)
bool
ForceModelConfig
::
parseConfig
(
const
std
::
string
&
configFileName
)
{
vega
::
ConfigFile
vegaConfigFileOptions
;
ForceModelConfig
::
customOptionsList
optList
;
...
...
@@ -90,7 +91,8 @@ bool ForceModelConfig::parseConfig(const std::string &configFileName)
return
true
;
}
ForceModelType
ForceModelConfig
::
getForceModelType
()
ForceModelType
ForceModelConfig
::
getForceModelType
()
{
// Set up some variables
if
(
this
->
m_stringsOptionMap
[
"femMethod"
]
==
"StVK"
)
...
...
@@ -99,15 +101,15 @@ ForceModelType ForceModelConfig::getForceModelType()
}
else
if
(
this
->
m_stringsOptionMap
[
"femMethod"
]
==
"Corotational"
)
{
return
ForceModelType
::
StVK
;
return
ForceModelType
::
Corotational
;
}
else
if
(
this
->
m_stringsOptionMap
[
"femMethod"
]
==
"Linear"
)
{
return
ForceModelType
::
StVK
;
return
ForceModelType
::
Linear
;
}
else
if
(
this
->
m_stringsOptionMap
[
"femMethod"
]
==
"Invertible"
)
{
return
ForceModelType
::
StVK
;
return
ForceModelType
::
Invertible
;
}
else
{
...
...
@@ -116,7 +118,8 @@ ForceModelType ForceModelConfig::getForceModelType()
}
}
HyperElasticMaterialType
ForceModelConfig
::
getHyperelasticMaterialType
()
HyperElasticMaterialType
ForceModelConfig
::
getHyperelasticMaterialType
()
{
if
(
this
->
m_stringsOptionMap
[
"invertibleMaterial"
]
==
"StVK"
)
{
...
...
This diff is collapsed.
Click to expand it.
Base/ForceModel/imstkForceModelConfig.h
+
2
−
0
View file @
d71faea9
...
...
@@ -92,6 +92,7 @@ namespace imstk
/// numberOfThreads Number of threads spawned by the force model
/// [default = 0]
///
/// TODO: Convert this to input through JSON format
class
ForceModelConfig
{
// TODO: Do this in a better way
...
...
@@ -109,6 +110,7 @@ class ForceModelConfig
double
inversionThreshold
=
-
std
::
numeric_limits
<
double
>::
max
();
int
numberOfThreads
=
0
;
};
struct
customOptionsNameList
{
const
char
femMethodName
[
256
]
=
"femMethod"
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment