Changeset 7ecf7e4f in OpenModelica

Timestamp:

2023-03-10T14:28:59+01:00 (14 months ago)

Author:

Martin Sjölund <martin.sjolund@…>

Children:

baafebad

Parents:

5590496

git-author:

Martin Sjölund <martin.sjolund@…> (03/10/23 13:21:16)

git-committer:

Martin Sjölund <martin.sjolund@…> (03/10/23 14:28:59)

Message:

Update testcases for new Docker image

Files:

• .CI/cache-xenial/Dockerfile (deleted)
• Jenkinsfile (modified) (3 diffs)
• testsuite/openmodelica/cruntime/optimization/basic/testAlgLoop7.mos (modified) (1 diff)
• testsuite/openmodelica/cruntime/optimization/basic/testDerInput.mos (modified) (1 diff)
• testsuite/openmodelica/cruntime/optimization/benchmark/runDrumBoiler.mos (modified) (1 diff)
• testsuite/simulation/libraries/msl32/Modelica.Electrical.Analog.Examples.AmplifierWithOpAmpDetailed.mos (modified) (3 diffs)

Jenkinsfile

@@ -364 +364 @@
             dockerfile {
               additionalBuildArgs '--pull'
-              dir '.CI/cache-xenial'
+              dir '.CI/cache'
               label 'linux'
               args "--mount type=volume,source=runtest-gcc-cache,target=/cache/runtest " +
@@ -392 +392 @@
             dockerfile {
               additionalBuildArgs '--pull'
-              dir '.CI/cache-xenial'
+              dir '.CI/cache'
               label 'linux'
               args "--mount type=volume,source=runtest-gcc-cache,target=/cache/runtest " +
@@ -420 +420 @@
             dockerfile {
               additionalBuildArgs '--pull'
-              dir '.CI/cache-xenial'
+              dir '.CI/cache'
               label 'linux'
               args "--mount type=volume,source=runtest-gcc-cache,target=/cache/runtest " +

testsuite/openmodelica/cruntime/optimization/basic/testAlgLoop7.mos

@@ -64 +64 @@
 // LOG_IPOPT_ERROR   | info    | max violation is 5.33147e-06 for the constraint $EqCon$x1(time = 0.435)
 // LOG_IPOPT_ERROR   | info    | max violation is 4.28799e-08 for the constraint $EqCon$x1(time = 0.435)
-// LOG_IPOPT_ERROR   | info    | max violation is 1.87085e-11 for the constraint $EqCon$x1(time = 0.445)
-// LOG_IPOPT_ERROR   | info    | max violation is 4.44089e-16 for the constraint $EqCon$x1(time = 0.28)
+// LOG_IPOPT_ERROR | info    | max violation is 1.87084e-11 for the constraint $EqCon$x1(time = 0.445)
+// LOG_IPOPT_ERROR | info    | max violation is 7.21645e-16 for the constraint $EqCon$x1(time = 0.165)
 // LOG_SUCCESS       | info    | The simulation finished successfully.
 // "

testsuite/openmodelica/cruntime/optimization/basic/testDerInput.mos

@@ -57 +57 @@
 // LOG_IPOPT_ERROR   | info    | max error is 2.88615e-16 for the approximation of the state x1(time = 2.2)
 // LOG_IPOPT_ERROR   | info    | max error is 4.88541e-16 for the approximation of the state x1(time = 2.8)
-// LOG_IPOPT_ERROR   | info    | max error is 3.77519e-16 for the approximation of the state x1(time = 2.3)
-// LOG_IPOPT_ERROR   | info    | max error is 3.99637e-16 for the approximation of the state x1(time = 4.5)
-// LOG_IPOPT_ERROR   | info    | max error is 5.27356e-16 for the approximation of the state x1(time = 3.4)
-// LOG_IPOPT_ERROR   | info    | max error is 5.27356e-16 for the approximation of the state x1(time = 3.1)
-// LOG_IPOPT_ERROR   | info    | max error is 4.10696e-16 for the approximation of the state x1(time = 2.9)
+// LOG_IPOPT_ERROR | info    | max error is 3.55185e-16 for the approximation of the state x1(time = 2.3)
+// LOG_IPOPT_ERROR | info    | max error is 2.66497e-16 for the approximation of the state x1(time = 2.4)
+// LOG_IPOPT_ERROR | info    | max error is 3.99637e-16 for the approximation of the state x1(time = 2.7)
+// LOG_IPOPT_ERROR | info    | max error is 4.21971e-16 for the approximation of the state x1(time = 3.4)
+// LOG_IPOPT_ERROR | info    | max error is 5.57714e-16 for the approximation of the state x1(time = 3.1)
 // LOG_IPOPT_ERROR   | info    | max error is 5.52509e-16 for the approximation of the state x1(time = 3.1)
 // LOG_SUCCESS       | info    | The simulation finished successfully.

testsuite/openmodelica/cruntime/optimization/benchmark/runDrumBoiler.mos

@@ -75 +75 @@
 // LOG_IPOPT_ERROR   | info    | max violation is 1.49983e-06 for the constraint $con$conSigma.con(time = 216)
 // LOG_IPOPT_ERROR   | info    | max violation is 1.5e-06 for the constraint $con$conSigma.con(time = 360)
-// LOG_IPOPT_ERROR   | info    | max violation is 1.5e-06 for the constraint $con$conSigma.con(time = 360)
+// LOG_IPOPT_ERROR   | info    | max violation is 1.5e-06 for the constraint $con$conSigma.con(time = 288)
 // LOG_SUCCESS       | info    | The simulation finished successfully.
 // "

testsuite/simulation/libraries/msl32/Modelica.Electrical.Analog.Examples.AmplifierWithOpAmpDetailed.mos

@@ -10 +10 @@
 runScript("../common/ModelTestingDefaults.mos"); getErrorString();
 
-modelTestingType := OpenModelicaModelTesting.Kind.SimpleSimulation;
+modelTestingType := OpenModelicaModelTesting.Kind.VerifiedSimulation;
 modelName := $TypeName(Modelica.Electrical.Analog.Examples.AmplifierWithOpAmpDetailed);
 compareVars :=
@@ -29 +29 @@
 // "
 // ""
-// OpenModelicaModelTesting.Kind.SimpleSimulation
+// OpenModelicaModelTesting.Kind.VerifiedSimulation
 // Modelica.Electrical.Analog.Examples.AmplifierWithOpAmpDetailed
 // {"opAmp.v_in","opAmp.q_fr1","opAmp.q_fr2","opAmp.q_fr3","opAmp.q_fp1","opAmp.v_source","opAmp.x"}
@@ -37 +37 @@
 // LOG_SUCCESS       | info    | The simulation finished successfully.
 //
+// Files Equal!
 // "true
 // "