Don't replace dots in fileNamePrefix for FMUs

Author: lochel

Compiler/Script/CevalScriptBackend.mo

@@ -3257,8 +3257,8 @@ protected function buildModelFMU " author: Frenkel TUD
   output GlobalScript.SymbolTable st;
 protected
   Boolean staticSourceCodeFMU;
-  String filenameprefix, fmutmp, thisplatform, cmd, logfile,
-         makefileStr, LIBS, dir;
+  String filenameprefix, fmutmp, logfile, dir;
+  String fmuTargetName;
   GlobalScript.SimulationOptions defaulSimOpt;
   SimCode.SimulationSettings simSettings;
   list<String> libs;
@@ -3285,11 +3285,12 @@ algorithm
     Error.addMessage(Error.FMU_EXPORT_NOT_SUPPORTED_CPP, {FMUType});
     FMUType := "me";
   end if;
-  filenameprefix := Util.stringReplaceChar(if inFileNamePrefix == "<default>" then Absyn.pathString(className) else inFileNamePrefix,".","_");
+  filenameprefix := Util.stringReplaceChar(if inFileNamePrefix == "<default>" then Absyn.pathString(className) else inFileNamePrefix, ".", "_");
+  fmuTargetName := if FMUVersion == "1.0" then filenameprefix else (if inFileNamePrefix == "<default>" then Absyn.pathString(className) else inFileNamePrefix);
   defaulSimOpt := buildSimulationOptionsFromModelExperimentAnnotation(st, className, filenameprefix, SOME(defaultSimulationOptions));
   simSettings := convertSimulationOptionsToSimCode(defaulSimOpt);
   try
-    (cache, outValue, st,_, libs,_, _) := SimCodeMain.translateModelFMU(cache, inEnv, className, st, FMUVersion, FMUType, filenameprefix, addDummy, simSettings);
+    (cache, outValue, st,_, libs,_, _) := SimCodeMain.translateModelFMU(cache, inEnv, className, st, FMUVersion, FMUType, filenameprefix, fmuTargetName, addDummy, simSettings);
   else
     outValue := Values.STRING("");
     return;

Compiler/SimCode/SimCode.mo

@@ -134,6 +134,7 @@ uniontype SimCode
     list<JacobianMatrix> jacobianMatrixes;
     Option<SimulationSettings> simulationSettingsOpt;
     String fileNamePrefix, fullPathPrefix "Used in FMI where files are generated in a special directory";
+    String fmuTargetName;
     HpcOmSimCode.HpcOmData hpcomData;
     //maps each variable to an array of storage indices (with this information, arrays must not be unrolled) and a list for the array-dimensions
     //if the variable is not part of an array (if it is a scalar value), then the array has size 1

Compiler/SimCode/SimCodeMain.mo

@@ -129,6 +129,7 @@ protected function generateModelCodeFMU "
   input String FMUVersion;
   input String FMUType;
   input String filenamePrefix;
+  input String fmuTargetName;
   input SimCode.SimulationSettings simSettings;
   output list<String> libs;
   output String fileDir;
@@ -151,7 +152,7 @@ algorithm
   (libs,libPaths,includes, includeDirs, recordDecls, functions, literals) :=
     SimCodeUtil.createFunctions(p, inBackendDAE);
   simCode := createSimCode(inBackendDAE, inInitDAE, inInitDAE_lambda0, NONE(), inRemovedInitialEquationLst,
-    className, filenamePrefix, fileDir, functions, includes, includeDirs, libs, libPaths, p, SOME(simSettings), recordDecls, literals, Absyn.FUNCTIONARGS({},{}), isFMU=true, FMUVersion=FMUVersion);
+    className, filenamePrefix, fileDir, functions, includes, includeDirs, libs, libPaths, p, SOME(simSettings), recordDecls, literals, Absyn.FUNCTIONARGS({},{}), isFMU=true, FMUVersion=FMUVersion, fmuTargetName=fmuTargetName);
   timeSimCode := System.realtimeTock(ClockIndexes.RT_CLOCK_SIMCODE);
   ExecStat.execStat("SimCode");
 
@@ -215,6 +216,7 @@ public function translateModelFMU
   input String inFMUVersion;
   input String inFMUType;
   input String inFileNamePrefix;
+  input String fmuTargetName;
   input Boolean addDummy "if true, add a dummy state";
   input SimCode.SimulationSettings inSimSettings;
   output FCore.Cache outCache;
@@ -274,7 +276,7 @@ algorithm
         timeBackend = System.realtimeTock(ClockIndexes.RT_CLOCK_BACKEND);
 
         (libs,file_dir,timeSimCode,timeTemplates) =
-          generateModelCodeFMU(dlow_1, initDAE, initDAE_lambda0, removedInitialEquationLst, p, className, FMUVersion, FMUType, filenameprefix, inSimSettings);
+          generateModelCodeFMU(dlow_1, initDAE, initDAE_lambda0, removedInitialEquationLst, p, className, FMUVersion, FMUType, filenameprefix, fmuTargetName, inSimSettings);
 
         //reset config flag
         Flags.setConfigBool(Flags.GENERATE_SYMBOLIC_LINEARIZATION, symbolicJacActivated);
@@ -289,7 +291,7 @@ algorithm
           ("timeFrontend", Values.REAL(timeFrontend))
           };
 
-        resstr = filenameprefix + ".fmu";
+        resstr = fmuTargetName + ".fmu";
         if not Config.getRunningTestsuite() then
           resstr = System.pwd() + System.pathDelimiter() + resstr;
         end if;
@@ -467,6 +469,7 @@ protected function createSimCode "
   input Absyn.FunctionArgs args;
   input Boolean isFMU=false;
   input String FMUVersion="";
+  input String fmuTargetName="";
   output SimCode.SimCode simCode;
 algorithm
   simCode := matchcontinue(inBackendDAE, inClassName, filenamePrefix, inString11, functions, externalFunctionIncludes, includeDirs, libs, libPaths, program,simSettingsOpt, recordDecls, literals, args)
@@ -505,7 +508,7 @@ algorithm
     then HpcOmSimCodeMain.createSimCode(inBackendDAE, inInitDAE, inInitDAE_lambda0, inRemovedInitialEquationLst, inClassName, filenamePrefix, inString11, functions, externalFunctionIncludes, includeDirs, libs, libPaths,program,simSettingsOpt, recordDecls, literals, args);
 
     else equation
-      (tmpSimCode, _) = SimCodeUtil.createSimCode(inBackendDAE, inInitDAE, inInitDAE_lambda0, inInlineData, inRemovedInitialEquationLst, inClassName, filenamePrefix, inString11, functions, externalFunctionIncludes, includeDirs, libs,libPaths,program, simSettingsOpt, recordDecls, literals, args, isFMU=isFMU, FMUVersion=FMUVersion);
+      (tmpSimCode, _) = SimCodeUtil.createSimCode(inBackendDAE, inInitDAE, inInitDAE_lambda0, inInlineData, inRemovedInitialEquationLst, inClassName, filenamePrefix, inString11, functions, externalFunctionIncludes, includeDirs, libs,libPaths,program, simSettingsOpt, recordDecls, literals, args, isFMU=isFMU, FMUVersion=FMUVersion, fmuTargetName=fmuTargetName);
     then tmpSimCode;
   end matchcontinue;
 end createSimCode;

Compiler/SimCode/SimCodeUtil.mo

@@ -166,6 +166,7 @@ public function createSimCode "entry point to create SimCode from BackendDAE."
   input Absyn.FunctionArgs args;
   input Boolean isFMU=false;
   input String FMUVersion="";
+  input String fmuTargetName="";
   output SimCode.SimCode simCode;
   output tuple<Integer, list<tuple<Integer, Integer>>> outMapping "the highest simEqIndex in the mapping and the mapping simEq-Index -> scc-Index itself";
 protected
@@ -566,6 +567,7 @@ algorithm
                               simSettingsOpt,
                               filenamePrefix,
                               if isFMU then (filenamePrefix+".fmutmp/sources/") else "",
+                              fmuTargetName,
                               HpcOmSimCode.emptyHpcomData,
                               varToArrayIndexMapping,
                               varToIndexMapping,

Compiler/Template/CodegenFMU.tpl

@@ -1038,7 +1038,7 @@ match simVar
 end SwitchAliasVarsSet;
 
 
-template getPlatformString2(String modelNamePrefix, String platform, String fileNamePrefix, String dirExtra, String libsPos1, String libsPos2, String omhome, String FMUVersion)
+template getPlatformString2(String modelNamePrefix, String platform, String fileNamePrefix, String fmuTargetName, String dirExtra, String libsPos1, String libsPos2, String omhome, String FMUVersion)
  "returns compilation commands for the platform. "
 ::=
 let fmudirname = '<%fileNamePrefix%>.fmutmp'
@@ -1067,7 +1067,7 @@ match platform
   <%\t%>cp <%omhome%>/bin/libgcc_s_*.dll ../binaries/<%platform%>/
   <%\t%>cp <%omhome%>/bin/libstdc*.dll ../binaries/<%platform%>/
   <%\t%>rm -f <%fileNamePrefix%>.def <%fileNamePrefix%>.o <%fileNamePrefix%>$(DLLEXT) $(OFILES) $(RUNTIMEFILES)
-  <%\t%>cd .. && rm -f ../<%fileNamePrefix%>.fmu && zip -r ../<%fileNamePrefix%>.fmu *
+  <%\t%>cd .. && rm -f ../<%fileNamePrefix%>.fmu && zip -r ../<%fmuTargetName%>.fmu *
 
   >>
   else
@@ -1086,7 +1086,7 @@ match platform
   <%\t%>cp <%fileNamePrefix%>.a <%fileNamePrefix%>_FMU.libs config.log make.log ../binaries/$(FMIPLATFORM)/
   endif
   <%\t%>$(MAKE) distclean
-  <%\t%>cd .. && rm -f ../<%fileNamePrefix%>.fmu && zip -r ../<%fileNamePrefix%>.fmu *
+  <%\t%>cd .. && rm -f ../<%fileNamePrefix%>.fmu && zip -r ../<%fmuTargetName%>.fmu *
   distclean: clean
   <%\t%>rm -f Makefile config.status config.log make.log
   clean:
@@ -1132,7 +1132,7 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
     '<%match s.method
        case "inline-euler" then "-D_OMC_INLINE_EULER"
        case "inline-rungekutta" then "-D_OMC_INLINE_RK"%>'
-  let compilecmds = getPlatformString2(modelNamePrefix(simCode), makefileParams.platform, fileNamePrefix, dirExtra, libsPos1, libsPos2, makefileParams.omhome, FMUVersion)
+  let compilecmds = getPlatformString2(modelNamePrefix(simCode), makefileParams.platform, fileNamePrefix, fmuTargetName, dirExtra, libsPos1, libsPos2, makefileParams.omhome, FMUVersion)
   let mkdir = match makefileParams.platform case "win32" case "win64" then '"mkdir.exe"' else 'mkdir'
   <<
   # Makefile generated by OpenModelica
@@ -1190,7 +1190,7 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
       copy <%stringReplace(makefileParams.omhome,"/","\\")%>\bin\LAPACK_WIN32_MT.DLL <%fmudirname%>\binaries\$(PLATWIN32)
       copy <%stringReplace(makefileParams.omhome,"/","\\")%>\bin\pthreadVC2.dll <%fmudirname%>\binaries\$(PLATWIN32)
       cd <%fmudirname%>
-      "zip.exe" -r ../<%fileNamePrefix%>.fmu *
+      "zip.exe" -r ../<%fmuTargetName%>.fmu *
       cd ..
       rm -rf <%fmudirname%>
 
@@ -1209,7 +1209,7 @@ case SIMCODE(modelInfo=MODELINFO(varInfo=varInfo as VARINFO(__)), delayedExps=DE
     '<%match s.method
        case "inline-euler" then "-D_OMC_INLINE_EULER"
        case "inline-rungekutta" then "-D_OMC_INLINE_RK"%>'
-  let compilecmds = getPlatformString2(modelNamePrefix(simCode), makefileParams.platform, fileNamePrefix, dirExtra, libsPos1, libsPos2, makefileParams.omhome, FMUVersion)
+  let compilecmds = getPlatformString2(modelNamePrefix(simCode), makefileParams.platform, fileNamePrefix, fmuTargetName, dirExtra, libsPos1, libsPos2, makefileParams.omhome, FMUVersion)
   let platformstr = makefileParams.platform
   <<
   # Makefile generated by OpenModelica

Compiler/Template/SimCodeTV.mo

@@ -345,6 +345,7 @@ package SimCode
       Option<SimulationSettings> simulationSettingsOpt;
       String fileNamePrefix;
       String fullPathPrefix; // Used for FMI where code is not generated in the same directory
+      String fmuTargetName;
       HpcOmSimCode.HpcOmData hpcomData;
       HashTableCrIListArray.HashTable varToArrayIndexMapping;
       Option<FmiModelStructure> modelStructure;