Skip to content

Commit

Permalink
Add tests for WFC and update expected output
Browse files Browse the repository at this point in the history
  • Loading branch information
ptaeuber authored and OpenModelica-Hudson committed Apr 11, 2017
1 parent 23fb508 commit 1f47e70
Show file tree
Hide file tree
Showing 64 changed files with 2,030 additions and 594 deletions.
1 change: 0 additions & 1 deletion .gitvalidfiles
Expand Up @@ -215,7 +215,6 @@
./simulation/libraries/3rdParty/TestMediaFrancesco/ReferenceFiles/WaterIF97/WaterIF97_Test8_ref.mat
./simulation/libraries/msl32/simulateAll.sh
./simulation/modelica/arrays/ReferenceFiles/NPendulum_10.mat
./simulation/modelica/commonSubExp/ReferenceFiles/ThermoSysPro.Examples.SimpleExamples.TestCentrifugalPump1.mat
./simulation/modelica/external_functions/ExternalFunc1.c
./simulation/modelica/external_functions/ExternalFunc1_ext.h
./simulation/modelica/external_functions/ExternalFunc2.c
Expand Down
Expand Up @@ -113,6 +113,11 @@ runScript(modelTesting);getErrorString();
// ""
// Simulation options: startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Fluid.Examples.BranchingDynamicPipes', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Fluid.Examples.BranchingDynamicPipes_res.mat
// Messages: Wrong start value for variable _boundary1_P_medium_P_p_steam_sat_ detected. Got 2339.19 Expected: 100000
// Wrong start value for variable _pipe1_P_flowModel_P_mus_(1) detected. Got 1.82329e-05 Expected: 0.001
// Wrong start value for variable _pipe1_P_flowModel_P_rhos_(1) detected. Got 1.77178 Expected: 1
// Wrong start value for variable _pipe1_P_statesFM1_P_T_ detected. Got 293.15 Expected: 300
//
// Files Equal!
// "true
// "
Expand Down
8 changes: 4 additions & 4 deletions openmodelica/cruntime/optimization/basic/testAlgLoop3.mos
Expand Up @@ -51,10 +51,10 @@ getErrorString();
// ******************************************************************************
//
// LOG_IPOPT_ERROR | info | max violation is 1 for the constraint $EqCon$y1(time = 1)
// LOG_IPOPT_ERROR | info | max violation is 0.491941 for the constraint $EqCon$y1(time = 1)
// LOG_IPOPT_ERROR | info | max violation is 0.0251223 for the constraint $EqCon$y2(time = 1)
// LOG_IPOPT_ERROR | info | max violation is 9.99863e-05 for the constraint $EqCon$y2(time = 1)
// LOG_IPOPT_ERROR | info | max violation is 1.53473e-09 for the constraint $EqCon$y2(time = 1)
// LOG_IPOPT_ERROR | info | max violation is 0.491941 for the constraint $EqCon$y2(time = 1)
// LOG_IPOPT_ERROR | info | max violation is 0.0251223 for the constraint $EqCon$y1(time = 1)
// LOG_IPOPT_ERROR | info | max violation is 9.99863e-05 for the constraint $EqCon$y1(time = 1)
// LOG_IPOPT_ERROR | info | max violation is 1.53473e-09 for the constraint $EqCon$y1(time = 1)
// "
// end SimulationResult;
// "Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
Expand Down
16 changes: 8 additions & 8 deletions openmodelica/cruntime/optimization/basic/testAlgLoop7.mos
Expand Up @@ -51,14 +51,14 @@ getErrorString();
// For more information visit http://projects.coin-or.org/Ipopt
// ******************************************************************************
//
// LOG_IPOPT_ERROR | info | max violation is 0.00630401 for the constraint $EqCon$x2(time = 0.17)
// LOG_IPOPT_ERROR | info | max violation is 2.64944e-05 for the constraint $EqCon$x1(time = 0.17)
// LOG_IPOPT_ERROR | info | max violation is 1.05608e-07 for the constraint $EqCon$x2(time = 0.17)
// LOG_IPOPT_ERROR | info | max violation is 1.86591e-05 for the constraint $EqCon$x1(time = 0.17)
// LOG_IPOPT_ERROR | info | max violation is 5.33147e-06 for the constraint $EqCon$x2(time = 0.435)
// LOG_IPOPT_ERROR | info | max violation is 4.28799e-08 for the constraint $EqCon$x2(time = 0.435)
// LOG_IPOPT_ERROR | info | max violation is 1.87086e-11 for the constraint $EqCon$x2(time = 0.445)
// LOG_IPOPT_ERROR | info | max violation is 5.55112e-16 for the constraint $EqCon$x2(time = 0.16)
// LOG_IPOPT_ERROR | info | max violation is 0.00630401 for the constraint $EqCon$x1(time = 0.17)
// LOG_IPOPT_ERROR | info | max violation is 2.64944e-05 for the constraint $EqCon$x2(time = 0.17)
// LOG_IPOPT_ERROR | info | max violation is 1.05608e-07 for the constraint $EqCon$x1(time = 0.17)
// LOG_IPOPT_ERROR | info | max violation is 1.86591e-05 for the constraint $EqCon$x2(time = 0.17)
// 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)
// "
// end SimulationResult;
// ""
Expand Down

0 comments on commit 1f47e70

Please sign in to comment.