Merge pull request #41 from kmokstad/dump-if-profiling

Optional memory profiling

Author: kmokstad

fedem-foundation

@@ -49,6 +49,10 @@ if ( USE_MEMPOOL )
   string ( APPEND CMAKE_CXX_FLAGS " -DFT_USE_MEMPOOL" )
 endif ( USE_MEMPOOL )
 
+if ( USE_PROFILER )
+  string ( APPEND CMAKE_CXX_FLAGS " -DFT_USE_PROFILER" )
+endif ( USE_PROFILER )
+
 if ( USE_VISUALS )
   string ( APPEND CMAKE_CXX_FLAGS " -DFT_USE_VISUALS" )
 endif ( USE_VISUALS )

vpmDB/CMakeLists.txt

@@ -1464,6 +1464,13 @@ bool FmPart::importPart(const std::string& fileName,
 
   fileVersion = 1; // Don't care about file version on import
   nFENodesTotal += myFEData->getNodeCount();
+#ifdef FT_USE_PROFILER
+#ifdef FT_USE_CMDLINEARG
+  int memPoll = 0;
+  FFaCmdLineArg::instance()->getValue("memPoll",memPoll);
+  if (memPoll > 0) myFEData->dump(this->getLinkIDString(true));
+#endif
+#endif
 
   needsCSupdate.setValue(true);
   originalFEFile.setValue(newFEFile);
@@ -1509,16 +1516,6 @@ bool FmPart::importPart(const std::string& fileName,
   this->updateMassProperties();
   this->updateLoadCases();
 
-#ifdef FT_USE_CMDLINEARG
-  bool doMemPoll = false;
-  FFaCmdLineArg::instance()->getValue("memPoll",doMemPoll);
-  if (doMemPoll)
-  {
-    std::cout << this->getLinkIDString() << std::endl;
-    myFEData->dump();
-  }
-#endif
-
   // Check if the number of component modes was specified on the FE data file
   if (myFEData->getNumberOfGenDofs())
     nGenModes.setValue(myFEData->getNumberOfGenDofs());
@@ -1637,22 +1634,19 @@ bool FmPart::openFEData()
   {
     FFaMsg::list(" ...OK\n");
     nFENodesTotal += myFEData->getNodeCount();
+#ifdef FT_USE_PROFILER
+#ifdef FT_USE_CMDLINEARG
+    int memPoll = 0;
+    FFaCmdLineArg::instance()->getValue("memPoll",memPoll);
+    if (memPoll > 0) myFEData->dump(this->getLinkIDString(true));
+#endif
+#endif
 
     this->updateElemGroupProxies();
     this->updateMassProperties();
     this->updateLoadCases();
 
     savedCS.setValue(myFEData->calculateChecksum());
-
-#ifdef FT_USE_CMDLINEARG
-    bool doMemPoll = false;
-    FFaCmdLineArg::instance()->getValue("memPoll",doMemPoll);
-    if (doMemPoll)
-    {
-      std::cout << this->getLinkIDString() << std::endl;
-      myFEData->dump();
-    }
-#endif
   }
   else if (myFEData->isTooLarge())
   {

vpmDB/FmPart.C

@@ -264,7 +264,7 @@ std::string Fedem::createReducerInput(FmAnalysis* analysis,
   if (analysis->useRamSizeGSF.getValue())
   {
     // Use the out-of-core GSF equation solver
-    if (addOptions.find("-gsfSolver") != std::string::npos)
+    if (addOptions.find("-gsfSolver") == std::string::npos)
       fcoArgs.add("-gsfSolver",2);
     if (analysis->autoRamSizeGSF.getValue())
       fcoArgs.add("-cachesize",0);