Skip to content

Commit

Permalink
Update DualMassOscillator fmus
Browse files Browse the repository at this point in the history
  • Loading branch information
@lochel
lochel committed Nov 26, 2024
1 parent b2c6634 commit d79a37d
Show file tree
Hide file tree
Showing 10 changed files with 130 additions and 2 deletions.
Binary file added testsuite/resources/DualMassOscillator.System1/binaries/linux64/System1.so
View file
Binary file not shown.
Binary file added testsuite/resources/DualMassOscillator.System1/binaries/win64/System1.dll
View file
Binary file not shown.
Binary file added testsuite/resources/DualMassOscillator.System1/binaries/win64/libSystem1.dll.a
View file
Binary file not shown.
66 changes: 65 additions & 1 deletion testsuite/resources/DualMassOscillator.System1/modelDescription.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<fmiModelDescription
fmiVersion="2.0"
modelName="DualMassOscillator.System1"
<<<<<<< HEAD
guid="{544650e1-27dc-4ae3-9ee7-f63557a6ef62}"
description=""
version=""
Expand All @@ -11,6 +12,17 @@
numberOfEventIndicators="0">
<ModelExchange
modelIdentifier="DualMassOscillator_System1"
=======
guid="{a698a750-e2d7-41b3-ad47-22654da2be93}"
description=""
version=""
generationTool="OpenModelica Compiler OpenModelica v1.24.2 (64-bit)"
generationDateAndTime="2024-11-23T14:01:28Z"
variableNamingConvention="structured"
numberOfEventIndicators="0">
<ModelExchange
modelIdentifier="System1"
>>>>>>> 975380c4 (Update DualMassOscillator fmus)
needsExecutionTool="false"
completedIntegratorStepNotNeeded="false"
canBeInstantiatedOnlyOncePerProcess="false"
Expand All @@ -19,6 +31,7 @@
canSerializeFMUstate="false"
providesDirectionalDerivative="false">
<SourceFiles>
<<<<<<< HEAD
<File name="DualMassOscillator_System1.c" />
<File name="DualMassOscillator_System1_functions.c" />
<File name="DualMassOscillator_System1_records.c" />
Expand All @@ -42,6 +55,31 @@
<File name="DualMassOscillator_System1_18spd.c" />
<File name="DualMassOscillator_System1_init_fmu.c" />
<File name="DualMassOscillator_System1_FMU.c" />
=======
<File name="System1.c" />
<File name="System1_functions.c" />
<File name="System1_records.c" />
<File name="System1_01exo.c" />
<File name="System1_02nls.c" />
<File name="System1_03lsy.c" />
<File name="System1_04set.c" />
<File name="System1_05evt.c" />
<File name="System1_06inz.c" />
<File name="System1_07dly.c" />
<File name="System1_08bnd.c" />
<File name="System1_09alg.c" />
<File name="System1_10asr.c" />
<File name="System1_11mix.c" />
<File name="System1_12jac.c" />
<File name="System1_13opt.c" />
<File name="System1_14lnz.c" />
<File name="System1_15syn.c" />
<File name="System1_16dae.c" />
<File name="System1_17inl.c" />
<File name="System1_18spd.c" />
<File name="System1_init_fmu.c" />
<File name="System1_FMU.c" />
>>>>>>> 975380c4 (Update DualMassOscillator fmus)
<File name="./gc/memory_pool.c" />
<File name="./gc/omc_gc.c" />
<File name="./util/base_array.c" />
Expand Down Expand Up @@ -88,7 +126,7 @@
</SourceFiles>
</ModelExchange>
<CoSimulation
modelIdentifier="DualMassOscillator_System1"
modelIdentifier="System1"
needsExecutionTool="false"
canHandleVariableCommunicationStepSize="true"
canInterpolateInputs="true"
Expand All @@ -100,6 +138,7 @@
canSerializeFMUstate="false"
providesDirectionalDerivative="false">
<SourceFiles>
<<<<<<< HEAD
<File name="DualMassOscillator_System1.c" />
<File name="DualMassOscillator_System1_functions.c" />
<File name="DualMassOscillator_System1_records.c" />
Expand All @@ -123,6 +162,31 @@
<File name="DualMassOscillator_System1_18spd.c" />
<File name="DualMassOscillator_System1_init_fmu.c" />
<File name="DualMassOscillator_System1_FMU.c" />
=======
<File name="System1.c" />
<File name="System1_functions.c" />
<File name="System1_records.c" />
<File name="System1_01exo.c" />
<File name="System1_02nls.c" />
<File name="System1_03lsy.c" />
<File name="System1_04set.c" />
<File name="System1_05evt.c" />
<File name="System1_06inz.c" />
<File name="System1_07dly.c" />
<File name="System1_08bnd.c" />
<File name="System1_09alg.c" />
<File name="System1_10asr.c" />
<File name="System1_11mix.c" />
<File name="System1_12jac.c" />
<File name="System1_13opt.c" />
<File name="System1_14lnz.c" />
<File name="System1_15syn.c" />
<File name="System1_16dae.c" />
<File name="System1_17inl.c" />
<File name="System1_18spd.c" />
<File name="System1_init_fmu.c" />
<File name="System1_FMU.c" />
>>>>>>> 975380c4 (Update DualMassOscillator fmus)
<File name="./gc/memory_pool.c" />
<File name="./gc/omc_gc.c" />
<File name="./util/base_array.c" />
Expand Down
Binary file added testsuite/resources/DualMassOscillator.System1/resources/System1_JacA.bin
View file
Binary file not shown.
Binary file added testsuite/resources/DualMassOscillator.System2/binaries/linux64/System2.so
View file
Binary file not shown.
Binary file added testsuite/resources/DualMassOscillator.System2/binaries/win64/System2.dll
View file
Binary file not shown.
Binary file added testsuite/resources/DualMassOscillator.System2/binaries/win64/libSystem2.dll.a
View file
Binary file not shown.
66 changes: 65 additions & 1 deletion testsuite/resources/DualMassOscillator.System2/modelDescription.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<fmiModelDescription
fmiVersion="2.0"
modelName="DualMassOscillator.System2"
<<<<<<< HEAD
guid="{89675681-4897-4140-b6ca-27909d861d66}"
description=""
version=""
Expand All @@ -11,6 +12,17 @@
numberOfEventIndicators="0">
<ModelExchange
modelIdentifier="DualMassOscillator_System2"
=======
guid="{ce6da18d-edd0-4255-8e00-53d14457ff68}"
description=""
version=""
generationTool="OpenModelica Compiler OpenModelica v1.24.2 (64-bit)"
generationDateAndTime="2024-11-23T14:11:10Z"
variableNamingConvention="structured"
numberOfEventIndicators="0">
<ModelExchange
modelIdentifier="System2"
>>>>>>> 975380c4 (Update DualMassOscillator fmus)
needsExecutionTool="false"
completedIntegratorStepNotNeeded="false"
canBeInstantiatedOnlyOncePerProcess="false"
Expand All @@ -19,6 +31,7 @@
canSerializeFMUstate="false"
providesDirectionalDerivative="false">
<SourceFiles>
<<<<<<< HEAD
<File name="DualMassOscillator_System2.c" />
<File name="DualMassOscillator_System2_functions.c" />
<File name="DualMassOscillator_System2_records.c" />
Expand All @@ -42,6 +55,31 @@
<File name="DualMassOscillator_System2_18spd.c" />
<File name="DualMassOscillator_System2_init_fmu.c" />
<File name="DualMassOscillator_System2_FMU.c" />
=======
<File name="System2.c" />
<File name="System2_functions.c" />
<File name="System2_records.c" />
<File name="System2_01exo.c" />
<File name="System2_02nls.c" />
<File name="System2_03lsy.c" />
<File name="System2_04set.c" />
<File name="System2_05evt.c" />
<File name="System2_06inz.c" />
<File name="System2_07dly.c" />
<File name="System2_08bnd.c" />
<File name="System2_09alg.c" />
<File name="System2_10asr.c" />
<File name="System2_11mix.c" />
<File name="System2_12jac.c" />
<File name="System2_13opt.c" />
<File name="System2_14lnz.c" />
<File name="System2_15syn.c" />
<File name="System2_16dae.c" />
<File name="System2_17inl.c" />
<File name="System2_18spd.c" />
<File name="System2_init_fmu.c" />
<File name="System2_FMU.c" />
>>>>>>> 975380c4 (Update DualMassOscillator fmus)
<File name="./gc/memory_pool.c" />
<File name="./gc/omc_gc.c" />
<File name="./util/base_array.c" />
Expand Down Expand Up @@ -88,7 +126,7 @@
</SourceFiles>
</ModelExchange>
<CoSimulation
modelIdentifier="DualMassOscillator_System2"
modelIdentifier="System2"
needsExecutionTool="false"
canHandleVariableCommunicationStepSize="true"
canInterpolateInputs="true"
Expand All @@ -100,6 +138,7 @@
canSerializeFMUstate="false"
providesDirectionalDerivative="false">
<SourceFiles>
<<<<<<< HEAD
<File name="DualMassOscillator_System2.c" />
<File name="DualMassOscillator_System2_functions.c" />
<File name="DualMassOscillator_System2_records.c" />
Expand All @@ -123,6 +162,31 @@
<File name="DualMassOscillator_System2_18spd.c" />
<File name="DualMassOscillator_System2_init_fmu.c" />
<File name="DualMassOscillator_System2_FMU.c" />
=======
<File name="System2.c" />
<File name="System2_functions.c" />
<File name="System2_records.c" />
<File name="System2_01exo.c" />
<File name="System2_02nls.c" />
<File name="System2_03lsy.c" />
<File name="System2_04set.c" />
<File name="System2_05evt.c" />
<File name="System2_06inz.c" />
<File name="System2_07dly.c" />
<File name="System2_08bnd.c" />
<File name="System2_09alg.c" />
<File name="System2_10asr.c" />
<File name="System2_11mix.c" />
<File name="System2_12jac.c" />
<File name="System2_13opt.c" />
<File name="System2_14lnz.c" />
<File name="System2_15syn.c" />
<File name="System2_16dae.c" />
<File name="System2_17inl.c" />
<File name="System2_18spd.c" />
<File name="System2_init_fmu.c" />
<File name="System2_FMU.c" />
>>>>>>> 975380c4 (Update DualMassOscillator fmus)
<File name="./gc/memory_pool.c" />
<File name="./gc/omc_gc.c" />
<File name="./util/base_array.c" />
Expand Down
Binary file added testsuite/resources/DualMassOscillator.System2/resources/System2_JacA.bin
View file
Binary file not shown.

0 comments on commit d79a37d

Please sign in to comment.