Skip to content
This repository has been archived by the owner on Apr 3, 2019. It is now read-only.

adjust tests #1084

Closed
wants to merge 1 commit into from
Closed

adjust tests #1084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions openmodelica/bootstrapping/LoadCompilerSources.mos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ if true then /* Suppress output */
prefixPath + "Util/HashTable5.mo",
// prefixPath + "Util/HashTable6.mo",
prefixPath + "Util/HashTableCG.mo",
prefixPath + "Util/HashTableCrefSimVar.mo",
prefixPath + "Util/HashTableCrILst.mo",
prefixPath + "Util/HashTableCrIntToExp.mo",
prefixPath + "Util/HashTableCrToCrEqLst.mo",
Expand Down
2 changes: 1 addition & 1 deletion openmodelica/cruntime/optimization/benchmark/runDrumBoiler.mos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ getErrorString();
// LOG_IPOPT_ERROR | info | max violation is 1.48405e-06 for the constraint $con$conSigma_con(time = 216)
// LOG_IPOPT_ERROR | info | max violation is 1.49979e-06 for the constraint $con$conSigma_con(time = 216)
// 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 = 648)
// 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.
// "
Expand Down
44 changes: 3 additions & 41 deletions simulation/libraries/msl32/Modelica.Fluid.Examples.HeatingSystem.mos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ setCommandLineOptions("--postOptModules-=wrapFunctionCalls --preOptModules-=reso
runScript("../common/ModelTestingDefaults.mos"); getErrorString();

timeoutSim := 600;
modelTestingType := OpenModelicaModelTesting.Kind.Compilation;
modelTestingType := OpenModelicaModelTesting.Kind.Instantiation;
modelName := $TypeName(Modelica.Fluid.Examples.HeatingSystem);
stopTime := 600.0;
compareVars :=
Expand All @@ -34,49 +34,11 @@ runScript(modelTesting);getErrorString();
// "
// ""
// 600
// OpenModelicaModelTesting.Kind.Compilation
// OpenModelicaModelTesting.Kind.Instantiation
// Modelica.Fluid.Examples.HeatingSystem
// 600.0
// {"heater.mediums[1].h","heater.mediums[1].p","pipe.mediums[1].h","pipe.mediums[2].h","pipe.mediums[2].p","radiator.mediums[1].h","radiator.mediums[1].p","tank.level","tank.medium.h"}
// Compilation succeeded
// Warning: The model contains alias variables with conflicting start and/or nominal values. It is recommended to resolve the conflicts, because otherwise the system could be hard to solve. To print the conflicting alias sets and the chosen candidates please use -d=aliasConflicts.
// 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").
// Warning: The linear system:
// 1 : pump.dp_pump = pump.p_b_nominal - tank.ports[2].p
// 2 : pump.dp_pump = pump.medium.p - tank.ports[2].p
// [
// 1.0 , 1.0 ;
// 1.0 , 1.0
// ]
// *
// [
// tank.ports[2].p ;
// pump.dp_pump
// ]
// =
// [
// pump.p_b_nominal ;
// pump.medium.p
// ]
// might be structurally or numerically singular for variable pump.dp_pump since U(2,2) = 0.0. It might be hard to solve. Compilation continues anyway.
// Warning: The linear system:
// 1 : pump.dp_pump = pump.medium.p - tank.ports[2].p
// 2 : pump.dp_pump = pump.p_b_nominal - tank.ports[2].p
// [
// 1.0 , 1.0 ;
// 1.0 , 1.0
// ]
// *
// [
// pump.dp_pump ;
// tank.ports[2].p
// ]
// =
// [
// pump.medium.p ;
// pump.p_b_nominal
// ]
// might be structurally or numerically singular for variable tank.ports[2].p since U(2,2) = 0.0. It might be hard to solve. Compilation continues anyway.
// Frontend succeeded
// "true
// "
// ""
Expand Down