diff --git a/fedem-foundation b/fedem-foundation index 4edfe42..deca2cd 160000 --- a/fedem-foundation +++ b/fedem-foundation @@ -1 +1 @@ -Subproject commit 4edfe42fef261eef1a8eb4fc7cfdd6197ad4d131 +Subproject commit deca2cd33eb8c9e3fd994e21a5cc9e169b8aafc7 diff --git a/vpmDB/FmDB.C b/vpmDB/FmDB.C index 963d0f9..dfd561c 100644 --- a/vpmDB/FmDB.C +++ b/vpmDB/FmDB.C @@ -8,7 +8,6 @@ #include #include #include -#include #include "vpmDB/FmDB.H" #include "vpmDB/FmQuery.H" @@ -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(¤tTime); - } + os << "!Last saved: #"<< ++ourSaveNr <<", " + << FFaAppInfo::getUser() <<", "<< FFaAppInfo::getDate() <<"\n"; if (metaData) os << metaData <<"\n"; os <<"\n"; diff --git a/vpmDB/FmPart.C b/vpmDB/FmPart.C index bfdaa2a..85d4187 100644 --- a/vpmDB/FmPart.C +++ b/vpmDB/FmPart.C @@ -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() }); }