Skip to content

Commit

Permalink
Update expected output after library bump
Browse files Browse the repository at this point in the history
  • Loading branch information
@lochel @OpenModelica-Hudson
lochel authored and OpenModelica-Hudson committed Nov 25, 2015
1 parent 507faa4 commit c2dcf10
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 26 deletions.
4 changes: 2 additions & 2 deletions openmodelica/interactive-API/saveTotalModel.mos
View file
Expand Up @@ -197,8 +197,8 @@ readFile("BranchingDynamicPipes.mo");
// final parameter Integer nFMLumped = if modelStructure == Types.ModelStructure.a_v_b then 2 else 1;
// final parameter Integer iLumped = integer(n / 2) + 1 \"Index of control volume with representative state if useLumpedPressure\" annotation(Evaluate = true);
// parameter Boolean useInnerPortProperties = false \"=true to take port properties for flow models from internal control volumes\" annotation(Evaluate = true);
// Medium.ThermodynamicState state_a(p(start = p_a_start)) \"state defined by volume outside port_a\";
// Medium.ThermodynamicState state_b(p(start = p_b_start)) \"state defined by volume outside port_b\";
// Medium.ThermodynamicState state_a \"state defined by volume outside port_a\";
// Medium.ThermodynamicState state_b \"state defined by volume outside port_b\";
// Medium.ThermodynamicState[nFM + 1] statesFM \"state vector for flowModel model\";
// replaceable model FlowModel = Modelica.Fluid.Pipes.BaseClasses.FlowModels.DetailedPipeFlow constrainedby Modelica.Fluid.Pipes.BaseClasses.FlowModels.PartialStaggeredFlowModel;
// FlowModel flowModel(redeclare final package Medium = Medium, final n = nFM + 1, final states = statesFM, final vs = vsFM, final momentumDynamics = momentumDynamics, final allowFlowReversal = allowFlowReversal, final p_a_start = p_a_start, final p_b_start = p_b_start, final m_flow_start = m_flow_start, final nParallel = nParallel, final pathLengths = pathLengths, final crossAreas = crossAreasFM, final dimensions = dimensionsFM, final roughnesses = roughnessesFM, final dheights = dheightsFM, final g = system.g) \"Flow model\";
Expand Down
12 changes: 6 additions & 6 deletions ...ation/libraries/msl32/Modelica.Fluid.Examples.AST_BatchPlant.BatchPlant_StandardWater.mos
View file
Expand Up @@ -70,7 +70,7 @@ runScript(modelTesting);getErrorString();
// * candidate: pipeB1B2.port_b.p(start = 5000000.0)
// * candidate: V2.port_b.p(start = 5000000.0)
// * candidate: V2.state_b.p(start = 5000000.0)
// * candidate: pipeB1B2.state_b.p(start = pipeB1B2.p_b_start)
// * candidate: pipeB1B2.state_b.p(start = 5000000.0)
// * candidate: pipeB1B2.mediums[2].state.p(start = 5000000.0)
// * candidate: pipeB1B2.statesFM[2].p(start = 5000000.0)
// * candidate: pipeB1B2.flowModel.states[2].p(start = 5000000.0)
Expand Down Expand Up @@ -172,7 +172,7 @@ runScript(modelTesting);getErrorString();
// * candidate: pipePump1B1.port_b.p(start = 5000000.0)
// * candidate: V1.port_a.p(start = 5000000.0)
// * candidate: V1.state_a.p(start = 5000000.0)
// * candidate: pipePump1B1.state_b.p(start = pipePump1B1.p_b_start)
// * candidate: pipePump1B1.state_b.p(start = 5000000.0)
// * candidate: pipePump1B1.mediums[2].state.p(start = 5000000.0)
// * candidate: pipePump1B1.statesFM[2].p(start = 5000000.0)
// * candidate: pipePump1B1.flowModel.states[2].p(start = 5000000.0)
Expand All @@ -196,7 +196,7 @@ runScript(modelTesting);getErrorString();
// * candidate: pipePump2B2.port_b.p(start = 5000000.0)
// * candidate: V5.port_a.p(start = 5000000.0)
// * candidate: V5.state_a.p(start = 5000000.0)
// * candidate: pipePump2B2.state_b.p(start = pipePump2B2.p_b_start)
// * candidate: pipePump2B2.state_b.p(start = 5000000.0)
// * candidate: pipePump2B2.mediums[2].state.p(start = 5000000.0)
// * candidate: pipePump2B2.statesFM[2].p(start = 5000000.0)
// * candidate: pipePump2B2.flowModel.states[2].p(start = 5000000.0)
Expand Down Expand Up @@ -288,7 +288,7 @@ runScript(modelTesting);getErrorString();
// * candidate: pipePump2B2.port_a.p(start = 5000000.0)
// * candidate: V25.port_b.p(start = 5000000.0)
// * candidate: V25.state_b.p(start = 5000000.0)
// * candidate: pipePump2B2.state_a.p(start = pipePump2B2.p_a_start)
// * candidate: pipePump2B2.state_a.p(start = 5000000.0)
// * candidate: pipePump2B2.mediums[1].state.p(start = 5000000.0)
// * candidate: pipePump2B2.statesFM[1].p(start = 5000000.0)
// * candidate: pipePump2B2.flowModel.states[1].p(start = 5000000.0)
Expand All @@ -312,7 +312,7 @@ runScript(modelTesting);getErrorString();
// * candidate: pipePump1B1.port_a.p(start = 5000000.0)
// * candidate: V22.port_b.p(start = 5000000.0)
// * candidate: V22.state_b.p(start = 5000000.0)
// * candidate: pipePump1B1.state_a.p(start = pipePump1B1.p_a_start)
// * candidate: pipePump1B1.state_a.p(start = 5000000.0)
// * candidate: pipePump1B1.mediums[1].state.p(start = 5000000.0)
// * candidate: pipePump1B1.statesFM[1].p(start = 5000000.0)
// * candidate: pipePump1B1.flowModel.states[1].p(start = 5000000.0)
Expand All @@ -336,7 +336,7 @@ runScript(modelTesting);getErrorString();
// * candidate: pipeB1B2.port_a.p(start = 5000000.0)
// * candidate: V4.port_b.p(start = 5000000.0)
// * candidate: V4.state_b.p(start = 5000000.0)
// * candidate: pipeB1B2.state_a.p(start = pipeB1B2.p_a_start)
// * candidate: pipeB1B2.state_a.p(start = 5000000.0)
// * candidate: pipeB1B2.mediums[1].state.p(start = 5000000.0)
// * candidate: pipeB1B2.statesFM[1].p(start = 5000000.0)
// * candidate: pipeB1B2.flowModel.states[1].p(start = 5000000.0)
Expand Down
4 changes: 2 additions & 2 deletions ...aries/msl32/Modelica.Fluid.Examples.HeatExchanger.HeatExchangerSimulation-addDerAlias.mos
View file
Expand Up @@ -106,7 +106,7 @@ runScript(modelTesting);getErrorString();
// * candidate: massFlowRate2.ports[1].p(start = 5000000.0)
// * candidate: massFlowRate2.medium.state.p(start = 5000000.0)
// * candidate: massFlowRate2.medium.sat.psat(start = 5000000.0)
// * candidate: HEX.pipe_2.state_b.p(start = HEX.pipe_2.p_b_start)
// * candidate: HEX.pipe_2.state_b.p(start = 5000000.0)
// * candidate: HEX.pipe_2.mediums[20].state.p(start = 5000000.0)
// * candidate: HEX.pipe_2.statesFM[21].p(start = 5000000.0)
// * candidate: HEX.pipe_2.flowModel.states[21].p(start = 5000000.0)
Expand Down Expand Up @@ -135,7 +135,7 @@ runScript(modelTesting);getErrorString();
// * candidate: massFlowRate1.ports[1].p(start = 5000000.0)
// * candidate: massFlowRate1.medium.state.p(start = 5000000.0)
// * candidate: massFlowRate1.medium.sat.psat(start = 5000000.0)
// * candidate: HEX.pipe_1.state_a.p(start = HEX.pipe_1.p_a_start)
// * candidate: HEX.pipe_1.state_a.p(start = 5000000.0)
// * candidate: HEX.pipe_1.mediums[1].state.p(start = 5000000.0)
// * candidate: HEX.pipe_1.statesFM[1].p(start = 5000000.0)
// * candidate: HEX.pipe_1.flowModel.states[1].p(start = 5000000.0)
Expand Down
4 changes: 2 additions & 2 deletions simulation/libraries/msl32/Modelica.Fluid.Examples.HeatExchanger.HeatExchangerSimulation.mos
View file
Expand Up @@ -93,7 +93,7 @@ runScript(modelTesting);getErrorString();
// * candidate: massFlowRate2.ports[1].p(start = 5000000.0)
// * candidate: massFlowRate2.medium.state.p(start = 5000000.0)
// * candidate: massFlowRate2.medium.sat.psat(start = 5000000.0)
// * candidate: HEX.pipe_2.state_b.p(start = HEX.pipe_2.p_b_start)
// * candidate: HEX.pipe_2.state_b.p(start = 5000000.0)
// * candidate: HEX.pipe_2.mediums[20].state.p(start = 5000000.0)
// * candidate: HEX.pipe_2.statesFM[21].p(start = 5000000.0)
// * candidate: HEX.pipe_2.flowModel.states[21].p(start = 5000000.0)
Expand Down Expand Up @@ -122,7 +122,7 @@ runScript(modelTesting);getErrorString();
// * candidate: massFlowRate1.ports[1].p(start = 5000000.0)
// * candidate: massFlowRate1.medium.state.p(start = 5000000.0)
// * candidate: massFlowRate1.medium.sat.psat(start = 5000000.0)
// * candidate: HEX.pipe_1.state_a.p(start = HEX.pipe_1.p_a_start)
// * candidate: HEX.pipe_1.state_a.p(start = 5000000.0)
// * candidate: HEX.pipe_1.mediums[1].state.p(start = 5000000.0)
// * candidate: HEX.pipe_1.statesFM[1].p(start = 5000000.0)
// * candidate: HEX.pipe_1.flowModel.states[1].p(start = 5000000.0)
Expand Down
12 changes: 6 additions & 6 deletions simulation/libraries/msl32/Modelica.Fluid.Examples.HeatingSystem.mos
View file
Expand Up @@ -42,7 +42,7 @@ runScript(modelTesting);getErrorString();
// * candidate: pipe.port_b.p(start = 5000000.0)
// * candidate: valve.port_a.p(start = 5000000.0)
// * candidate: valve.state_a.p(start = 5000000.0)
// * candidate: pipe.state_b.p(start = pipe.p_b_start)
// * candidate: pipe.state_b.p(start = 5000000.0)
// * candidate: pipe.mediums[2].state.p(start = 5000000.0)
// * candidate: pipe.statesFM[2].p(start = 5000000.0)
// * candidate: pipe.flowModel.states[2].p(start = 5000000.0)
Expand All @@ -66,10 +66,10 @@ runScript(modelTesting);getErrorString();
// * candidate: pipe.port_a.p(start = 5000000.0)
// * candidate: heater.port_b.p(start = 5000000.0)
// * candidate: sensor_T_forward.port.p(start = 5000000.0)
// * candidate: heater.state_b.p(start = heater.p_b_start)
// * candidate: heater.state_b.p(start = 5000000.0)
// * candidate: heater.statesFM[3].p(start = 5000000.0)
// * candidate: heater.flowModel.states[3].p(start = 5000000.0)
// * candidate: pipe.state_a.p(start = pipe.p_a_start)
// * candidate: pipe.state_a.p(start = 5000000.0)
// * candidate: pipe.mediums[1].state.p(start = 5000000.0)
// * candidate: pipe.statesFM[1].p(start = 5000000.0)
// * candidate: pipe.flowModel.states[1].p(start = 5000000.0)
Expand Down Expand Up @@ -133,7 +133,7 @@ runScript(modelTesting);getErrorString();
// * candidate: sensor_m_flow.port_a.p(start = 5000000.0)
// * candidate: sensor_m_flow.port_b.p(start = 5000000.0)
// * candidate: heater.port_a.p(start = 5000000.0)
// * candidate: heater.state_a.p(start = heater.p_a_start)
// * candidate: heater.state_a.p(start = 5000000.0)
// * candidate: heater.statesFM[1].p(start = 5000000.0)
// * candidate: heater.flowModel.states[1].p(start = 5000000.0)
// * candidate: pump.medium.state.p(start = 5000000.0)
Expand Down Expand Up @@ -162,15 +162,15 @@ runScript(modelTesting);getErrorString();
// => select value from tank.ports[2].p(start = 100000.0) for variable: tank.ports[2].p
// Warning: Alias set with several free start values
// * candidate: radiator.statesFM[3].p(start = 5000000.0)
// * candidate: radiator.state_b.p(start = radiator.p_b_start)
// * candidate: radiator.state_b.p(start = 110000.0)
// * candidate: radiator.port_b.p(start = 5000000.0)
// * candidate: tank.ports[1].p(start = 100000.0)
// * candidate: sensor_T_return.port.p(start = 5000000.0)
// * candidate: radiator.flowModel.states[3].p(start = 5000000.0)
// => select value from radiator.statesFM[3].p(start = 5000000.0) for variable: radiator.statesFM[3].p
// Warning: Alias set with several free start values
// * candidate: radiator.statesFM[1].p(start = 5000000.0)
// * candidate: radiator.state_a.p(start = radiator.p_a_start)
// * candidate: radiator.state_a.p(start = 110000.0)
// * candidate: radiator.port_a.p(start = 5000000.0)
// * candidate: valve.port_b.p(start = 5000000.0)
// * candidate: valve.state_b.p(start = 5000000.0)
Expand Down
2 changes: 1 addition & 1 deletion ...n/modelica/initialization/OverdeterminedInitialization.Fluid.DynamicPipeInitialValues.mos
View file
Expand Up @@ -22,7 +22,7 @@ simulate(OverdeterminedInitialization.Fluid.DynamicPipeInitialValues); getErrorS
// * candidate: pipe.port_b.p(start = 5000000.0)
// * candidate: valve.port_a.p(start = 5000000.0)
// * candidate: valve.state_a.p(start = 5000000.0)
// * candidate: pipe.state_b.p(start = pipe.p_b_start)
// * candidate: pipe.state_b.p(start = 5000000.0)
// * candidate: pipe.mediums[5].state.p(start = 5000000.0)
// * candidate: pipe.statesFM[5].p(start = 5000000.0)
// * candidate: pipe.flowModel.states[5].p(start = 5000000.0)
Expand Down
2 changes: 1 addition & 1 deletion ...ialization/OverdeterminedInitialization.Fluid.DynamicPipeLumpedPressureInitialization.mos
View file
Expand Up @@ -18,7 +18,7 @@ buildModel(OverdeterminedInitialization.Fluid.DynamicPipeLumpedPressureInitializ
// * candidate: pipe.port_b.p(start = 5000000.0)
// * candidate: valve.port_a.p(start = 5000000.0)
// * candidate: valve.state_a.p(start = 5000000.0)
// * candidate: pipe.state_b.p(start = pipe.p_b_start)
// * candidate: pipe.state_b.p(start = 5000000.0)
// * candidate: pipe.mediums[4].state.p(start = 5000000.0)
// * candidate: pipe.heatTransfer.states[4].p(start = 5000000.0)
// * candidate: pipe.mediums[4].sat.psat(start = 5000000.0)
Expand Down
6 changes: 3 additions & 3 deletions ...ization/OverdeterminedInitialization.Fluid.DynamicPipesSeriesLargeNSteadyStateInitial.mos
View file
Expand Up @@ -18,7 +18,7 @@ buildModel(OverdeterminedInitialization.Fluid.DynamicPipesSeriesLargeNSteadyStat
// * candidate: pipe2.port_b.p(start = 5000000.0)
// * candidate: valve.port_a.p(start = 5000000.0)
// * candidate: valve.state_a.p(start = 5000000.0)
// * candidate: pipe2.state_b.p(start = pipe2.p_b_start)
// * candidate: pipe2.state_b.p(start = 5000000.0)
// * candidate: pipe2.mediums[50].state.p(start = 5000000.0)
// * candidate: pipe2.statesFM[50].p(start = 5000000.0)
// * candidate: pipe2.flowModel.states[50].p(start = 5000000.0)
Expand Down Expand Up @@ -46,8 +46,8 @@ buildModel(OverdeterminedInitialization.Fluid.DynamicPipesSeriesLargeNSteadyStat
// * candidate: pipe2.flowModel.states[1].p(start = 5000000.0)
// * candidate: pipe2.heatTransfer.states[1].p(start = 5000000.0)
// * candidate: pipe2.mediums[1].sat.psat(start = 5000000.0)
// * candidate: pipe2.state_a.p(start = pipe2.p_a_start)
// * candidate: pipe1.state_b.p(start = pipe1.p_b_start)
// * candidate: pipe2.state_a.p(start = 5000000.0)
// * candidate: pipe1.state_b.p(start = 5000000.0)
// * candidate: pipe1.mediums[50].state.p(start = 5000000.0)
// * candidate: pipe1.statesFM[50].p(start = 5000000.0)
// * candidate: pipe1.flowModel.states[50].p(start = 5000000.0)
Expand Down
6 changes: 3 additions & 3 deletions ...nitialization/OverdeterminedInitialization.Fluid.DynamicPipesSeriesSteadyStateInitial.mos
View file
Expand Up @@ -18,7 +18,7 @@ buildModel(OverdeterminedInitialization.Fluid.DynamicPipesSeriesSteadyStateIniti
// * candidate: pipe2.port_b.p(start = 5000000.0)
// * candidate: valve.port_a.p(start = 5000000.0)
// * candidate: valve.state_a.p(start = 5000000.0)
// * candidate: pipe2.state_b.p(start = pipe2.p_b_start)
// * candidate: pipe2.state_b.p(start = 5000000.0)
// * candidate: pipe2.mediums[5].state.p(start = 5000000.0)
// * candidate: pipe2.statesFM[5].p(start = 5000000.0)
// * candidate: pipe2.flowModel.states[5].p(start = 5000000.0)
Expand Down Expand Up @@ -46,8 +46,8 @@ buildModel(OverdeterminedInitialization.Fluid.DynamicPipesSeriesSteadyStateIniti
// * candidate: pipe2.flowModel.states[1].p(start = 5000000.0)
// * candidate: pipe2.heatTransfer.states[1].p(start = 5000000.0)
// * candidate: pipe2.mediums[1].sat.psat(start = 5000000.0)
// * candidate: pipe2.state_a.p(start = pipe2.p_a_start)
// * candidate: pipe1.state_b.p(start = pipe1.p_b_start)
// * candidate: pipe2.state_a.p(start = 5000000.0)
// * candidate: pipe1.state_b.p(start = 5000000.0)
// * candidate: pipe1.mediums[5].state.p(start = 5000000.0)
// * candidate: pipe1.statesFM[5].p(start = 5000000.0)
// * candidate: pipe1.flowModel.states[5].p(start = 5000000.0)
Expand Down

0 comments on commit c2dcf10

Please sign in to comment.