Skip to content

Commit 2f38a49

Browse files
arun3688arun3688
authored
fix failing tests in ucrt64 (#1287)
* add missing resources
1 parent 735a85a commit 2f38a49

21 files changed

Lines changed: 86 additions & 47 deletions

‎testsuite/resources/fmi_attributes_19/binaries/win64/fmi_attributes_19.dll‎

-97.8 KB
Binary file not shown.

‎testsuite/resources/fmi_attributes_19/binaries/win64/fmi_attributes_19.lib‎

-38.7 KB
Binary file not shown.

‎testsuite/resources/fmi_attributes_19/modelDescription.xml‎

Lines changed: 47 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<fmiModelDescription
33
fmiVersion="2.0"
44
modelName="fmi_attributes_19"
5-
guid="{390234b1-e001-4b5c-aebe-7c3337586558}"
5+
guid="{847f054a-1770-4829-b9c8-e4d7c73df3c0}"
66
description=""
7-
generationTool="OpenModelica Compiler OpenModelica v1.20.0-dev-59-g0e39c77344 (64-bit)"
8-
generationDateAndTime="2022-05-20T09:13:14Z"
7+
generationTool="OpenModelica Compiler v1.23.0-dev-385-gb786a4f951-cmake"
8+
generationDateAndTime="2024-03-20T16:02:42Z"
99
variableNamingConvention="structured"
1010
numberOfEventIndicators="0">
1111
<CoSimulation
@@ -18,7 +18,7 @@
1818
canBeInstantiatedOnlyOncePerProcess="false"
1919
canNotUseMemoryManagementFunctions="false"
2020
canGetAndSetFMUstate="true"
21-
canSerializeFMUstate="false"
21+
canSerializeFMUstate="true"
2222
providesDirectionalDerivative="true">
2323
<SourceFiles>
2424
<File name="fmi_attributes_19.c" />
@@ -44,16 +44,16 @@
4444
<File name="fmi_attributes_19_18spd.c" />
4545
<File name="fmi_attributes_19_init_fmu.c" />
4646
<File name="fmi_attributes_19_FMU.c" />
47-
<File name="gc/memory_pool.c" />
48-
<File name="gc/omc_gc.c" />
47+
<File name="./gc/memory_pool.c" />
48+
<File name="./gc/omc_gc.c" />
4949
<File name="./util/base_array.c" />
5050
<File name="./util/boolean_array.c" />
51+
<File name="./util/context.c" />
5152
<File name="./util/division.c" />
5253
<File name="./util/doubleEndedList.c" />
5354
<File name="./util/generic_array.c" />
5455
<File name="./util/index_spec.c" />
5556
<File name="./util/integer_array.c" />
56-
<File name="./util/jacobian_util.c" />
5757
<File name="./util/list.c" />
5858
<File name="./util/modelica_string_lit.c" />
5959
<File name="./util/modelica_string.c" />
@@ -73,6 +73,7 @@
7373
<File name="./util/utility.c" />
7474
<File name="./util/varinfo.c" />
7575
<File name="./math-support/pivot.c" />
76+
<File name="./simulation/jacobian_util.c" />
7677
<File name="./simulation/omc_simulation_util.c" />
7778
<File name="./simulation/options.c" />
7879
<File name="./simulation/simulation_info_json.c" />
@@ -86,10 +87,44 @@
8687
<File name="./simulation/solver/synchronous.c" />
8788
<File name="./simulation/solver/initialization/initialization.c" />
8889
<File name="./meta/meta_modelica_catch.c" />
89-
<File name="./simulation/solver/nonlinearSolverHomotopy.c" />
90-
<File name="./simulation/solver/nonlinearSolverHybrd.c" />
91-
<File name="./simulation/solver/nonlinearValuesList.c" />
92-
<File name="./simulation/solver/nonlinearSystem.c" />
90+
<File name="simulation/solver/nonlinearSolverHomotopy.c" />
91+
<File name="simulation/solver/nonlinearSolverHybrd.c" />
92+
<File name="simulation/solver/nonlinearValuesList.c" />
93+
<File name="simulation/solver/nonlinearSystem.c" />
94+
<File name="./external_solvers/dgemm.c" />
95+
<File name="./external_solvers/dger.c" />
96+
<File name="./external_solvers/dscal.c" />
97+
<File name="./external_solvers/dswap.c" />
98+
<File name="./external_solvers/dtrsm.c" />
99+
<File name="./external_solvers/idamax.c" />
100+
<File name="./external_solvers/lsame.c" />
101+
<File name="./external_solvers/dgesc2.c" />
102+
<File name="./external_solvers/dgesv.c" />
103+
<File name="./external_solvers/dgetc2.c" />
104+
<File name="./external_solvers/dgetf2.c" />
105+
<File name="./external_solvers/dgetrf.c" />
106+
<File name="./external_solvers/dgetrs.c" />
107+
<File name="./external_solvers/dlabad.c" />
108+
<File name="./external_solvers/dlamch.c" />
109+
<File name="./external_solvers/dlaswp.c" />
110+
<File name="./external_solvers/ieeeck.c" />
111+
<File name="./external_solvers/ilaenv.c" />
112+
<File name="./external_solvers/iparmq.c" />
113+
<File name="./external_solvers/xerbla.c" />
114+
<File name="./external_solvers/i_nint.c" />
115+
<File name="./external_solvers/pow_di.c" />
116+
<File name="./external_solvers/s_cmp.c" />
117+
<File name="./external_solvers/s_copy.c" />
118+
<File name="./external_solvers/cminpack.h" />
119+
<File name="./external_solvers/minpack.h" />
120+
<File name="./external_solvers/enorm_.c" />
121+
<File name="./external_solvers/hybrj_.c" />
122+
<File name="./external_solvers/dpmpar_.c" />
123+
<File name="./external_solvers/qrfac_.c" />
124+
<File name="./external_solvers/qform_.c" />
125+
<File name="./external_solvers/dogleg_.c" />
126+
<File name="./external_solvers/r1updt_.c" />
127+
<File name="./external_solvers/r1mpyq_.c" />
93128
</SourceFiles>
94129
</CoSimulation>
95130
<LogCategories>
@@ -105,7 +140,7 @@
105140
<Category name="logAll" description="logAll" />
106141
<Category name="logFmi2Call" description="logFmi2Call" />
107142
</LogCategories>
108-
<DefaultExperiment startTime="0.0" stopTime="1.0" tolerance="1e-06"/>
143+
<DefaultExperiment startTime="0.0" stopTime="1.0" tolerance="1e-6" stepSize="0.002"/>
109144
<ModelVariables>
110145
<!-- Index of variable = "1" -->
111146
<ScalarVariable

‎testsuite/resources/fmi_attributes_19/resources/fmi_attributes_19_JacA.bin‎

16 Bytes
Binary file not shown.

‎testsuite/resources/fmi_attributes_19/resources/fmi_attributes_19_JacFMIDER.bin‎

16 Bytes
Binary file not shown.

‎testsuite/resources/fmi_attributes_19/resources/fmi_attributes_19_JacFMIDERINIT.bin‎

64 Bytes
Binary file not shown.

‎testsuite/resources/tank1/binaries/win64/tank1.dll‎

-266 KB
Binary file not shown.

‎testsuite/resources/tank1/binaries/win64/tank1.lib‎

-35.5 KB
Binary file not shown.

‎testsuite/resources/tank1/modelDescription.xml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<fmiModelDescription
33
fmiVersion="2.0"
44
modelName="tank1"
5-
guid="{8911973a-0fe9-45cd-9562-7ba0a6b100f2}"
5+
guid="{7714c3e2-0356-4160-977d-611c7c4249ab}"
66
description=""
7-
generationTool="OpenModelica Compiler OpenModelica v1.20.0-dev-101-g55feca18f5 (64-bit)"
8-
generationDateAndTime="2022-05-27T12:57:07Z"
7+
generationTool="OpenModelica Compiler v1.23.0-dev-385-gb786a4f951-cmake"
8+
generationDateAndTime="2024-03-20T15:41:37Z"
99
variableNamingConvention="structured"
1010
numberOfEventIndicators="0">
1111
<CoSimulation
@@ -18,7 +18,7 @@
1818
canBeInstantiatedOnlyOncePerProcess="false"
1919
canNotUseMemoryManagementFunctions="false"
2020
canGetAndSetFMUstate="true"
21-
canSerializeFMUstate="false"
21+
canSerializeFMUstate="true"
2222
providesDirectionalDerivative="true">
2323
<SourceFiles>
2424
<File name="tank1.c" />
@@ -44,16 +44,16 @@
4444
<File name="tank1_18spd.c" />
4545
<File name="tank1_init_fmu.c" />
4646
<File name="tank1_FMU.c" />
47-
<File name="gc/memory_pool.c" />
48-
<File name="gc/omc_gc.c" />
47+
<File name="./gc/memory_pool.c" />
48+
<File name="./gc/omc_gc.c" />
4949
<File name="./util/base_array.c" />
5050
<File name="./util/boolean_array.c" />
51+
<File name="./util/context.c" />
5152
<File name="./util/division.c" />
5253
<File name="./util/doubleEndedList.c" />
5354
<File name="./util/generic_array.c" />
5455
<File name="./util/index_spec.c" />
5556
<File name="./util/integer_array.c" />
56-
<File name="./util/jacobian_util.c" />
5757
<File name="./util/list.c" />
5858
<File name="./util/modelica_string_lit.c" />
5959
<File name="./util/modelica_string.c" />
@@ -73,6 +73,7 @@
7373
<File name="./util/utility.c" />
7474
<File name="./util/varinfo.c" />
7575
<File name="./math-support/pivot.c" />
76+
<File name="./simulation/jacobian_util.c" />
7677
<File name="./simulation/omc_simulation_util.c" />
7778
<File name="./simulation/options.c" />
7879
<File name="./simulation/simulation_info_json.c" />
@@ -101,7 +102,7 @@
101102
<Category name="logAll" description="logAll" />
102103
<Category name="logFmi2Call" description="logFmi2Call" />
103104
</LogCategories>
104-
<DefaultExperiment startTime="0.0" stopTime="100.0" tolerance="1e-06"/>
105+
<DefaultExperiment startTime="0.0" stopTime="100.0" tolerance="1e-6" stepSize="0.2"/>
105106
<ModelVariables>
106107
<!-- Index of variable = "1" -->
107108
<ScalarVariable

‎testsuite/resources/tank2/binaries/win64/tank2.dll‎

-266 KB
Binary file not shown.

0 commit comments

Comments
 (0)