Commit 837d2d03 authored by Sreekanth Arikatla's avatar Sreekanth Arikatla
Browse files

STYLE: Enforce style

parent 33b874f5
...@@ -119,7 +119,7 @@ int main() ...@@ -119,7 +119,7 @@ int main()
// create a nonlinear system // create a nonlinear system
auto nlSystem = std::make_shared<NonLinearSystem>( auto nlSystem = std::make_shared<NonLinearSystem>(
dynaModel->getFunction(), dynaModel->getFunction(),
dynaModel->getFunctionGradient()); dynaModel->getFunctionGradient());
nlSystem->setUnknownVector(dynaModel->getUnknownVec()); nlSystem->setUnknownVector(dynaModel->getUnknownVec());
nlSystem->setUpdateFunction(dynaModel->getUpdateFunction()); nlSystem->setUpdateFunction(dynaModel->getUpdateFunction());
...@@ -128,7 +128,7 @@ int main() ...@@ -128,7 +128,7 @@ int main()
// create a linear solver // create a linear solver
auto linSolver = std::make_shared<ConjugateGradient>(); auto linSolver = std::make_shared<ConjugateGradient>();
if (linSolver->getType() == imstk::LinearSolver<imstk::SparseMatrixd>::Type::GaussSeidel && if (linSolver->getType() == imstk::LinearSolver<imstk::SparseMatrixd>::Type::GaussSeidel &&
dynaModel->isFixedBCImplemented()) dynaModel->isFixedBCImplemented())
{ {
LOG(WARNING) << "The GS solver may not be viable!"; LOG(WARNING) << "The GS solver may not be viable!";
......
...@@ -55,7 +55,7 @@ ForceModelConfig::parseConfig(const std::string &configFileName) ...@@ -55,7 +55,7 @@ ForceModelConfig::parseConfig(const std::string &configFileName)
vegaConfigFileOptions.addOptionOptional(optNameList.compressionResistanceName.c_str(), &optList.compressionResistance, optList.compressionResistance); vegaConfigFileOptions.addOptionOptional(optNameList.compressionResistanceName.c_str(), &optList.compressionResistance, optList.compressionResistance);
vegaConfigFileOptions.addOptionOptional(optNameList.inversionThresholdName.c_str(), &optList.inversionThreshold, optList.inversionThreshold); vegaConfigFileOptions.addOptionOptional(optNameList.inversionThresholdName.c_str(), &optList.inversionThreshold, optList.inversionThreshold);
vegaConfigFileOptions.addOptionOptional(optNameList.numberOfThreadsName.c_str(), &optList.numberOfThreads, optList.numberOfThreads); vegaConfigFileOptions.addOptionOptional(optNameList.numberOfThreadsName.c_str(), &optList.numberOfThreads, optList.numberOfThreads);
// Parse the configuration file // Parse the configuration file
if (vegaConfigFileOptions.parseOptions(configFileName.data()) != 0) if (vegaConfigFileOptions.parseOptions(configFileName.data()) != 0)
{ {
...@@ -76,7 +76,7 @@ ForceModelConfig::parseConfig(const std::string &configFileName) ...@@ -76,7 +76,7 @@ ForceModelConfig::parseConfig(const std::string &configFileName)
const size_t last_slash_idx = configFileName.rfind('/'); const size_t last_slash_idx = configFileName.rfind('/');
if (std::string::npos != last_slash_idx) if (std::string::npos != last_slash_idx)
{ {
rootDir = configFileName.substr(0, last_slash_idx); rootDir = configFileName.substr(0, last_slash_idx);
} }
// Store parsed string values // Store parsed string values
......
...@@ -165,7 +165,7 @@ FEMDeformableBodyModel::loadBoundaryConditions() ...@@ -165,7 +165,7 @@ FEMDeformableBodyModel::loadBoundaryConditions()
size_t index; size_t index;
auto maxAllowed = m_vegaPhysicsMesh->getNumVertices(); auto maxAllowed = m_vegaPhysicsMesh->getNumVertices();
while (!file.eof()) while (!file.eof())
{ {
file >> index; file >> index;
if (index < maxAllowed) if (index < maxAllowed)
{ {
...@@ -533,7 +533,7 @@ FEMDeformableBodyModel::applyBoundaryConditions(SparseMatrixd &M, const bool wit ...@@ -533,7 +533,7 @@ FEMDeformableBodyModel::applyBoundaryConditions(SparseMatrixd &M, const bool wit
} }
} }
} }
} }
} }
} }
...@@ -628,12 +628,12 @@ FEMDeformableBodyModel::getFunctionGradient() ...@@ -628,12 +628,12 @@ FEMDeformableBodyModel::getFunctionGradient()
// Gradient of the nonlinear objective function given the current state // Gradient of the nonlinear objective function given the current state
return [&, this](const Vectord &q)->const SparseMatrixd & return [&, this](const Vectord &q)->const SparseMatrixd &
{ {
this->computeImplicitSystemLHS(*m_previousState.get(), *m_currentState.get(), m_updateType); this->computeImplicitSystemLHS(*m_previousState.get(), *m_currentState.get(), m_updateType);
if(this->m_implementFixedBC) if(this->m_implementFixedBC)
{ {
applyBoundaryConditions(m_Keff); applyBoundaryConditions(m_Keff);
} }
return m_Keff; return m_Keff;
}; };
} }
......
...@@ -172,7 +172,7 @@ VTKRenderer::VTKRenderer(std::shared_ptr<Scene> scene, const bool enableVR) ...@@ -172,7 +172,7 @@ VTKRenderer::VTKRenderer(std::shared_ptr<Scene> scene, const bool enableVR)
#endif #endif
///TODO : based on scene properties ///TODO : based on scene properties
// Customize background colors // Customize background colors
//m_vtkRenderer->SetBackground(0.66,0.66,0.66); //m_vtkRenderer->SetBackground(0.66,0.66,0.66);
//m_vtkRenderer->SetBackground2(0.406, 0.481, 0.497); //m_vtkRenderer->SetBackground2(0.406, 0.481, 0.497);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment