Update expected output

OpenModelica · Nov 6, 2015 · 105514c · 105514c
1 parent 51aa590
commit 105514c
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/...n/modelica/initialization/OverdeterminedInitialization.Fluid.DynamicPipeInitialValues.mos b/...n/modelica/initialization/OverdeterminedInitialization.Fluid.DynamicPipeInitialValues.mos
@@ -212,7 +212,7 @@ simulate(OverdeterminedInitialization.Fluid.DynamicPipeInitialValues); getErrorS
 //  * candidate: pipe.flowModel.states[1].h(start = 100000.0)
 //  * candidate: pipe.heatTransfer.states[1].h(start = 100000.0)
 // => select value from pipe.mediums[1].h(start = 2500000.0) for variable: pipe.mediums[1].h
-// Warning: It was not possible to determine if the initialization problem is consistent, because of not evaluable parameters during compile time: source.p = system.p_start (10000000.0 = system.p_start)
+// Warning: It was not possible to determine if the initialization problem is consistent, because of not evaluable parameters/start values during compile time: source.p = system.p_start (10000000.0 = system.p_start)
 // Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
 // Warning: The initial conditions are over specified. Use +d=initialization for more information.
 // Warning: There are iteration variables with default zero start attribute. Use +d=initialization for more information.

diff --git a/...tion/modelica/initialization/OverdeterminedInitialization.Fluid.TwoVolumesFullInitial.mos b/...tion/modelica/initialization/OverdeterminedInitialization.Fluid.TwoVolumesFullInitial.mos
@@ -88,7 +88,7 @@ buildModel(OverdeterminedInitialization.Fluid.TwoVolumesFullInitial); getErrorSt
 //  * candidate: V1.ports[2].p(start = 1000000.0)
 //  * candidate: V1.ports[1].p(start = 1000000.0)
 // => select value from V2.medium.p(start = V2.p_start) for variable: V2.medium.p
-// Warning: It was not possible to determine if the initialization problem is consistent, because of not evaluable parameters during compile time: V1.medium.p = V1.p_start  (V2.p_start = V1.p_start)
+// Warning: It was not possible to determine if the initialization problem is consistent, because of not evaluable parameters/start values during compile time: V1.medium.p = V1.p_start (V2.p_start = V1.p_start)
 // Warning: The initial conditions are over specified. Use +d=initialization for more information.
 // Warning: There are iteration variables with default zero start attribute. Use +d=initialization for more information.
 // "

diff --git a/...a/initialization/OverdeterminedInitialization.Fluid.TwoVolumesFullInitialInconsistent.mos b/...a/initialization/OverdeterminedInitialization.Fluid.TwoVolumesFullInitialInconsistent.mos
@@ -96,7 +96,7 @@ simulate(OverdeterminedInitialization.Fluid.TwoVolumesFullInitialInconsistent);
 //  * candidate: V1.ports[2].p(start = 1000000.0)
 //  * candidate: V1.ports[1].p(start = 1000000.0)
 // => select value from V2.medium.p(start = V2.p_start) for variable: V2.medium.p
-// Warning: It was not possible to determine if the initialization problem is consistent, because of not evaluable parameters during compile time: V1.medium.p = V1.p_start  (V2.p_start = V1.p_start)
+// Warning: It was not possible to determine if the initialization problem is consistent, because of not evaluable parameters/start values during compile time: V1.medium.p = V1.p_start (V2.p_start = V1.p_start)
 // Warning: The initial conditions are over specified. Use +d=initialization for more information.
 // Warning: There are iteration variables with default zero start attribute. Use +d=initialization for more information.
 // Warning: Alias set with several free start values

diff --git a/.../modelica/initialization/OverdeterminedInitialization.Mechanical.TwoMassesFullInitial.mos b/.../modelica/initialization/OverdeterminedInitialization.Mechanical.TwoMassesFullInitial.mos
@@ -17,8 +17,8 @@ simulate(OverdeterminedInitialization.Mechanical.TwoMassesFullInitial); getError
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'OverdeterminedInitialization.Mechanical.TwoMassesFullInitial', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
 //     messages = ""
 // end SimulationResult;
-// "Notification: The following equation is consistent and got removed from the initialization problem: mass2.v = 0.0
-// Warning: It was not possible to determine if the initialization problem is consistent, because of not evaluable parameters during compile time: mass1.s = 1.0  (1.0 + -0.5 * (mass2.L + mass1.L) = 1.0 )
+// "Warning: It was not possible to determine if the initialization problem is consistent, because of not evaluable parameters/start values during compile time: mass2.v = $_start(mass2.v) (0.0 = $_start(0.0))
+// Warning: It was not possible to determine if the initialization problem is consistent, because of not evaluable parameters/start values during compile time: mass1.s = 1.0 ($_start(mass2.s) + -0.5 * (mass2.L + mass1.L) = 1.0)
 // Warning: The initial conditions are over specified. Use +d=initialization for more information.
 // "
 // endResult
diff --git a/...itialization/OverdeterminedInitialization.Mechanical.TwoMassesFullInitialInconsistent.mos b/...itialization/OverdeterminedInitialization.Mechanical.TwoMassesFullInitialInconsistent.mos
@@ -21,8 +21,8 @@ simulate(OverdeterminedInitialization.Mechanical.TwoMassesFullInitialInconsisten
 // |                 | |       | Use -lv=LOG_INIT -w for more information.
 // "
 // end SimulationResult;
-// "Notification: The following equation is consistent and got removed from the initialization problem: mass2.v = 0.0
-// Warning: It was not possible to determine if the initialization problem is consistent, because of not evaluable parameters during compile time: mass1.s = 1.0  (2.0 + -0.5 * (mass2.L + mass1.L) = 1.0 )
+// "Warning: It was not possible to determine if the initialization problem is consistent, because of not evaluable parameters/start values during compile time: mass2.v = $_start(mass2.v) (0.0 = $_start(0.0))
+// Warning: It was not possible to determine if the initialization problem is consistent, because of not evaluable parameters/start values during compile time: mass1.s = 1.0 ($_start(mass2.s) + -0.5 * (mass2.L + mass1.L) = 1.0)
 // Warning: The initial conditions are over specified. Use +d=initialization for more information.
 // "
 // endResult
diff --git a/...elica/initialization/OverdeterminedInitialization.Mechanical.TwoMassesFullSteadyState.mos b/...elica/initialization/OverdeterminedInitialization.Mechanical.TwoMassesFullSteadyState.mos
@@ -13,7 +13,7 @@ buildModel(OverdeterminedInitialization.Mechanical.TwoMassesFullSteadyState); ge
 // true
 // ""
 // {"OverdeterminedInitialization.Mechanical.TwoMassesFullSteadyState","OverdeterminedInitialization.Mechanical.TwoMassesFullSteadyState_init.xml"}
-// "Notification: The following equation is consistent and got removed from the initialization problem: mass2.v = 0.0
+// "Warning: It was not possible to determine if the initialization problem is consistent, because of not evaluable parameters/start values during compile time: mass2.v = $_start(mass2.v) (0.0 = $_start(0.0))
 // Notification: The following equation is consistent and got removed from the initialization problem: mass1.a = 0.0
 // Warning: The initial conditions are over specified. Use +d=initialization for more information.
 // "

diff --git a/simulation/modelica/initialization/bug_2263.mos b/simulation/modelica/initialization/bug_2263.mos
@@ -50,7 +50,7 @@ simulate(initializationTests.bug_2263, startTime=0.0, stopTime=0.0, simflags="-i
 // |                 | |       | Use -lv=LOG_INIT -w for more information.
 // "
 // end SimulationResult;
-// "Error: The initialization problem is inconsistent due to the following equation: x = $PRE.x  (0.0 = -1.0 )
+// "Warning: It was not possible to determine if the initialization problem is consistent, because of not evaluable parameters/start values during compile time: x = $PRE.x ($_start(x) = -1.0)
 // Warning: The initial conditions are over specified. Use +d=initialization for more information.
 // "
 // endResult
diff --git a/simulation/modelica/initialization/bug_2673.mos b/simulation/modelica/initialization/bug_2673.mos
@@ -36,11 +36,11 @@ simulate(initializationTests.bug_2673, startTime=0.0, stopTime=0.0, simflags="-i
 //     simulationOptions = "startTime = 0.0, stopTime = 0.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'initializationTests.bug_2673', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-iif=bug_2673.mat -iit=1.0 -lv=LOG_SOTI'",
 //     messages = "LOG_SOTI          | info    | ### SOLUTION OF THE INITIALIZATION ###
 // |                 | |       | | states variables
-// |                 | |       | | | [1] Real x(start=2.47151, nominal=1) = 5 (pre: 2.47151)
-// |                 | |       | | | [2] Real y(start=0.632122, nominal=1) = 0 (pre: 0.632122)
+// |                 | |       | | | [1] Real x(start=2.47151, nominal=1) = 2.47151 (pre: 2.47151)
+// |                 | |       | | | [2] Real y(start=0.632122, nominal=1) = 0.632122 (pre: 0.632122)
 // |                 | |       | | derivatives variables
-// |                 | |       | | | [3] Real der(x) = -4 (pre: -1.47151)
-// |                 | |       | | | [4] Real der(y) = 1 (pre: 0.367878)
+// |                 | |       | | | [3] Real der(x) = -1.47151 (pre: -1.47151)
+// |                 | |       | | | [4] Real der(y) = 0.367878 (pre: 0.367878)
 // "
 // end SimulationResult;
 // ""

diff --git a/simulation/modelica/start_value_selection/UnevaluateableFixedAttribute.mos b/simulation/modelica/start_value_selection/UnevaluateableFixedAttribute.mos
@@ -16,7 +16,7 @@ simulate(UnevaluateableFixedAttribute); getErrorString();
 // end SimulationResult;
 // "[simulation/modelica/start_value_selection/UnevaluateableFixedAttribute.mo:7:3-7:46:writable] Warning: z has unevaluateable fixed attribute value "preferredStatesUnfixedStart" use values from start attribute(s) "true"
 // [simulation/modelica/start_value_selection/UnevaluateableFixedAttribute.mo:6:3-6:41:writable] Warning: y has unevaluateable fixed attribute value "preferredStatesUnfixed" use values from start attribute(s) "false"
-// Notification: The following equation is consistent and got removed from the initialization problem: x = 0.0
+// Warning: It was not possible to determine if the initialization problem is consistent, because of not evaluable parameters/start values during compile time: x = 0.0 (-$_start(z) ^ 2.0 = 0.0)
 // Warning: The initial conditions are over specified. Use +d=initialization for more information.
 // "
 // endResult