Skip to content

Commit

Permalink
Expected output after MSL 3.2.1 update
Browse files Browse the repository at this point in the history
  • Loading branch information
@sjoelund
sjoelund committed Mar 2, 2016
1 parent a064174 commit 66b3572
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 107 deletions.
4 changes: 2 additions & 2 deletions openmodelica/interactive-API/Bug2871.mos
View file
Expand Up @@ -88,7 +88,7 @@ instantiateModel(Modelica.Fluid.Examples.Tanks.ThreeTanks); getErrorString();
// 0
// true
// {{"Modelica.Fluid.System","system","System wide properties", "public", "false", "false", "false", "false", "unspecified", "outer", "unspecified","{}"},{"Boolean","allowFlowReversal","= true to allow flow reversal, false restricts to design direction (port_a -> port_b)", "public", "false", "false", "false", "false", "parameter", "none", "unspecified","{}"},{"Modelica.Fluid.Interfaces.FluidPort_a","port_a","Fluid connector a (positive design flow direction is from port_a to port_b)", "public", "false", "false", "false", "false", "unspecified", "none", "unspecified","{}"},{"Modelica.Fluid.Interfaces.FluidPort_b","port_b","Fluid connector b (positive design flow direction is from port_a to port_b)", "public", "false", "false", "false", "false", "unspecified", "none", "unspecified","{}"},{"Boolean","port_a_exposesState","= true if port_a exposes the state of a fluid volume", "protected", "false", "false", "false", "false", "parameter", "none", "unspecified","{}"},{"Boolean","port_b_exposesState","= true if port_b.p exposes the state of a fluid volume", "protected", "false", "false", "false", "false", "parameter", "none", "unspecified","{}"},{"Boolean","showDesignFlowDirection","= false to hide the arrow in the model icon", "protected", "false", "false", "false", "false", "parameter", "none", "unspecified","{}"}}
// {{},{Dialog("Assumptions","",true,-,false,"","","","","",false), Evaluate=true},{Placement(true,-,-,-110.0,-10.0,-90.0,10.0,0.0,-,-,-,-,-,-,)},{Placement(true,-,-,110.0,-10.0,90.0,10.0,0.0,-,-,110.0,-10.0,90.0,10.0,)},{},{},{}}
// {{},{Dialog("Assumptions","",true,-,false,"","","","","",false), Evaluate=true},{Placement(true,-,-,-110.0,-10.0,-90.0,10.0,-,-,-,-,-,-,-,)},{Placement(true,-,-,110.0,-10.0,90.0,10.0,-,-,-,110.0,-10.0,90.0,10.0,)},{},{},{}}
// true
// {-100.0,-100.0,100.0,100.0,false,0.1,2.0,2.0,{Ellipse(true, {0.0, 0.0}, 0, {0, 127, 255}, {0, 127, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-100, 100}, {100, -100}}, 0, 360), Ellipse(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 127, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-100, 100}, {100, -100}}, 0, 360)}}
// 1
Expand All @@ -99,7 +99,7 @@ instantiateModel(Modelica.Fluid.Examples.Tanks.ThreeTanks); getErrorString();
// {{"Real","nParallel","Number of identical parallel pipes", "public", "false", "false", "false", "false", "parameter", "none", "unspecified","{}"},{"Modelica.SIunits.Length","length","Length", "public", "false", "false", "false", "false", "parameter", "none", "unspecified","{}"},{"Boolean","isCircular","= true if cross sectional area is circular", "public", "false", "false", "false", "false", "parameter", "none", "unspecified","{}"},{"Modelica.SIunits.Diameter","diameter","Diameter of circular pipe", "public", "false", "false", "false", "false", "parameter", "none", "unspecified","{}"},{"Modelica.SIunits.Area","crossArea","Inner cross section area", "public", "false", "false", "false", "false", "parameter", "none", "unspecified","{}"},{"Modelica.SIunits.Length","perimeter","Inner perimeter", "public", "false", "false", "false", "false", "parameter", "none", "unspecified","{}"},{"Modelica.SIunits.Height","roughness","Average height of surface asperities (default: smooth steel pipe)", "public", "false", "false", "false", "false", "parameter", "none", "unspecified","{}"},{"Modelica.SIunits.Volume","V","volume size", "public", "true", "false", "false", "false", "parameter", "none", "unspecified","{}"},{"Modelica.SIunits.Length","height_ab","Height(port_b) - Height(port_a)", "public", "false", "false", "false", "false", "parameter", "none", "unspecified","{}"}}
// {{Dialog("General","Geometry",true,-,false,"","","","","",false)},{Dialog("General","Geometry",true,-,false,"","","","","",false)},{},{Dialog("General","Geometry",true,-,false,"","","","","",false)},{Dialog("General","Geometry",false,-,false,"","","","","",false)},{Dialog("General","Geometry",false,-,false,"","","","","",false)},{Dialog("General","Geometry",true,-,false,"","","","","",false)},{},{Dialog("General","Static head",true,-,false,"","","","","",false)}}
// {{"Modelica.Fluid.Pipes.StaticPipe.Medium.AbsolutePressure","p_a_start","Start value of pressure at port a", "public", "false", "false", "false", "false", "parameter", "none", "unspecified","{}"},{"Modelica.Fluid.Pipes.StaticPipe.Medium.AbsolutePressure","p_b_start","Start value of pressure at port b", "public", "false", "false", "false", "false", "parameter", "none", "unspecified","{}"},{"Modelica.Fluid.Pipes.StaticPipe.Medium.MassFlowRate","m_flow_start","Start value for mass flow rate", "public", "false", "false", "false", "false", "parameter", "none", "unspecified","{}"},{"Modelica.Fluid.Pipes.StaticPipe.FlowModel","flowModel","Flow model", "public", "false", "false", "false", "false", "unspecified", "none", "unspecified","{}"}}
// {{Dialog("Initialization","",true,-,false,"","","","","",false)},{Dialog("Initialization","",true,-,false,"","","","","",false)},{Evaluate=true, Dialog("Initialization","",true,-,false,"","","","","",false)},{Placement(true,-,-,-38.0,-18.0,38.0,18.0,0.0,-,-,-,-,-,-,)}}
// {{Dialog("Initialization","",true,-,false,"","","","","",false)},{Dialog("Initialization","",true,-,false,"","","","","",false)},{Evaluate=true, Dialog("Initialization","",true,-,false,"","","","","",false)},{Placement(true,-,-,-38.0,-18.0,38.0,18.0,-,-,-,-,-,-,-,)}}
// true
// true
// 0
Expand Down
3 changes: 1 addition & 2 deletions openmodelica/interactive-API/saveTotalModel.mos
View file
Expand Up @@ -116,8 +116,7 @@ readFile("BranchingDynamicPipes.mo");
// Your model is using an outer \\\"system\\\" component but
// an inner \\\"system\\\" component is not defined.
// For simulation drag Modelica.Fluid.System into your model
// to specify system properties.
// \");
// to specify system properties.\");
// end System;
//
// package Pipes \"Devices for conveying fluid\"
Expand Down
16 changes: 8 additions & 8 deletions simulation/libraries/msl32/Modelica.Fluid.Examples.Explanatory.MomentumBalanceFittings.mos
View file
Expand Up @@ -36,23 +36,23 @@ runScript(modelTesting);getErrorString();
// Modelica.Fluid.Examples.Explanatory.MomentumBalanceFittings
// {"leftBoundary1.ports[1].m_flow","leftBoundary1.ports[1].p","leftBoundary1.ports[1].h_outflow","rightBoundary1.ports[1].m_flow","rightBoundary1.ports[1].p","rightBoundary1.ports[1].h_outflow","leftBoundary2.ports[1].m_flow","leftBoundary2.ports[1].p","leftBoundary2.ports[1].h_outflow","rightBoundary2.ports[1].m_flow","rightBoundary2.ports[1].p","rightBoundary2.ports[1].h_outflow"}
// Compilation succeeded
// [Modelica 3.2.1/Fluid/Interfaces.mo:740:9-745:39:writable] Notification: From here:
// [Modelica 3.2.1/Fluid/Interfaces.mo:332:3-334:69:writable] Warning: Inherited elements are not identical: bug: https://trac.modelica.org/Modelica/ticket/627
// [Modelica 3.2.1/Fluid/Interfaces.mo:734:9-739:39:writable] Notification: From here:
// [Modelica 3.2.1/Fluid/Interfaces.mo:327:3-329:69:writable] Warning: Inherited elements are not identical: bug: https://trac.modelica.org/Modelica/ticket/627
// first: Medium.MassFlowRate m_flow(min = if allowFlowReversal then -Modelica.Constants.inf else 0, start = m_flow_start, stateSelect = if momentumDynamics == Modelica.Fluid.Types.Dynamics.SteadyState then StateSelect.default else StateSelect.prefer) "mass flow rates between states"
// second: Medium.MassFlowRate m_flow(min = if allowFlowReversal then -Modelica.Constants.inf else 0, start = m_flow_start) "Mass flow rate in design flow direction"
// Continue ....
// [Modelica 3.2.1/Fluid/Interfaces.mo:740:9-745:39:writable] Notification: From here:
// [Modelica 3.2.1/Fluid/Interfaces.mo:332:3-334:69:writable] Warning: Inherited elements are not identical: bug: https://trac.modelica.org/Modelica/ticket/627
// [Modelica 3.2.1/Fluid/Interfaces.mo:734:9-739:39:writable] Notification: From here:
// [Modelica 3.2.1/Fluid/Interfaces.mo:327:3-329:69:writable] Warning: Inherited elements are not identical: bug: https://trac.modelica.org/Modelica/ticket/627
// first: Medium.MassFlowRate m_flow(min = if allowFlowReversal then -Modelica.Constants.inf else 0, start = m_flow_start, stateSelect = if momentumDynamics == Modelica.Fluid.Types.Dynamics.SteadyState then StateSelect.default else StateSelect.prefer) "mass flow rates between states"
// second: Medium.MassFlowRate m_flow(min = if allowFlowReversal then -Modelica.Constants.inf else 0, start = m_flow_start) "Mass flow rate in design flow direction"
// Continue ....
// [Modelica 3.2.1/Fluid/Interfaces.mo:740:9-745:39:writable] Notification: From here:
// [Modelica 3.2.1/Fluid/Interfaces.mo:332:3-334:69:writable] Warning: Inherited elements are not identical: bug: https://trac.modelica.org/Modelica/ticket/627
// [Modelica 3.2.1/Fluid/Interfaces.mo:734:9-739:39:writable] Notification: From here:
// [Modelica 3.2.1/Fluid/Interfaces.mo:327:3-329:69:writable] Warning: Inherited elements are not identical: bug: https://trac.modelica.org/Modelica/ticket/627
// first: Medium.MassFlowRate m_flow(min = if allowFlowReversal then -Modelica.Constants.inf else 0, start = m_flow_start, stateSelect = if momentumDynamics == Modelica.Fluid.Types.Dynamics.SteadyState then StateSelect.default else StateSelect.prefer) "mass flow rates between states"
// second: Medium.MassFlowRate m_flow(min = if allowFlowReversal then -Modelica.Constants.inf else 0, start = m_flow_start) "Mass flow rate in design flow direction"
// Continue ....
// [Modelica 3.2.1/Fluid/Interfaces.mo:740:9-745:39:writable] Notification: From here:
// [Modelica 3.2.1/Fluid/Interfaces.mo:332:3-334:69:writable] Warning: Inherited elements are not identical: bug: https://trac.modelica.org/Modelica/ticket/627
// [Modelica 3.2.1/Fluid/Interfaces.mo:734:9-739:39:writable] Notification: From here:
// [Modelica 3.2.1/Fluid/Interfaces.mo:327:3-329:69:writable] Warning: Inherited elements are not identical: bug: https://trac.modelica.org/Modelica/ticket/627
// first: Medium.MassFlowRate m_flow(min = if allowFlowReversal then -Modelica.Constants.inf else 0, start = m_flow_start, stateSelect = if momentumDynamics == Modelica.Fluid.Types.Dynamics.SteadyState then StateSelect.default else StateSelect.prefer) "mass flow rates between states"
// second: Medium.MassFlowRate m_flow(min = if allowFlowReversal then -Modelica.Constants.inf else 0, start = m_flow_start) "Mass flow rate in design flow direction"
// Continue ....
Expand Down
4 changes: 2 additions & 2 deletions simulation/libraries/msl32/Modelica.Fluid.Examples.InverseParameterization.mos
View file
Expand Up @@ -43,8 +43,8 @@ runScript(modelTesting);getErrorString();
// | | | | | For more information simulate with -lv LOG_NLS
//
// Files Equal!
// [Modelica 3.2.1/Fluid/Interfaces.mo:740:9-745:39:writable] Notification: From here:
// [Modelica 3.2.1/Fluid/Interfaces.mo:332:3-334:69:writable] Warning: Inherited elements are not identical: bug: https://trac.modelica.org/Modelica/ticket/627
// [Modelica 3.2.1/Fluid/Interfaces.mo:734:9-739:39:writable] Notification: From here:
// [Modelica 3.2.1/Fluid/Interfaces.mo:327:3-329:69:writable] Warning: Inherited elements are not identical: bug: https://trac.modelica.org/Modelica/ticket/627
// first: Medium.MassFlowRate m_flow(min = if allowFlowReversal then -Modelica.Constants.inf else 0, start = m_flow_start, stateSelect = if momentumDynamics == Modelica.Fluid.Types.Dynamics.SteadyState then StateSelect.default else StateSelect.prefer) "mass flow rates between states"
// second: Medium.MassFlowRate m_flow(min = if allowFlowReversal then -Modelica.Constants.inf else 0, start = m_flow_start) "Mass flow rate in design flow direction"
// Continue ....
Expand Down
58 changes: 4 additions & 54 deletions simulation/libraries/msl32/Modelica.Fluid.Examples.Tanks.TanksWithOverflow.mos
View file
Expand Up @@ -8,7 +8,7 @@

runScript("../common/ModelTestingDefaults.mos"); getErrorString();

modelTestingType := OpenModelicaModelTesting.Kind.Compilation;
modelTestingType := OpenModelicaModelTesting.Kind.SuppressedSimulation;
modelName := $TypeName(Modelica.Fluid.Examples.Tanks.TanksWithOverflow);
compareVars :=
{
Expand All @@ -24,61 +24,11 @@ runScript(modelTesting);getErrorString();
// "true
// "
// ""
// OpenModelicaModelTesting.Kind.Compilation
// OpenModelicaModelTesting.Kind.SuppressedSimulation
// Modelica.Fluid.Examples.Tanks.TanksWithOverflow
// {"upperTank.level","upperTank.medium.h","lowerTank.level","lowerTank.medium.h"}
// Compilation succeeded
// Warning: Alias set with different nominal values
// * candidate: massFlowRate.medium.sat.psat(nominal = 1000000.0)
// * candidate: massFlowRate.medium.state.p(nominal = 1000000.0)
// * candidate: massFlowRate.medium.p(nominal = 100000.0)
// * candidate: upperTank.ports[1].p(nominal = 1000000.0)
// * candidate: massFlowRate.ports[1].p(nominal = 1000000.0)
// => select value from massFlowRate.ports[1].p(nominal = 1000000.0) for variable: massFlowRate.ports[1].p
// Warning: Alias set with several free start values
// * candidate: lowerTank.medium.h(start = lowerTank.h_start)
// * candidate: lowerTank.ports[2].h_outflow(start = 100000.0)
// * candidate: overflow.flowModel.states[2].h(start = 100000.0)
// * candidate: lowerTank.ports[1].h_outflow(start = 100000.0)
// * candidate: pipe.flowModel.states[2].h(start = 100000.0)
// * candidate: lowerTank.medium.state.h(start = 100000.0)
// * candidate: lowerTank.heatTransfer.states[1].h(start = 100000.0)
// => select value from lowerTank.medium.h(start = lowerTank.h_start) for variable: lowerTank.medium.h
// Warning: Alias set with several free start values
// * candidate: upperTank.medium.h(start = upperTank.h_start)
// * candidate: upperTank.ports[3].h_outflow(start = 100000.0)
// * candidate: overflow.flowModel.states[1].h(start = 100000.0)
// * candidate: upperTank.ports[2].h_outflow(start = 100000.0)
// * candidate: pipe.flowModel.states[1].h(start = 100000.0)
// * candidate: upperTank.ports[1].h_outflow(start = 100000.0)
// * candidate: upperTank.medium.state.h(start = 100000.0)
// * candidate: upperTank.heatTransfer.states[1].h(start = 100000.0)
// => select value from upperTank.medium.h(start = upperTank.h_start) for variable: upperTank.medium.h
// Warning: Alias set with several free start values
// * candidate: lowerTank.heatTransfer.states[1].T(start = 500.0)
// * candidate: lowerTank.medium.state.T(start = 500.0)
// * candidate: lowerTank.medium.T(start = lowerTank.T_start)
// => select value from lowerTank.medium.T(start = lowerTank.T_start) for variable: lowerTank.heatTransfer.Ts[1]
// Warning: Alias set with different nominal values
// * candidate: lowerTank.medium.T(nominal = 500.0)
// * candidate: lowerTank.medium.state.T(nominal = 500.0)
// * candidate: lowerTank.heatTransfer.states[1].T(nominal = 500.0)
// * candidate: lowerTank.heatTransfer.heatPorts[1].T(nominal = 300.0)
// * candidate: lowerTank.heatTransfer.Ts[1](nominal = 300.0)
// => select value from lowerTank.heatTransfer.Ts[1](nominal = 300.0) for variable: lowerTank.heatTransfer.Ts[1]
// Warning: Alias set with several free start values
// * candidate: upperTank.heatTransfer.states[1].T(start = 500.0)
// * candidate: upperTank.medium.state.T(start = 500.0)
// * candidate: upperTank.medium.T(start = upperTank.T_start)
// => select value from upperTank.medium.T(start = upperTank.T_start) for variable: upperTank.heatTransfer.Ts[1]
// Warning: Alias set with different nominal values
// * candidate: upperTank.medium.T(nominal = 500.0)
// * candidate: upperTank.medium.state.T(nominal = 500.0)
// * candidate: upperTank.heatTransfer.states[1].T(nominal = 500.0)
// * candidate: upperTank.heatTransfer.heatPorts[1].T(nominal = 300.0)
// * candidate: upperTank.heatTransfer.Ts[1](nominal = 300.0)
// => select value from upperTank.heatTransfer.Ts[1](nominal = 300.0) for variable: upperTank.heatTransfer.Ts[1]
// Warning: There are iteration variables with default zero start attribute. Use +d=initialization for more information.
// Simulation options: startTime = 0.0, stopTime = 25000.0, numberOfIntervals = 5000, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Fluid.Examples.Tanks.TanksWithOverflow', options = '', outputFormat = 'mat', variableFilter = 'time|upperTank.level|upperTank.medium.h|lowerTank.level|lowerTank.medium.h', cflags = '', simflags = ' -abortSlowSimulation -alarm=360 -emit_protected'
// Result file: Modelica.Fluid.Examples.Tanks.TanksWithOverflow_res.mat
// "true
// "
// ""
Expand Down

0 comments on commit 66b3572

Please sign in to comment.