Skip to content

Commit

Permalink
expected output
Browse files Browse the repository at this point in the history 
refs ticket:4869

Belonging to [master]:
  - OpenModelica/OMCompiler#2346
  - OpenModelica/OpenModelica-testsuite#917
  • Loading branch information
@vruge @OpenModelica-Hudson
vruge authored and OpenModelica-Hudson committed Apr 6, 2018
1 parent 576fac6 commit b29ad13
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions flattening/modelica/streams/StreamConcept_NoMedium_Total.mo
View file
Expand Up @@ -2271,7 +2271,7 @@ end SiemensPower_Components_Valves_Tests_valve_fixeddensity_test;
// valve_fixeddensity1.m_flow = valve_fixeddensity1.port_a.m_flow;
// valve_fixeddensity1.port_a.m_flow + valve_fixeddensity1.port_b.m_flow = 0.0;
// valve_fixeddensity1.port_a.h_outflow = watersink_ph_StreamConcept.port.h_outflow;
// valve_fixeddensity1.port_b.h_outflow = ($OMC$PositiveMax(-watersink_ph_StreamConcept1.port.m_flow, 1e-07) * watersink_ph_StreamConcept1.port.h_outflow + $OMC$PositiveMax(-InStreamEnthalpy.port.m_flow, 1e-07) * InStreamEnthalpy.port.h_outflow) / ($OMC$PositiveMax(-watersink_ph_StreamConcept1.port.m_flow, 1e-07) + $OMC$PositiveMax(-InStreamEnthalpy.port.m_flow, 1e-07));
// valve_fixeddensity1.port_b.h_outflow = $OMC$inStreamDiv(($OMC$PositiveMax(-watersink_ph_StreamConcept1.port.m_flow, 1e-07) * watersink_ph_StreamConcept1.port.h_outflow + $OMC$PositiveMax(-InStreamEnthalpy.port.m_flow, 1e-07) * InStreamEnthalpy.port.h_outflow) / ($OMC$PositiveMax(-watersink_ph_StreamConcept1.port.m_flow, 1e-07) + $OMC$PositiveMax(-InStreamEnthalpy.port.m_flow, 1e-07)), watersink_ph_StreamConcept1.port.h_outflow);
// if noEvent(valve_fixeddensity1.m_flow > valve_fixeddensity1.m_flow_small) then
// valve_fixeddensity1.fromleft = 1.0;
// elseif noEvent(valve_fixeddensity1.m_flow < (-valve_fixeddensity1.m_flow_small)) then
Expand All @@ -2280,7 +2280,7 @@ end SiemensPower_Components_Valves_Tests_valve_fixeddensity_test;
// valve_fixeddensity1.fromleft = 0.5 * (1.0 + (-0.5) * valve_fixeddensity1.m_flow * (-3.0 + (valve_fixeddensity1.m_flow / valve_fixeddensity1.m_flow_small) ^ 2.0) / valve_fixeddensity1.m_flow_small);
// end if;
// valve_fixeddensity1.p = valve_fixeddensity1.fromleft * valve_fixeddensity1.port_a.p + (1.0 - valve_fixeddensity1.fromleft) * valve_fixeddensity1.port_b.p;
// valve_fixeddensity1.h = valve_fixeddensity1.fromleft * ($OMC$PositiveMax(-watersink_ph_StreamConcept1.port.m_flow, 1e-07) * watersink_ph_StreamConcept1.port.h_outflow + $OMC$PositiveMax(-InStreamEnthalpy.port.m_flow, 1e-07) * InStreamEnthalpy.port.h_outflow) / ($OMC$PositiveMax(-watersink_ph_StreamConcept1.port.m_flow, 1e-07) + $OMC$PositiveMax(-InStreamEnthalpy.port.m_flow, 1e-07)) + (1.0 - valve_fixeddensity1.fromleft) * watersink_ph_StreamConcept.port.h_outflow;
// valve_fixeddensity1.h = valve_fixeddensity1.fromleft * $OMC$inStreamDiv(($OMC$PositiveMax(-watersink_ph_StreamConcept1.port.m_flow, 1e-07) * watersink_ph_StreamConcept1.port.h_outflow + $OMC$PositiveMax(-InStreamEnthalpy.port.m_flow, 1e-07) * InStreamEnthalpy.port.h_outflow) / ($OMC$PositiveMax(-watersink_ph_StreamConcept1.port.m_flow, 1e-07) + $OMC$PositiveMax(-InStreamEnthalpy.port.m_flow, 1e-07)), watersink_ph_StreamConcept1.port.h_outflow) + (1.0 - valve_fixeddensity1.fromleft) * watersink_ph_StreamConcept.port.h_outflow;
// valve_fixeddensity1.dp = valve_fixeddensity1.port_a.p - valve_fixeddensity1.port_b.p;
// watersink_ph_StreamConcept.port.p = watersink_ph_StreamConcept.p_in;
// watersink_ph_StreamConcept.port.h_outflow = watersink_ph_StreamConcept.h0;
Expand All @@ -2291,7 +2291,7 @@ end SiemensPower_Components_Valves_Tests_valve_fixeddensity_test;
// watersink_ph_StreamConcept1.port.h_outflow = watersink_ph_StreamConcept1.h0;
// InStreamEnthalpy.port.m_flow = 0.0;
// InStreamEnthalpy.port.h_outflow = 0.0;
// InStreamEnthalpy.h_out = ($OMC$PositiveMax(-valve_fixeddensity1.port_a.m_flow, 1e-07) * valve_fixeddensity1.port_a.h_outflow + $OMC$PositiveMax(-watersink_ph_StreamConcept1.port.m_flow, 1e-07) * watersink_ph_StreamConcept1.port.h_outflow) / ($OMC$PositiveMax(-valve_fixeddensity1.port_a.m_flow, 1e-07) + $OMC$PositiveMax(-watersink_ph_StreamConcept1.port.m_flow, 1e-07));
// InStreamEnthalpy.h_out = $OMC$inStreamDiv(($OMC$PositiveMax(-valve_fixeddensity1.port_a.m_flow, 1e-07) * valve_fixeddensity1.port_a.h_outflow + $OMC$PositiveMax(-watersink_ph_StreamConcept1.port.m_flow, 1e-07) * watersink_ph_StreamConcept1.port.h_outflow) / ($OMC$PositiveMax(-valve_fixeddensity1.port_a.m_flow, 1e-07) + $OMC$PositiveMax(-watersink_ph_StreamConcept1.port.m_flow, 1e-07)), valve_fixeddensity1.port_a.h_outflow);
// valve_fixeddensity1.port_a.m_flow + watersink_ph_StreamConcept1.port.m_flow + InStreamEnthalpy.port.m_flow = 0.0;
// valve_fixeddensity1.port_b.m_flow + watersink_ph_StreamConcept.port.m_flow = 0.0;
// valve_fixeddensity1.port_b.p = watersink_ph_StreamConcept.port.p;
Expand Down
12 changes: 6 additions & 6 deletions openmodelica/interactive-API/Bug2871.mos
View file
Expand Up @@ -2363,7 +2363,7 @@ instantiateModel(Modelica.Fluid.Examples.Tanks.ThreeTanks); getErrorString();
// tank3.U = tank3.m * tank3.medium.u;
// der(tank3.U) = tank3.Hb_flow + tank3.Qb_flow + tank3.Wb_flow;
// der(tank3.m) = tank3.mb_flow;
// pipe1.flowModel.states[1] = /*.Modelica.Fluid.Pipes.StaticPipe$pipe1.FlowModel$pipe1$flowModel.Medium.ThermodynamicState*/(Modelica.Fluid.Pipes.StaticPipe$pipe1.Medium.setState_phX(pipe1.port_a.p, ($OMC$PositiveMax(-pipe2.port_a.m_flow, 1e-07) * pipe2.port_a.h_outflow + $OMC$PositiveMax(-pipe3.port_a.m_flow, 1e-07) * pipe3.port_a.h_outflow) / ($OMC$PositiveMax(-pipe2.port_a.m_flow, 1e-07) + $OMC$PositiveMax(-pipe3.port_a.m_flow, 1e-07)), {}));
// pipe1.flowModel.states[1] = /*.Modelica.Fluid.Pipes.StaticPipe$pipe1.FlowModel$pipe1$flowModel.Medium.ThermodynamicState*/(Modelica.Fluid.Pipes.StaticPipe$pipe1.Medium.setState_phX(pipe1.port_a.p, $OMC$inStreamDiv(($OMC$PositiveMax(-pipe2.port_a.m_flow, 1e-07) * pipe2.port_a.h_outflow + $OMC$PositiveMax(-pipe3.port_a.m_flow, 1e-07) * pipe3.port_a.h_outflow) / ($OMC$PositiveMax(-pipe2.port_a.m_flow, 1e-07) + $OMC$PositiveMax(-pipe3.port_a.m_flow, 1e-07)), pipe2.port_a.h_outflow), {}));
// pipe1.flowModel.states[2] = /*.Modelica.Fluid.Pipes.StaticPipe$pipe1.FlowModel$pipe1$flowModel.Medium.ThermodynamicState*/(Modelica.Fluid.Pipes.StaticPipe$pipe1.Medium.setState_phX(pipe1.port_b.p, tank1.ports[1].h_outflow, {}));
// pipe1.flowModel.vs = {pipe1.port_a.m_flow / (pipe1.flowModel.crossAreas[1] * Modelica.Fluid.Pipes.StaticPipe$pipe1.Medium.density(/*.Modelica.Fluid.Pipes.StaticPipe$pipe1.Medium.ThermodynamicState*/(pipe1.flowModel.states[1])) * pipe1.nParallel), (-pipe1.port_b.m_flow) / (pipe1.flowModel.crossAreas[2] * Modelica.Fluid.Pipes.StaticPipe$pipe1.Medium.density(/*.Modelica.Fluid.Pipes.StaticPipe$pipe1.Medium.ThermodynamicState*/(pipe1.flowModel.states[2])) * pipe1.nParallel)};
// pipe1.flowModel.crossAreas = {pipe1.crossArea, pipe1.crossArea};
Expand All @@ -2387,10 +2387,10 @@ instantiateModel(Modelica.Fluid.Examples.Tanks.ThreeTanks); getErrorString();
// 0.0 = pipe1.flowModel.Ib_flows[1] - pipe1.flowModel.Fs_p[1] - pipe1.flowModel.Fs_fg[1];
// pipe1.port_a.m_flow = pipe1.flowModel.m_flows[1];
// 0.0 = pipe1.port_a.m_flow + pipe1.port_b.m_flow;
// pipe1.port_b.h_outflow = ($OMC$PositiveMax(-pipe2.port_a.m_flow, 1e-07) * pipe2.port_a.h_outflow + $OMC$PositiveMax(-pipe3.port_a.m_flow, 1e-07) * pipe3.port_a.h_outflow) / ($OMC$PositiveMax(-pipe2.port_a.m_flow, 1e-07) + $OMC$PositiveMax(-pipe3.port_a.m_flow, 1e-07)) - system.g * pipe1.height_ab;
// pipe1.port_b.h_outflow = $OMC$inStreamDiv(($OMC$PositiveMax(-pipe2.port_a.m_flow, 1e-07) * pipe2.port_a.h_outflow + $OMC$PositiveMax(-pipe3.port_a.m_flow, 1e-07) * pipe3.port_a.h_outflow) / ($OMC$PositiveMax(-pipe2.port_a.m_flow, 1e-07) + $OMC$PositiveMax(-pipe3.port_a.m_flow, 1e-07)), pipe2.port_a.h_outflow) - system.g * pipe1.height_ab;
// pipe1.port_a.h_outflow = tank1.ports[1].h_outflow + system.g * pipe1.height_ab;
// assert(pipe1.length >= pipe1.height_ab, \"Parameter length must be greater or equal height_ab.\");
// pipe2.flowModel.states[1] = /*.Modelica.Fluid.Pipes.StaticPipe$pipe2.FlowModel$pipe2$flowModel.Medium.ThermodynamicState*/(Modelica.Fluid.Pipes.StaticPipe$pipe2.Medium.setState_phX(pipe2.port_a.p, ($OMC$PositiveMax(-pipe1.port_a.m_flow, 1e-07) * pipe1.port_a.h_outflow + $OMC$PositiveMax(-pipe3.port_a.m_flow, 1e-07) * pipe3.port_a.h_outflow) / ($OMC$PositiveMax(-pipe1.port_a.m_flow, 1e-07) + $OMC$PositiveMax(-pipe3.port_a.m_flow, 1e-07)), {}));
// pipe2.flowModel.states[1] = /*.Modelica.Fluid.Pipes.StaticPipe$pipe2.FlowModel$pipe2$flowModel.Medium.ThermodynamicState*/(Modelica.Fluid.Pipes.StaticPipe$pipe2.Medium.setState_phX(pipe2.port_a.p, $OMC$inStreamDiv(($OMC$PositiveMax(-pipe1.port_a.m_flow, 1e-07) * pipe1.port_a.h_outflow + $OMC$PositiveMax(-pipe3.port_a.m_flow, 1e-07) * pipe3.port_a.h_outflow) / ($OMC$PositiveMax(-pipe1.port_a.m_flow, 1e-07) + $OMC$PositiveMax(-pipe3.port_a.m_flow, 1e-07)), pipe1.port_a.h_outflow), {}));
// pipe2.flowModel.states[2] = /*.Modelica.Fluid.Pipes.StaticPipe$pipe2.FlowModel$pipe2$flowModel.Medium.ThermodynamicState*/(Modelica.Fluid.Pipes.StaticPipe$pipe2.Medium.setState_phX(pipe2.port_b.p, tank2.ports[1].h_outflow, {}));
// pipe2.flowModel.vs = {pipe2.port_a.m_flow / (pipe2.flowModel.crossAreas[1] * Modelica.Fluid.Pipes.StaticPipe$pipe2.Medium.density(/*.Modelica.Fluid.Pipes.StaticPipe$pipe2.Medium.ThermodynamicState*/(pipe2.flowModel.states[1])) * pipe2.nParallel), (-pipe2.port_b.m_flow) / (pipe2.flowModel.crossAreas[2] * Modelica.Fluid.Pipes.StaticPipe$pipe2.Medium.density(/*.Modelica.Fluid.Pipes.StaticPipe$pipe2.Medium.ThermodynamicState*/(pipe2.flowModel.states[2])) * pipe2.nParallel)};
// pipe2.flowModel.crossAreas = {pipe2.crossArea, pipe2.crossArea};
Expand All @@ -2414,10 +2414,10 @@ instantiateModel(Modelica.Fluid.Examples.Tanks.ThreeTanks); getErrorString();
// 0.0 = pipe2.flowModel.Ib_flows[1] - pipe2.flowModel.Fs_p[1] - pipe2.flowModel.Fs_fg[1];
// pipe2.port_a.m_flow = pipe2.flowModel.m_flows[1];
// 0.0 = pipe2.port_a.m_flow + pipe2.port_b.m_flow;
// pipe2.port_b.h_outflow = ($OMC$PositiveMax(-pipe1.port_a.m_flow, 1e-07) * pipe1.port_a.h_outflow + $OMC$PositiveMax(-pipe3.port_a.m_flow, 1e-07) * pipe3.port_a.h_outflow) / ($OMC$PositiveMax(-pipe1.port_a.m_flow, 1e-07) + $OMC$PositiveMax(-pipe3.port_a.m_flow, 1e-07)) - system.g * pipe2.height_ab;
// pipe2.port_b.h_outflow = $OMC$inStreamDiv(($OMC$PositiveMax(-pipe1.port_a.m_flow, 1e-07) * pipe1.port_a.h_outflow + $OMC$PositiveMax(-pipe3.port_a.m_flow, 1e-07) * pipe3.port_a.h_outflow) / ($OMC$PositiveMax(-pipe1.port_a.m_flow, 1e-07) + $OMC$PositiveMax(-pipe3.port_a.m_flow, 1e-07)), pipe1.port_a.h_outflow) - system.g * pipe2.height_ab;
// pipe2.port_a.h_outflow = tank2.ports[1].h_outflow + system.g * pipe2.height_ab;
// assert(pipe2.length >= pipe2.height_ab, \"Parameter length must be greater or equal height_ab.\");
// pipe3.flowModel.states[1] = /*.Modelica.Fluid.Pipes.StaticPipe$pipe3.FlowModel$pipe3$flowModel.Medium.ThermodynamicState*/(Modelica.Fluid.Pipes.StaticPipe$pipe3.Medium.setState_phX(pipe3.port_a.p, ($OMC$PositiveMax(-pipe1.port_a.m_flow, 1e-07) * pipe1.port_a.h_outflow + $OMC$PositiveMax(-pipe2.port_a.m_flow, 1e-07) * pipe2.port_a.h_outflow) / ($OMC$PositiveMax(-pipe1.port_a.m_flow, 1e-07) + $OMC$PositiveMax(-pipe2.port_a.m_flow, 1e-07)), {}));
// pipe3.flowModel.states[1] = /*.Modelica.Fluid.Pipes.StaticPipe$pipe3.FlowModel$pipe3$flowModel.Medium.ThermodynamicState*/(Modelica.Fluid.Pipes.StaticPipe$pipe3.Medium.setState_phX(pipe3.port_a.p, $OMC$inStreamDiv(($OMC$PositiveMax(-pipe1.port_a.m_flow, 1e-07) * pipe1.port_a.h_outflow + $OMC$PositiveMax(-pipe2.port_a.m_flow, 1e-07) * pipe2.port_a.h_outflow) / ($OMC$PositiveMax(-pipe1.port_a.m_flow, 1e-07) + $OMC$PositiveMax(-pipe2.port_a.m_flow, 1e-07)), pipe1.port_a.h_outflow), {}));
// pipe3.flowModel.states[2] = /*.Modelica.Fluid.Pipes.StaticPipe$pipe3.FlowModel$pipe3$flowModel.Medium.ThermodynamicState*/(Modelica.Fluid.Pipes.StaticPipe$pipe3.Medium.setState_phX(pipe3.port_b.p, tank3.ports[1].h_outflow, {}));
// pipe3.flowModel.vs = {pipe3.port_a.m_flow / (pipe3.flowModel.crossAreas[1] * Modelica.Fluid.Pipes.StaticPipe$pipe3.Medium.density(/*.Modelica.Fluid.Pipes.StaticPipe$pipe3.Medium.ThermodynamicState*/(pipe3.flowModel.states[1])) * pipe3.nParallel), (-pipe3.port_b.m_flow) / (pipe3.flowModel.crossAreas[2] * Modelica.Fluid.Pipes.StaticPipe$pipe3.Medium.density(/*.Modelica.Fluid.Pipes.StaticPipe$pipe3.Medium.ThermodynamicState*/(pipe3.flowModel.states[2])) * pipe3.nParallel)};
// pipe3.flowModel.crossAreas = {pipe3.crossArea, pipe3.crossArea};
Expand All @@ -2441,7 +2441,7 @@ instantiateModel(Modelica.Fluid.Examples.Tanks.ThreeTanks); getErrorString();
// 0.0 = pipe3.flowModel.Ib_flows[1] - pipe3.flowModel.Fs_p[1] - pipe3.flowModel.Fs_fg[1];
// pipe3.port_a.m_flow = pipe3.flowModel.m_flows[1];
// 0.0 = pipe3.port_a.m_flow + pipe3.port_b.m_flow;
// pipe3.port_b.h_outflow = ($OMC$PositiveMax(-pipe1.port_a.m_flow, 1e-07) * pipe1.port_a.h_outflow + $OMC$PositiveMax(-pipe2.port_a.m_flow, 1e-07) * pipe2.port_a.h_outflow) / ($OMC$PositiveMax(-pipe1.port_a.m_flow, 1e-07) + $OMC$PositiveMax(-pipe2.port_a.m_flow, 1e-07)) - system.g * pipe3.height_ab;
// pipe3.port_b.h_outflow = $OMC$inStreamDiv(($OMC$PositiveMax(-pipe1.port_a.m_flow, 1e-07) * pipe1.port_a.h_outflow + $OMC$PositiveMax(-pipe2.port_a.m_flow, 1e-07) * pipe2.port_a.h_outflow) / ($OMC$PositiveMax(-pipe1.port_a.m_flow, 1e-07) + $OMC$PositiveMax(-pipe2.port_a.m_flow, 1e-07)), pipe1.port_a.h_outflow) - system.g * pipe3.height_ab;
// pipe3.port_a.h_outflow = tank3.ports[1].h_outflow + system.g * pipe3.height_ab;
// assert(pipe3.length >= pipe3.height_ab, \"Parameter length must be greater or equal height_ab.\");
// tank1.ports[1].m_flow + pipe1.port_b.m_flow = 0.0;
Expand Down

0 comments on commit b29ad13

Please sign in to comment.