Skip to content

Use new FFaAppInfo functions, including username in fmm-file meta data #49

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 1 commit into from
May 9, 2026
Merged

Use new FFaAppInfo functions, including username in fmm-file meta data #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 52 files
+1 −1 .github/workflows/run-test.yml
+10 −2 CMakeLists.txt
+1 −1 cfg/VERSION
+5 −5 src/FFaFunctionLib/CMakeLists.txt
+40 −47 src/FFaFunctionLib/FFaFunctionManager.H
+5 −5 src/FFaLib/CMakeLists.txt
+5 −7 src/FFaLib/FFaAlgebra/FFaAlgebra.H
+59 −64 src/FFaLib/FFaAlgebra/FFaVolume.C
+30 −46 src/FFaLib/FFaAlgebra/FFaVolume.H
+76 −40 src/FFaLib/FFaDefinitions/FFaAppInfo.C
+24 −32 src/FFaLib/FFaDefinitions/FFaAppInfo.H
+2 −2 src/FFaLib/FFaTests/CMakeLists.txt
+2 −2 src/FFaMathExpr/CMakeLists.txt
+58 −112 src/FFaMathExpr/FFaMathExpr.C
+55 −37 src/FFaMathExpr/FFaMathOps.C
+37 −40 src/FFaMathExpr/FFaMathOps.H
+17 −28 src/FFlLib/CMakeLists.txt
+1 −1 src/FFlLib/FFlIOAdaptors/CMakeLists.txt
+12 −0 src/FFlLib/FFlLinkHandler.C
+2 −1 src/FFlLib/FFlLinkHandler.H
+18 −8 src/FFlLib/FFlTests/CMakeLists.txt
+1 −0 src/FFlLib/FFlTests/main.C
+3,829 −0 src/FFlLib/FFlTests/models/Bucket.flm
+4,304 −0 src/FFlLib/FFlTests/models/BucketLink.flm
+528 −0 src/FFlLib/FFlTests/models/CHEXA08_.nas
+293 −0 src/FFlLib/FFlTests/models/CHEXA20_.nas
+490 −0 src/FFlLib/FFlTests/models/CPENTA06_.nas
+433 −0 src/FFlLib/FFlTests/models/CPENTA15_.nas
+146 −0 src/FFlLib/FFlTests/models/CQUAD04_.nas
+122 −0 src/FFlLib/FFlTests/models/CQUAD08_.nas
+1,588 −0 src/FFlLib/FFlTests/models/CTETRA04_.nas
+668 −0 src/FFlLib/FFlTests/models/CTETRA10_.nas
+178 −0 src/FFlLib/FFlTests/models/CTRIA03_.nas
+138 −0 src/FFlLib/FFlTests/models/CTRIA06_.nas
+188 −0 src/FFlLib/FFlTests/testFFlVis.C
+1 −2 src/FFlLib/FFlVisualization/FFlFaceGenerator.C
+0 −1 src/FFlLib/FFlVisualization/FFlFaceGenerator.H
+264 −405 src/FFlLib/FFlVisualization/FFlGroupPartCreator.C
+17 −28 src/FFlLib/FFlVisualization/FFlGroupPartCreator.H
+190 −262 src/FFlLib/FFlVisualization/FFlTesselator.C
+12 −42 src/FFlLib/FFlVisualization/FFlTesselator.H
+69 −22 src/FFlLib/FFlVisualization/FFlVisEdge.C
+21 −18 src/FFlLib/FFlVisualization/FFlVisEdge.H
+110 −66 src/FFlLib/FFlVisualization/FFlVisFace.C
+11 −5 src/FFlLib/FFlVisualization/FFlVisFace.H
+11 −7 src/FFpLib/CMakeLists.txt
+63 −53 src/FFpLib/FFpCurveData/FFpFourier.C
+5 −29 src/FFpLib/FFpCurveData/FFpFourier.H
+5 −2 src/FFrLib/CMakeLists.txt
+2 −2 src/FiDeviceFunctions/CMakeLists.txt
+3 −4 src/FiDeviceFunctions/FiASCFile.C
+3 −4 src/FiDeviceFunctions/FiCurveASCFile.C
9 changes: 3 additions & 6 deletions vpmDB/FmDB.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include <algorithm>
#include <functional>
#include <fstream>
#include <ctime>

#include "vpmDB/FmDB.H"
#include "vpmDB/FmQuery.H"
Expand Down Expand Up @@ -1521,13 +1520,11 @@ bool FmDB::reportAll(std::ostream& os, bool writeMetaData,

// Writing the model file
os <<"FEDEMMODELFILE {" << FedemAdmin::getVersion() <<" ASCII}\n";
os <<"!Module version: "<< FedemAdmin::getVersion() <<" "<< FedemAdmin::getBuildDate() <<"\n";
os <<"!Module version: "<< FFaAppInfo::getVersion() <<"\n";
os <<"!Model file name: "<< FmDB::getMechanismObject()->getModelFileName() <<"\n";
if (writeMetaData)
{
const time_t currentTime = time(NULL);
os <<"!Last saved: #"<< ++ourSaveNr <<", "<< ctime(&currentTime);
}
os << "!Last saved: #"<< ++ourSaveNr <<", "
<< FFaAppInfo::getUser() <<", "<< FFaAppInfo::getDate() <<"\n";
if (metaData)
os << metaData <<"\n";
os <<"\n";
Expand Down
5 changes: 2 additions & 3 deletions vpmDB/FmPart.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1985,13 +1985,12 @@ bool FmPart::exportPart(const std::string& ftlFile, bool extNodeInfo,
if (noMetaData)
return fedemwriter.write(ftlFile,extNodeInfo,withCheckSum);

FFaAppInfo current;
return fedemwriter.write(ftlFile,extNodeInfo,withCheckSum,{
"Fedem version: " + current.version,
"Fedem version: " + FFaAppInfo::getVersion(),
"Original FE data: " + originalFEFile.getValue(),
"This file: " + ftlFile,
"Model file: " + FmDB::getMechanismObject()->getModelFileName(),
"Written by: " + current.user + ", " + current.date});
"Written by: " + FFaAppInfo::getUser() + ", " + FFaAppInfo::getDate() });
}


Expand Down
Loading