Skip to content
Snippets Groups Projects
Commit d71faea9 authored by Sreekanth Arikatla's avatar Sreekanth Arikatla
Browse files

STYLE: Style changes to forceModelConfig class

Style changes to forceModelConfig class in class definitions
parent 8e4148c9
No related branches found
No related tags found
No related merge requests found
......@@ -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")
{
......
......@@ -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";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment