Update Modelica.Blocks.Math.Gain.fmu (#1377)

OpenModelica · Nov 23, 2024 · 336e4d2 · 336e4d2
1 parent 28ea27a
commit 336e4d2
Show file tree

Hide file tree

Showing 15 changed files with 77 additions and 84 deletions.
diff --git a/testsuite/resources/Modelica.Blocks.Math.Gain/binaries/linux32/Modelica_Blocks_Math_Gain.so b/testsuite/resources/Modelica.Blocks.Math.Gain/binaries/linux32/Modelica_Blocks_Math_Gain.so
diff --git a/testsuite/resources/Modelica.Blocks.Math.Gain/binaries/linux64/Gain.so b/testsuite/resources/Modelica.Blocks.Math.Gain/binaries/linux64/Gain.so
diff --git a/testsuite/resources/Modelica.Blocks.Math.Gain/binaries/linux64/Modelica_Blocks_Math_Gain.so b/testsuite/resources/Modelica.Blocks.Math.Gain/binaries/linux64/Modelica_Blocks_Math_Gain.so
diff --git a/testsuite/resources/Modelica.Blocks.Math.Gain/binaries/win32/Modelica_Blocks_Math_Gain.dll b/testsuite/resources/Modelica.Blocks.Math.Gain/binaries/win32/Modelica_Blocks_Math_Gain.dll
diff --git a/testsuite/resources/Modelica.Blocks.Math.Gain/binaries/win64/Gain.dll b/testsuite/resources/Modelica.Blocks.Math.Gain/binaries/win64/Gain.dll
diff --git a/testsuite/resources/Modelica.Blocks.Math.Gain/binaries/win64/Modelica_Blocks_Math_Gain.dll b/testsuite/resources/Modelica.Blocks.Math.Gain/binaries/win64/Modelica_Blocks_Math_Gain.dll
diff --git a/testsuite/resources/Modelica.Blocks.Math.Gain/binaries/win64/libGain.dll.a b/testsuite/resources/Modelica.Blocks.Math.Gain/binaries/win64/libGain.dll.a
diff --git a/testsuite/resources/Modelica.Blocks.Math.Gain/modelDescription.xml b/testsuite/resources/Modelica.Blocks.Math.Gain/modelDescription.xml
@@ -2,51 +2,56 @@
 <fmiModelDescription
   fmiVersion="2.0"
   modelName="Modelica.Blocks.Math.Gain"
-  guid="{406bd580-5d65-43ae-81f9-74307c12a743}"
+  guid="{d33d4ade-f086-45f0-a635-5c30e6b2b06a}"
   description="Output the product of a gain value with the input signal"
-  generationTool="OpenModelica Compiler OMCompiler v1.18.0-dev.192+gc2d2d8d45f"
-  generationDateAndTime="2021-03-29T14:07:06Z"
+  version=""
+  generationTool="OpenModelica Compiler OpenModelica v1.24.2 (64-bit)"
+  generationDateAndTime="2024-11-23T12:49:07Z"
   variableNamingConvention="structured"
   numberOfEventIndicators="0">
   <ModelExchange
-    modelIdentifier="Modelica_Blocks_Math_Gain">
+    modelIdentifier="Gain"
+    needsExecutionTool="false"
+    completedIntegratorStepNotNeeded="false"
+    canBeInstantiatedOnlyOncePerProcess="false"
+    canNotUseMemoryManagementFunctions="false"
+    canGetAndSetFMUstate="false"
+    canSerializeFMUstate="false"
+    providesDirectionalDerivative="false">
     <SourceFiles>
-      <File name="Modelica_Blocks_Math_Gain.c" />
-      <File name="Modelica_Blocks_Math_Gain_functions.c" />
-      <File name="Modelica_Blocks_Math_Gain_records.c" />
-      <File name="Modelica_Blocks_Math_Gain_01exo.c" />
-      <File name="Modelica_Blocks_Math_Gain_02nls.c" />
-      <File name="Modelica_Blocks_Math_Gain_03lsy.c" />
-      <File name="Modelica_Blocks_Math_Gain_04set.c" />
-      <File name="Modelica_Blocks_Math_Gain_05evt.c" />
-      <File name="Modelica_Blocks_Math_Gain_06inz.c" />
-      <File name="Modelica_Blocks_Math_Gain_07dly.c" />
-      <File name="Modelica_Blocks_Math_Gain_08bnd.c" />
-      <File name="Modelica_Blocks_Math_Gain_09alg.c" />
-      <File name="Modelica_Blocks_Math_Gain_10asr.c" />
-      <File name="Modelica_Blocks_Math_Gain_11mix.c" />
-      <File name="Modelica_Blocks_Math_Gain_12jac.c" />
-      <File name="Modelica_Blocks_Math_Gain_13opt.c" />
-      <File name="Modelica_Blocks_Math_Gain_14lnz.c" />
-      <File name="Modelica_Blocks_Math_Gain_15syn.c" />
-      <File name="Modelica_Blocks_Math_Gain_16dae.c" />
-      <File name="Modelica_Blocks_Math_Gain_17inl.c" />
-      <File name="Modelica_Blocks_Math_Gain_18spd.c" />
-      <File name="Modelica_Blocks_Math_Gain_init_fmu.c" />
-      <File name="Modelica_Blocks_Math_Gain_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="Gain.c" />
+      <File name="Gain_functions.c" />
+      <File name="Gain_records.c" />
+      <File name="Gain_01exo.c" />
+      <File name="Gain_02nls.c" />
+      <File name="Gain_03lsy.c" />
+      <File name="Gain_04set.c" />
+      <File name="Gain_05evt.c" />
+      <File name="Gain_06inz.c" />
+      <File name="Gain_07dly.c" />
+      <File name="Gain_08bnd.c" />
+      <File name="Gain_09alg.c" />
+      <File name="Gain_10asr.c" />
+      <File name="Gain_11mix.c" />
+      <File name="Gain_12jac.c" />
+      <File name="Gain_13opt.c" />
+      <File name="Gain_14lnz.c" />
+      <File name="Gain_15syn.c" />
+      <File name="Gain_16dae.c" />
+      <File name="Gain_17inl.c" />
+      <File name="Gain_18spd.c" />
+      <File name="Gain_init_fmu.c" />
+      <File name="Gain_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_Gain"
+    modelIdentifier="Gain"
     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_Gain.c" />
-      <File name="Modelica_Blocks_Math_Gain_functions.c" />
-      <File name="Modelica_Blocks_Math_Gain_records.c" />
-      <File name="Modelica_Blocks_Math_Gain_01exo.c" />
-      <File name="Modelica_Blocks_Math_Gain_02nls.c" />
-      <File name="Modelica_Blocks_Math_Gain_03lsy.c" />
-      <File name="Modelica_Blocks_Math_Gain_04set.c" />
-      <File name="Modelica_Blocks_Math_Gain_05evt.c" />
-      <File name="Modelica_Blocks_Math_Gain_06inz.c" />
-      <File name="Modelica_Blocks_Math_Gain_07dly.c" />
-      <File name="Modelica_Blocks_Math_Gain_08bnd.c" />
-      <File name="Modelica_Blocks_Math_Gain_09alg.c" />
-      <File name="Modelica_Blocks_Math_Gain_10asr.c" />
-      <File name="Modelica_Blocks_Math_Gain_11mix.c" />
-      <File name="Modelica_Blocks_Math_Gain_12jac.c" />
-      <File name="Modelica_Blocks_Math_Gain_13opt.c" />
-      <File name="Modelica_Blocks_Math_Gain_14lnz.c" />
-      <File name="Modelica_Blocks_Math_Gain_15syn.c" />
-      <File name="Modelica_Blocks_Math_Gain_16dae.c" />
-      <File name="Modelica_Blocks_Math_Gain_17inl.c" />
-      <File name="Modelica_Blocks_Math_Gain_18spd.c" />
-      <File name="Modelica_Blocks_Math_Gain_init_fmu.c" />
-      <File name="Modelica_Blocks_Math_Gain_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="Gain.c" />
+      <File name="Gain_functions.c" />
+      <File name="Gain_records.c" />
+      <File name="Gain_01exo.c" />
+      <File name="Gain_02nls.c" />
+      <File name="Gain_03lsy.c" />
+      <File name="Gain_04set.c" />
+      <File name="Gain_05evt.c" />
+      <File name="Gain_06inz.c" />
+      <File name="Gain_07dly.c" />
+      <File name="Gain_08bnd.c" />
+      <File name="Gain_09alg.c" />
+      <File name="Gain_10asr.c" />
+      <File name="Gain_11mix.c" />
+      <File name="Gain_12jac.c" />
+      <File name="Gain_13opt.c" />
+      <File name="Gain_14lnz.c" />
+      <File name="Gain_15syn.c" />
+      <File name="Gain_16dae.c" />
+      <File name="Gain_17inl.c" />
+      <File name="Gain_18spd.c" />
+      <File name="Gain_init_fmu.c" />
+      <File name="Gain_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" />
@@ -182,7 +186,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.Gain/resources/Modelica_Blocks_Math_Gain_info.json b/testsuite/resources/Modelica.Blocks.Math.Gain/resources/Modelica_Blocks_Math_Gain_info.json
diff --git a/testsuite/simulation/deleteReferencesAndStartValues.lua b/testsuite/simulation/deleteReferencesAndStartValues.lua
@@ -4,6 +4,7 @@
 -- ucrt64: yes
 -- win: yes
 -- mac: no
+-- asan: yes
 
 oms_setCommandLineOption("--suppressPath=true")
 oms_setTempDirectory("./deleteResourcesReferencesAndStartValues_lua/")
@@ -77,12 +78,9 @@ print("info:      deleteResources.root.Gain.k     : " .. oms_getReal("deleteReso
 src = oms_exportSnapshot("deleteResources")
 print(src)
 
-
 oms_terminate("deleteResources")
 oms_delete("deleteResources")
 
-
-
 -- Result:
 -- info:    virgin parameter settings:
 -- info:      deleteResources.root.Input1     : 10.0

diff --git a/testsuite/simulation/exportConnectorsToResultFile.lua b/testsuite/simulation/exportConnectorsToResultFile.lua
@@ -4,6 +4,7 @@
 -- ucrt64: yes
 -- win: yes
 -- mac: no
+-- asan: yes
 
 oms_setCommandLineOption("--suppressPath=true")
 oms_setTempDirectory("./exportConnectorsToResultFile_lua/")

diff --git a/testsuite/simulation/import_export_signalFilter.lua b/testsuite/simulation/import_export_signalFilter.lua
@@ -5,6 +5,7 @@
 -- ucrt64: yes
 -- win: yes
 -- mac: no
+-- asan: yes
 
 function readFile(filename)
   local f = assert(io.open(filename, "r"))

diff --git a/testsuite/simulation/multipleConnections.lua b/testsuite/simulation/multipleConnections.lua
@@ -4,6 +4,7 @@
 -- ucrt64: yes
 -- win: yes
 -- mac: no
+-- asan: yes
 
 oms_setCommandLineOption("--suppressPath=true")
 oms_setTempDirectory("./multipleConnections_lua/")

diff --git a/testsuite/simulation/referenceResources1.lua b/testsuite/simulation/referenceResources1.lua
@@ -4,6 +4,7 @@
 -- ucrt64: yes
 -- win: yes
 -- mac: no
+-- asan: yes
 
 oms_setCommandLineOption("--suppressPath=true")
 oms_setTempDirectory("./referenceResources1_lua/")

diff --git a/testsuite/simulation/setExternalInputs.lua b/testsuite/simulation/setExternalInputs.lua
@@ -4,6 +4,7 @@
 -- mac: no
 -- ucrt64: yes
 -- win: yes
+-- asan: yes
 
 oms_setCommandLineOption("--suppressPath=true")
 oms_setTempDirectory("./setExternalInputs_lua/")