Use the FMI 2.0 resources directory for info.json

Belonging to [master]:
  - #2525

Author: sjoelund

Compiler/Script/CevalScriptBackend.mo

@@ -3423,7 +3423,7 @@ protected function buildModelFMU " author: Frenkel TUD
   output Values.Value outValue;
 protected
   Boolean staticSourceCodeFMU, success;
-  String filenameprefix, fmutmp, logfile, dir;
+  String filenameprefix, fmutmp, logfile, dir, cmd;
   String fmuTargetName;
   GlobalScript.SimulationOptions defaulSimOpt;
   SimCode.SimulationSettings simSettings;
@@ -3494,6 +3494,15 @@ algorithm
   logfile := filenameprefix + ".log";
   dir := fmutmp+"/sources/";
 
+  if listEmpty(platforms) then
+    cmd := "rm -f \"" + filenameprefix + ".fmu\" && cd \"" +  fmutmp + "\" && zip -r \"../" + filenameprefix + ".fmu\" *";
+    if 0 <> System.systemCall(cmd, outFile=logfile) then
+      Error.addMessage(Error.SIMULATOR_BUILD_ERROR, {System.readFile(logfile)});
+      ExecStat.execStat("buildModelFMU failed for no platform");
+    end if;
+    return;
+  end if;
+
   for platform in platforms loop
     configureFMU(platform, fmutmp, logfile, isWindows);
     try

Compiler/SimCode/SimCodeMain.mo

@@ -543,7 +543,7 @@ algorithm
           generatedObjects := AvlSetString.add(generatedObjects, simCode.fileNamePrefix + str);
         end for;
         codegenFuncs := (function runTpl(func=function CodegenC.simulationFile_mixAndHeader(a_simCode=simCode, a_modelNamePrefix=simCode.fileNamePrefix))) :: codegenFuncs;
-        codegenFuncs := (function runTplWriteFile(func=function CodegenC.simulationFile(in_a_simCode=simCode, in_a_guid=guid, in_a_isModelExchangeFMU=false), file=simCode.fileNamePrefix + ".c")) :: codegenFuncs;
+        codegenFuncs := (function runTplWriteFile(func=function CodegenC.simulationFile(in_a_simCode=simCode, in_a_guid=guid, in_a_isModelExchangeFMU=""), file=simCode.fileNamePrefix + ".c")) :: codegenFuncs;
         codegenFuncs := (function runTplWriteFile(func=function CodegenC.simulationFunctionsFile(a_filePrefix=simCode.fileNamePrefix, a_functions=simCode.modelInfo.functions), file=simCode.fileNamePrefix + "_functions.c")) :: codegenFuncs;
 
         codegenFuncs := (function runToStr(func=function SerializeModelInfo.serialize(code=simCode, withOperations=Flags.isSet(Flags.INFO_XML_OPERATIONS)))) :: codegenFuncs;
@@ -673,6 +673,7 @@ algorithm
           end if;
         end if;
         Util.createDirectoryTree(fmutmp + "/sources/include/");
+        Util.createDirectoryTree(fmutmp + "/resources/");
         resourcesDir := fmutmp + "/resources/";
         for path in simCode.modelInfo.resourcePaths loop
           newdir := resourcesDir + System.dirname(path);
@@ -689,10 +690,16 @@ algorithm
         end for;
         SerializeModelInfo.serialize(simCode, Flags.isSet(Flags.INFO_XML_OPERATIONS));
         str := fmutmp + "/sources/" + simCode.fileNamePrefix;
-        b := System.covertTextFileToCLiteral(simCode.fileNamePrefix+"_info.json", str+"_info.c", Flags.getConfigString(Flags.TARGET));
-        if not b then
-          Error.addMessage(Error.INTERNAL_ERROR, {"System.covertTextFileToCLiteral failed. Could not write "+str+"_info.c\n"});
-          fail();
+        if FMUVersion == "1.0" then
+          b := System.covertTextFileToCLiteral(simCode.fileNamePrefix+"_info.json", str+"_info.c", Flags.getConfigString(Flags.TARGET));
+          if not b then
+            Error.addMessage(Error.INTERNAL_ERROR, {"System.covertTextFileToCLiteral failed. Could not write "+str+"_info.c\n"});
+            fail();
+          end if;
+        else
+          if 0 <> System.systemCall("mv '"+simCode.fileNamePrefix+"_info.json"+"' '" + fmutmp+"/resources/" + "'") then
+            Error.addInternalError("Failed to info.json file", sourceInfo());
+          end if;
         end if;
         SimCodeUtil.resetFunctionIndex();
         Tpl.tplNoret3(CodegenFMU.translateModel, simCode, FMUVersion, FMUType);

Compiler/Template/CodegenC.tpl

@@ -989,13 +989,13 @@ template simulationFile_inl(SimCode simCode)
       >>
 end simulationFile_inl;
 
-template simulationFile(SimCode simCode, String guid, Boolean isModelExchangeFMU)
+template simulationFile(SimCode simCode, String guid, String isModelExchangeFMU)
   "Generates code for main C file for simulation target."
 ::=
   match simCode
     case simCode as SIMCODE(modelInfo=MODELINFO(varInfo=varInfo as VARINFO(__)), hpcomData=HPCOMDATA(__)) then
     let modelNamePrefixStr = modelNamePrefix(simCode)
-    let mainInit = if boolOr(isModelExchangeFMU, boolOr(Flags.isSet(Flags.PARMODAUTO), Flags.isSet(HPCOM))) then
+    let mainInit = if boolOr(boolNot(stringEq("",isModelExchangeFMU)), boolOr(Flags.isSet(Flags.PARMODAUTO), Flags.isSet(HPCOM))) then
                      <<
                      mmc_init_nogc();
                      omc_alloc_interface = omc_alloc_interface_pooled;
@@ -1024,7 +1024,7 @@ template simulationFile(SimCode simCode, String guid, Boolean isModelExchangeFMU
     <%simulationFileHeader(simCode.fileNamePrefix)%>
     #include "simulation/solver/events.h"
 
-    <% if boolNot(isModelExchangeFMU) then
+    <% if stringEq("",isModelExchangeFMU) then
     <<
     #define prefixedName_performSimulation <%symbolName(modelNamePrefixStr,"performSimulation")%>
     #define prefixedName_updateContinuousSystem <%symbolName(modelNamePrefixStr,"updateContinuousSystem")%>
@@ -1139,7 +1139,7 @@ template simulationFile(SimCode simCode, String guid, Boolean isModelExchangeFMU
       return 1;
     }
 
-    <% if boolNot(isModelExchangeFMU) then
+    <% if stringEq("",isModelExchangeFMU) then
     <<
     #if defined(threadData)
     #undef threadData
@@ -1183,7 +1183,7 @@ template simulationFileHeader(String fileNamePrefix)
     >>
 end simulationFileHeader;
 
-template populateModelInfo(ModelInfo modelInfo, String fileNamePrefix, String guid, DelayedExpression delayed, Boolean isModelExchangeFMU)
+template populateModelInfo(ModelInfo modelInfo, String fileNamePrefix, String guid, DelayedExpression delayed, String isModelExchangeFMU)
   "Generates information for data.modelInfo struct."
 ::=
   match modelInfo
@@ -1195,7 +1195,8 @@ template populateModelInfo(ModelInfo modelInfo, String fileNamePrefix, String gu
     data->modelData->resultFileName = NULL;
     data->modelData->modelDir = "<%directory%>";
     data->modelData->modelGUID = "{<%guid%>}";
-    <% if isModelExchangeFMU then
+    <% match isModelExchangeFMU
+    case "1.0" then
     <<
     data->modelData->initXMLData = NULL;
     data->modelData->modelDataXml.infoXMLData =
@@ -1206,7 +1207,7 @@ template populateModelInfo(ModelInfo modelInfo, String fileNamePrefix, String gu
     #endif
     ;
     >>
-    else
+    case "" then
     <<
     #if defined(OPENMODELICA_XML_FROM_FILE_AT_RUNTIME)
     data->modelData->initXMLData = NULL;
@@ -1235,6 +1236,11 @@ template populateModelInfo(ModelInfo modelInfo, String fileNamePrefix, String gu
     #endif /* defined(_MSC_VER) */
     #endif /* defined(OPENMODELICA_XML_FROM_FILE_AT_RUNTIME) */
     >>
+    else
+    <<
+    data->modelData->initXMLData = NULL;
+    data->modelData->modelDataXml.infoXMLData = NULL;
+    >>
     %>
 
     data->modelData->nStates = <%varInfo.numStateVars%>;
@@ -1260,7 +1266,11 @@ template populateModelInfo(ModelInfo modelInfo, String fileNamePrefix, String gu
     data->modelData->nRelations = <%varInfo.numRelations%>;
     data->modelData->nMathEvents = <%varInfo.numMathEventFunctions%>;
     data->modelData->nExtObjs = <%varInfo.numExternalObjects%>;
-    data->modelData->modelDataXml.fileName = "<%fileNamePrefix%>_info.json";
+    <% match isModelExchangeFMU
+    case "1.0" then "data->modelData->modelDataXml.fileName = NULL;"
+    case "" then 'data->modelData->modelDataXml.fileName = "<%fileNamePrefix%>_info.json";'
+    else 'GC_asprintf(&data->modelData->modelDataXml.fileName, "%s/<%fileNamePrefix%>_info.json", data->modelData->resourcesDir);'
+    %>
     data->modelData->modelDataXml.modelInfoXmlLength = 0;
     data->modelData->modelDataXml.nFunctions = <%listLength(functions)%>;
     data->modelData->modelDataXml.nProfileBlocks = 0;
@@ -1285,7 +1295,7 @@ template populateModelInfo(ModelInfo modelInfo, String fileNamePrefix, String gu
   end match
 end populateModelInfo;
 
-template functionInitializeDataStruc(ModelInfo modelInfo, String fileNamePrefix, String guid, DelayedExpression delayed, String modelNamePrefix, Boolean isModelExchangeFMU)
+template functionInitializeDataStruc(ModelInfo modelInfo, String fileNamePrefix, String guid, DelayedExpression delayed, String modelNamePrefix, String isModelExchangeFMU)
   "Generates function in simulation file."
 ::=
   <<

Compiler/Template/CodegenFMU.tpl

@@ -72,7 +72,7 @@ case sc as SIMCODE(modelInfo=modelInfo as MODELINFO(__)) then
   let()= textFile(recordsFile(fileNamePrefix, recordDecls), '<%fileNamePrefixTmpDir%>_records.c')
   let()= textFile(simulationHeaderFile(simCode), '<%fileNamePrefixTmpDir%>_model.h')
 
-  let _ = generateSimulationFiles(simCode,guid,fileNamePrefixTmpDir)
+  let _ = generateSimulationFiles(simCode,guid,fileNamePrefixTmpDir,FMUVersion)
 
   let()= textFile(simulationInitFunction(simCode,guid), '<%fileNamePrefixTmpDir%>_init_fmu.c')
   let()= textFile(fmumodel_identifierFile(simCode,guid,FMUVersion), '<%fileNamePrefixTmpDir%>_FMU.c')
@@ -92,7 +92,7 @@ case sc as SIMCODE(modelInfo=modelInfo as MODELINFO(__)) then
   "" // Return empty result since result written to files directly
 end translateModel;
 
-/* public */ template generateSimulationFiles(SimCode simCode, String guid, String modelNamePrefix)
+/* public */ template generateSimulationFiles(SimCode simCode, String guid, String modelNamePrefix, String fmuVersion)
  "Generates code in different C files for the simulation target.
   To make the compilation faster we split the simulation files into several
   used in Compiler/Template/CodegenFMU.tpl"
@@ -172,7 +172,7 @@ end translateModel;
      // main file
      let()=tmpTickResetIndex(0, 0)
      let()=tmpTickResetIndex(0, 1)
-     let()= textFileConvertLines(simulationFile(simCode,guid,true), '<%modelNamePrefix%>.c')
+     let()= textFileConvertLines(simulationFile(simCode,guid,fmuVersion), '<%modelNamePrefix%>.c')
      ""
   end match
 end generateSimulationFiles;

SimulationRuntime/fmi/export/fmi2/fmu2_model_interface.c

@@ -439,6 +439,16 @@ fmi2Component fmi2Instantiate(fmi2String instanceName, fmi2Type fmuType, fmi2Str
   comp->componentEnvironment = functions->componentEnvironment;
   comp->loggingOn = loggingOn;
   comp->state = modelInstantiated;
+
+  /* Add the resourcesDir */
+  fmuResourceLocation = OpenModelica_parseFmuResourcePath(fmuResourceLocation);
+  if (fmuResourceLocation) {
+    comp->fmuData->modelData->resourcesDir = functions->allocateMemory(1 + strlen(fmuResourceLocation), sizeof(char));
+    strcpy(comp->fmuData->modelData->resourcesDir, fmuResourceLocation);
+  } else {
+    FILTERED_LOG(comp, fmi2OK, LOG_STATUSWARNING, "fmi2Instantiate: Ignoring unknown resource URI: %s", fmuResourceLocation)
+  }
+
   /* intialize modelData */
   fmu2_model_interface_setupDataStruc(comp->fmuData, comp->threadData);
   useStream[LOG_STDOUT] = 1;
@@ -453,14 +463,6 @@ fmi2Component fmi2Instantiate(fmi2String instanceName, fmi2Type fmuType, fmi2Str
   modelInfoInit(&(comp->fmuData->modelData->modelDataXml));
 #endif
 
-  /* Add the resourcesDir */
-  fmuResourceLocation = OpenModelica_parseFmuResourcePath(fmuResourceLocation);
-  if (fmuResourceLocation) {
-    comp->fmuData->modelData->resourcesDir = functions->allocateMemory(1 + strlen(fmuResourceLocation), sizeof(char));
-    strcpy(comp->fmuData->modelData->resourcesDir, fmuResourceLocation);
-  } else {
-    FILTERED_LOG(comp, fmi2OK, LOG_STATUSWARNING, "fmi2Instantiate: Ignoring unknown resource URI: %s", fmuResourceLocation)
-  }
   /* read input vars */
   /* input_function(comp->fmuData); */
 #if !defined(OMC_NUM_NONLINEAR_SYSTEMS) || OMC_NUM_NONLINEAR_SYSTEMS>0