Add SiemensPower reference file

OpenModelica · May 19, 2015 · 36b2fae · 36b2fae
1 parent 4ade779
commit 36b2fae
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/ReferenceFiles/SiemensPower/wall_test.mat.xz b/ReferenceFiles/SiemensPower/wall_test.mat.xz
diff --git a/simulation/libraries/3rdParty/siemens/testSolidComponents.mos b/simulation/libraries/3rdParty/siemens/testSolidComponents.mos
@@ -6,13 +6,13 @@
 //  Test SiemensPower component SolidComponents
 //
 
-loadModel(SiemensPower);getErrorString();
+loadModel(SiemensPower,{"2.1 beta"});getErrorString();
 
 // test simple model
 simulate(SiemensPower.Components.SolidComponents.Tests.wall_test, stopTime=25, method="dassl");
 getErrorString();
 
-res := OpenModelica.Scripting.compareSimulationResults("SiemensPower.Components.SolidComponents.Tests.wall_test_res.mat","ReferenceFiles/wall_test.mat","SiemensPower.Components.SolidComponents.Tests.wall_test_diff.csv",0.01,0.00001,
+res := OpenModelica.Scripting.compareSimulationResults("SiemensPower.Components.SolidComponents.Tests.wall_test_res.mat",getEnvironmentVar("REFERENCEFILES")+"/SiemensPower/wall_test.mat","SiemensPower.Components.SolidComponents.Tests.wall_test_diff.csv",0.01,0.00001,
   { "heatInput.C1signal.y",
     "wall.layer[1].T[1]",
     "wall.layer[1].T[2]",

diff --git a/simulation/libraries/3rdParty/siemens/testSolidComponentsJac.mos b/simulation/libraries/3rdParty/siemens/testSolidComponentsJac.mos
@@ -6,17 +6,17 @@
 //  Test SiemensPower component SolidComponents
 //
 
-loadModel(Modelica);
-loadFile("SiemensPower/package.mo");getErrorString();
+loadModel(SiemensPower, {"2.1 beta"});getErrorString();
 
 // test jacobians
 setCommandLineOptions("+generateSymbolicJacobian");
 simulate(SiemensPower.Components.SolidComponents.Tests.wall_test, stopTime=25, method="dassl", simflags="-dasslJacobian=symbolical");
+getErrorString();
 
-res := OpenModelica.Scripting.compareSimulationResults("SiemensPower.Components.SolidComponents.Tests.wall_test_res.mat","ReferenceFiles/wall_test.mat","SiemensPower.Components.SolidComponents.Tests.wall_test_diff.csv",0.01,0.00001,
+res := OpenModelica.Scripting.compareSimulationResults("SiemensPower.Components.SolidComponents.Tests.wall_test_res.mat",getEnvironmentVar("REFERENCEFILES")+"/SiemensPower/wall_test.mat","SiemensPower.Components.SolidComponents.Tests.wall_test_diff.csv",0.01,0.00001,
   { "heatInput.C1signal.y",
     "wall.layer[1].T[1]",
-    "wall.layer[1].T[2]",    
+    "wall.layer[1].T[2]",
     "wall.layer[1].T[3]",
     "wall.layer[1].T[4]",
     "wall.layer[1].T[5]",