Skip to content

Optional memory profiling #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kmokstad merged 3 commits into from
Jan 25, 2026
Merged

Optional memory profiling #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6a1c74
Fixup for commit 76356beab734374e14b40a2c8c1d46cae5911de4
kmokstad Jan 21, 2026
3485f3a
Invoke FFlLinkHandler::dump() only if FT_USE_PROFILER is defined,
kmokstad Jan 23, 2026
17f484f
Update submodule reference
kmokstad Jan 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fedem-foundation
Open in desktop
Submodule fedem-foundation updated 10 files
+1 −1 cfg/VERSION
+3 −3 src/FFlLib/FFlLinkHandler.C
+1 −1 src/FFlLib/FFlLinkHandler.H
+15 −5 src/FFlrLib/FFlrFringeCreator.C
+1 −1 src/FFlrLib/FFlrFringeCreator.H
+25 −17 src/FFrLib/FFrExtractor.C
+9 −7 src/FFrLib/FFrExtractor.H
+2 −2 src/FFrLib/FFrExtractor_F.C
+31 −17 src/FFrLib/FFrResultContainer.C
+9 −9 src/FFrLib/FFrResultContainer.H
4 changes: 4 additions & 0 deletions vpmDB/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
34 changes: 14 additions & 20 deletions vpmDB/FmPart.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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())
{
Expand Down
2 changes: 1 addition & 1 deletion vpmDB/FmSolverInput.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down