Update test fmu to fix addResources3.lua (#1373)

OpenModelica · Nov 22, 2024 · 06e807b · 06e807b
1 parent 4bf603a
commit 06e807b
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 84 deletions.
diff --git a/testsuite/resources/Modelica.Blocks.Math.Add/binaries/linux32/Modelica_Blocks_Math_Add.so b/testsuite/resources/Modelica.Blocks.Math.Add/binaries/linux32/Modelica_Blocks_Math_Add.so
diff --git a/testsuite/resources/Modelica.Blocks.Math.Add/binaries/linux64/Add.so b/testsuite/resources/Modelica.Blocks.Math.Add/binaries/linux64/Add.so
diff --git a/testsuite/resources/Modelica.Blocks.Math.Add/binaries/linux64/Modelica_Blocks_Math_Add.so b/testsuite/resources/Modelica.Blocks.Math.Add/binaries/linux64/Modelica_Blocks_Math_Add.so
diff --git a/testsuite/resources/Modelica.Blocks.Math.Add/binaries/win32/Modelica_Blocks_Math_Add.dll b/testsuite/resources/Modelica.Blocks.Math.Add/binaries/win32/Modelica_Blocks_Math_Add.dll
diff --git a/testsuite/resources/Modelica.Blocks.Math.Add/binaries/win64/Add.dll b/testsuite/resources/Modelica.Blocks.Math.Add/binaries/win64/Add.dll
diff --git a/testsuite/resources/Modelica.Blocks.Math.Add/binaries/win64/Modelica_Blocks_Math_Add.dll b/testsuite/resources/Modelica.Blocks.Math.Add/binaries/win64/Modelica_Blocks_Math_Add.dll
diff --git a/testsuite/resources/Modelica.Blocks.Math.Add/binaries/win64/libAdd.dll.a b/testsuite/resources/Modelica.Blocks.Math.Add/binaries/win64/libAdd.dll.a
diff --git a/testsuite/resources/Modelica.Blocks.Math.Add/modelDescription.xml b/testsuite/resources/Modelica.Blocks.Math.Add/modelDescription.xml
@@ -2,51 +2,56 @@
 <fmiModelDescription
   fmiVersion="2.0"
   modelName="Modelica.Blocks.Math.Add"
-  guid="{fa787466-7a5f-4234-a734-110a879de4d8}"
+  guid="{cd0c7f5c-7207-487a-a799-568823ee5a97}"
   description="Output the sum of the two inputs"
-  generationTool="OpenModelica Compiler OMCompiler v1.18.0-dev.192+gc2d2d8d45f"
-  generationDateAndTime="2021-03-29T14:06:28Z"
+  version=""
+  generationTool="OpenModelica Compiler OpenModelica v1.24.2 (64-bit)"
+  generationDateAndTime="2024-11-22T14:57:25Z"
   variableNamingConvention="structured"
   numberOfEventIndicators="0">
   <ModelExchange
-    modelIdentifier="Modelica_Blocks_Math_Add">
+    modelIdentifier="Add"
+    needsExecutionTool="false"
+    completedIntegratorStepNotNeeded="false"
+    canBeInstantiatedOnlyOncePerProcess="false"
+    canNotUseMemoryManagementFunctions="false"
+    canGetAndSetFMUstate="false"
+    canSerializeFMUstate="false"
+    providesDirectionalDerivative="false">
     <SourceFiles>
-      <File name="Modelica_Blocks_Math_Add.c" />
-      <File name="Modelica_Blocks_Math_Add_functions.c" />
-      <File name="Modelica_Blocks_Math_Add_records.c" />
-      <File name="Modelica_Blocks_Math_Add_01exo.c" />
-      <File name="Modelica_Blocks_Math_Add_02nls.c" />
-      <File name="Modelica_Blocks_Math_Add_03lsy.c" />
-      <File name="Modelica_Blocks_Math_Add_04set.c" />
-      <File name="Modelica_Blocks_Math_Add_05evt.c" />
-      <File name="Modelica_Blocks_Math_Add_06inz.c" />
-      <File name="Modelica_Blocks_Math_Add_07dly.c" />
-      <File name="Modelica_Blocks_Math_Add_08bnd.c" />
-      <File name="Modelica_Blocks_Math_Add_09alg.c" />
-      <File name="Modelica_Blocks_Math_Add_10asr.c" />
-      <File name="Modelica_Blocks_Math_Add_11mix.c" />
-      <File name="Modelica_Blocks_Math_Add_12jac.c" />
-      <File name="Modelica_Blocks_Math_Add_13opt.c" />
-      <File name="Modelica_Blocks_Math_Add_14lnz.c" />
-      <File name="Modelica_Blocks_Math_Add_15syn.c" />
-      <File name="Modelica_Blocks_Math_Add_16dae.c" />
-      <File name="Modelica_Blocks_Math_Add_17inl.c" />
-      <File name="Modelica_Blocks_Math_Add_18spd.c" />
-      <File name="Modelica_Blocks_Math_Add_init_fmu.c" />
-      <File name="Modelica_Blocks_Math_Add_FMU.c" />
-      <File name="./util/read_matlab4.c" />
-      <File name="./util/read_csv.c" />
-      <File name="./util/libcsv.c" />
-      <File name="gc/memory_pool.c" />
-      <File name="gc/omc_gc.c" />
+      <File name="Add.c" />
+      <File name="Add_functions.c" />
+      <File name="Add_records.c" />
+      <File name="Add_01exo.c" />
+      <File name="Add_02nls.c" />
+      <File name="Add_03lsy.c" />
+      <File name="Add_04set.c" />
+      <File name="Add_05evt.c" />
+      <File name="Add_06inz.c" />
+      <File name="Add_07dly.c" />
+      <File name="Add_08bnd.c" />
+      <File name="Add_09alg.c" />
+      <File name="Add_10asr.c" />
+      <File name="Add_11mix.c" />
+      <File name="Add_12jac.c" />
+      <File name="Add_13opt.c" />
+      <File name="Add_14lnz.c" />
+      <File name="Add_15syn.c" />
+      <File name="Add_16dae.c" />
+      <File name="Add_17inl.c" />
+      <File name="Add_18spd.c" />
+      <File name="Add_init_fmu.c" />
+      <File name="Add_FMU.c" />
+      <File name="./gc/memory_pool.c" />
+      <File name="./gc/omc_gc.c" />
       <File name="./util/base_array.c" />
       <File name="./util/boolean_array.c" />
+      <File name="./util/context.c" />
       <File name="./util/division.c" />
       <File name="./util/doubleEndedList.c" />
       <File name="./util/generic_array.c" />
       <File name="./util/index_spec.c" />
       <File name="./util/integer_array.c" />
-      <File name="./util/jacobian_util.c" />
       <File name="./util/list.c" />
       <File name="./util/modelica_string_lit.c" />
       <File name="./util/modelica_string.c" />
@@ -66,6 +71,7 @@
       <File name="./util/utility.c" />
       <File name="./util/varinfo.c" />
       <File name="./math-support/pivot.c" />
+      <File name="./simulation/jacobian_util.c" />
       <File name="./simulation/omc_simulation_util.c" />
       <File name="./simulation/options.c" />
       <File name="./simulation/simulation_info_json.c" />
@@ -82,54 +88,51 @@
     </SourceFiles>
   </ModelExchange>
   <CoSimulation
-    modelIdentifier="Modelica_Blocks_Math_Add"
+    modelIdentifier="Add"
     needsExecutionTool="false"
     canHandleVariableCommunicationStepSize="true"
-    canInterpolateInputs="false"
-    maxOutputDerivativeOrder="0"
+    canInterpolateInputs="true"
+    maxOutputDerivativeOrder="1"
     canRunAsynchronuously = "false"
     canBeInstantiatedOnlyOncePerProcess="false"
     canNotUseMemoryManagementFunctions="false"
     canGetAndSetFMUstate="false"
     canSerializeFMUstate="false"
-    >
+    providesDirectionalDerivative="false">
     <SourceFiles>
-      <File name="Modelica_Blocks_Math_Add.c" />
-      <File name="Modelica_Blocks_Math_Add_functions.c" />
-      <File name="Modelica_Blocks_Math_Add_records.c" />
-      <File name="Modelica_Blocks_Math_Add_01exo.c" />
-      <File name="Modelica_Blocks_Math_Add_02nls.c" />
-      <File name="Modelica_Blocks_Math_Add_03lsy.c" />
-      <File name="Modelica_Blocks_Math_Add_04set.c" />
-      <File name="Modelica_Blocks_Math_Add_05evt.c" />
-      <File name="Modelica_Blocks_Math_Add_06inz.c" />
-      <File name="Modelica_Blocks_Math_Add_07dly.c" />
-      <File name="Modelica_Blocks_Math_Add_08bnd.c" />
-      <File name="Modelica_Blocks_Math_Add_09alg.c" />
-      <File name="Modelica_Blocks_Math_Add_10asr.c" />
-      <File name="Modelica_Blocks_Math_Add_11mix.c" />
-      <File name="Modelica_Blocks_Math_Add_12jac.c" />
-      <File name="Modelica_Blocks_Math_Add_13opt.c" />
-      <File name="Modelica_Blocks_Math_Add_14lnz.c" />
-      <File name="Modelica_Blocks_Math_Add_15syn.c" />
-      <File name="Modelica_Blocks_Math_Add_16dae.c" />
-      <File name="Modelica_Blocks_Math_Add_17inl.c" />
-      <File name="Modelica_Blocks_Math_Add_18spd.c" />
-      <File name="Modelica_Blocks_Math_Add_init_fmu.c" />
-      <File name="Modelica_Blocks_Math_Add_FMU.c" />
-      <File name="./util/read_matlab4.c" />
-      <File name="./util/read_csv.c" />
-      <File name="./util/libcsv.c" />
-      <File name="gc/memory_pool.c" />
-      <File name="gc/omc_gc.c" />
+      <File name="Add.c" />
+      <File name="Add_functions.c" />
+      <File name="Add_records.c" />
+      <File name="Add_01exo.c" />
+      <File name="Add_02nls.c" />
+      <File name="Add_03lsy.c" />
+      <File name="Add_04set.c" />
+      <File name="Add_05evt.c" />
+      <File name="Add_06inz.c" />
+      <File name="Add_07dly.c" />
+      <File name="Add_08bnd.c" />
+      <File name="Add_09alg.c" />
+      <File name="Add_10asr.c" />
+      <File name="Add_11mix.c" />
+      <File name="Add_12jac.c" />
+      <File name="Add_13opt.c" />
+      <File name="Add_14lnz.c" />
+      <File name="Add_15syn.c" />
+      <File name="Add_16dae.c" />
+      <File name="Add_17inl.c" />
+      <File name="Add_18spd.c" />
+      <File name="Add_init_fmu.c" />
+      <File name="Add_FMU.c" />
+      <File name="./gc/memory_pool.c" />
+      <File name="./gc/omc_gc.c" />
       <File name="./util/base_array.c" />
       <File name="./util/boolean_array.c" />
+      <File name="./util/context.c" />
       <File name="./util/division.c" />
       <File name="./util/doubleEndedList.c" />
       <File name="./util/generic_array.c" />
       <File name="./util/index_spec.c" />
       <File name="./util/integer_array.c" />
-      <File name="./util/jacobian_util.c" />
       <File name="./util/list.c" />
       <File name="./util/modelica_string_lit.c" />
       <File name="./util/modelica_string.c" />
@@ -149,6 +152,7 @@
       <File name="./util/utility.c" />
       <File name="./util/varinfo.c" />
       <File name="./math-support/pivot.c" />
+      <File name="./simulation/jacobian_util.c" />
       <File name="./simulation/omc_simulation_util.c" />
       <File name="./simulation/options.c" />
       <File name="./simulation/simulation_info_json.c" />
@@ -177,7 +181,7 @@
     <Category name="logAll" />
     <Category name="logFmi2Call" />
   </LogCategories>
-  <DefaultExperiment startTime="0.0" stopTime="1.0" tolerance="1e-06"/>
+  <DefaultExperiment startTime="0.0" stopTime="1.0" tolerance="1e-6" stepSize="0.002"/>
   <ModelVariables>
   <!-- Index of variable = "1" -->
   <ScalarVariable

diff --git a/testsuite/resources/Modelica.Blocks.Math.Add/resources/Modelica_Blocks_Math_Add_info.json b/testsuite/resources/Modelica.Blocks.Math.Add/resources/Modelica_Blocks_Math_Add_info.json
diff --git a/testsuite/simulation/addResources3.lua b/testsuite/simulation/addResources3.lua
@@ -4,6 +4,7 @@
 -- ucrt64: yes
 -- win: yes
 -- mac: no
+-- asan: yes
 
 oms_setCommandLineOption("--suppressPath=true")
 oms_setTempDirectory("./addResources3_lua/")
@@ -17,6 +18,7 @@ oms_addSystem("addResources.root", oms_system_wc)
 oms_addSystem("addResources.root.system1", oms_system_sc);
 oms_addConnector("addResources.root.system1.C1", oms_causality_input, oms_signal_type_real)
 oms_addConnector("addResources.root.system1.C2", oms_causality_input, oms_signal_type_real)
+
 -- add root resources
 oms_newResources("addResources.root.system1:system1.ssv")
 
@@ -26,7 +28,6 @@ oms_setReal("addResources.root.system1.C2", -20.5)
 oms_addSubModel("addResources.root.system1.add", "../../resources/Modelica.Blocks.Math.Add.fmu")
 oms_setReal("addResources.root.system1.add.k1", 45)
 
-
 oms_addSystem("addResources.root.system2", oms_system_sc);
 
 oms_addConnector("addResources.root.system2.C1", oms_causality_input, oms_signal_type_real)
@@ -45,7 +46,6 @@ oms_setResultFile("addResources", "addResources3.mat", 10)
 src = oms_exportSnapshot("addResources")
 print(src)
 
-
 print("info:    Virgin Parameter settings")
 print("info:      addResources.root.system1.C1      : " .. oms_getReal("addResources.root.system1.C1"))
 print("info:      addResources.root.system1.C2      : " .. oms_getReal("addResources.root.system1.C2"))