Redesign flashtank

MetroscopeModelingLibrary/Examples/CCGT/Evaporator_noRecirculation_direct.mo

@@ -39,8 +39,8 @@ equation
   evaporator.Kfr_cold = Kfr_cold;
 
   connect(flashTank.C_in, evaporator.C_cold_out) annotation (Line(points={{-26,52},{-10.7,52},{-10.7,25.2}}, color={28,108,200}));
-  connect(flashTank.C_hot_steam, cold_steam_sink.C_in) annotation (Line(points={{-46,52},{-85,52}}, color={28,108,200}));
-  connect(flashTank.C_hot_liquid, cold_liquid_sink.C_in) annotation (Line(points={{-46,44},{-76,44},{-76,-52},{-83,-52}}, color={28,108,200}));
+  connect(flashTank.C_steam_out, cold_steam_sink.C_in) annotation (Line(points={{-46,52},{-85,52}}, color={28,108,200}));
+  connect(flashTank.C_liquid_out, cold_liquid_sink.C_in) annotation (Line(points={{-46,44},{-76,44},{-76,-52},{-83,-52}}, color={28,108,200}));
   connect(evaporator.C_hot_in, hot_source.C_out) annotation (Line(points={{-26.3,-0.72},{-55.65,-0.72},{-55.65,0},{-85,0}}, color={95,95,95}));
   connect(evaporator.C_hot_out, hot_sink.C_in) annotation (Line(points={{28.3,-0.72},{45.65,-0.72},{45.65,0},{59,0}}, color={95,95,95}));
   connect(evaporator.C_cold_in, cold_source.C_out) annotation (Line(points={{12.7,25.2},{12.7,40},{57,40}}, color={28,108,200}));

MetroscopeModelingLibrary/Examples/CCGT/Evaporator_noRecirculation_reverse.mo

@@ -63,8 +63,8 @@ equation
   connect(evaporator.C_hot_out, P_hot_out_sensor.C_in) annotation (Line(points={{28.3,-0.72},{36.15,-0.72},{36.15,0},{44,0}}, color={95,95,95}));
   connect(hot_sink.C_in, P_hot_out_sensor.C_out) annotation (Line(points={{59,0},{52,0}}, color={95,95,95}));
   connect(cold_liquid_sink.C_in, Q_cold_liquid_out.C_out) annotation (Line(points={{-83,-52},{-50,-52},{-50,-44}}, color={28,108,200}));
-  connect(flashTank.C_hot_liquid, Q_cold_liquid_out.C_in) annotation (Line(points={{-46,44},{-50,44},{-50,-28}}, color={28,108,200}));
-  connect(flashTank.C_hot_steam, P_cold_out_sensor.C_in) annotation (Line(points={{-46,52},{-58,52}}, color={28,108,200}));
+  connect(flashTank.C_liquid_out, Q_cold_liquid_out.C_in) annotation (Line(points={{-46,44},{-50,44},{-50,-28}}, color={28,108,200}));
+  connect(flashTank.C_steam_out, P_cold_out_sensor.C_in) annotation (Line(points={{-46,52},{-58,52}}, color={28,108,200}));
   connect(cold_steam_sink.C_in, P_cold_out_sensor.C_out) annotation (Line(points={{-85,52},{-74,52}}, color={28,108,200}));
   annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={
         Ellipse(

MetroscopeModelingLibrary/Examples/CCGT/Evaporator_withRecirculation_direct.mo

@@ -55,11 +55,11 @@ equation
   connect(evaporator.C_hot_out, hot_sink.C_in) annotation (Line(points={{28.3,-0.72},{45.65,-0.72},{45.65,0},{59,0}}, color={95,95,95}));
   connect(cold_source.C_out, flashTank.C_in) annotation (Line(points={{-28,83},{
           -28,69.8},{-18,69.8}},                   color={28,108,200}));
-  connect(flashTank.C_hot_steam, cold_steam_sink.C_in) annotation (Line(points={
+  connect(flashTank.C_steam_out, cold_steam_sink.C_in) annotation (Line(points={
           {16,69.8},{16,68},{48,68},{48,80},{59,80}}, color={28,108,200}));
-  connect(cold_liquid_sink.C_in, flashTank.C_hot_liquid)
+  connect(cold_liquid_sink.C_in,flashTank.C_liquid_out)
     annotation (Line(points={{59,48},{16,48},{16,56.2}}, color={28,108,200}));
-  connect(flashTank.C_hot_liquid, evaporator.C_cold_in) annotation (Line(points=
+  connect(flashTank.C_liquid_out, evaporator.C_cold_in) annotation (Line(points=
          {{16,56.2},{16,25.2},{12.7,25.2}}, color={28,108,200}));
   connect(evaporator.C_cold_out, pressureCut.C_in) annotation (Line(points={{-10.7,
           25.2},{-46,25.2},{-46,34}}, color={28,108,200}));

MetroscopeModelingLibrary/Examples/Nuclear/FeedWater/FlashTank_Reheater.mo

@@ -90,8 +90,8 @@ equation
   connect(reheater_to_flash_tank_DP.C_out, flashTank.C_in) annotation (Line(points={{-12.5,10},{-78,10},{-78,-14.6}}, color={63,81,181}));
   connect(feed_water_pump.C_out, feed_water_sink.C_in) annotation (Line(points={{-69,-80},{-99,-80},{-99,30},{-115,30}}, color={63,81,181}));
   connect(flash_tank_to_reheater_DP.C_out, dry_reheater.C_hot_in) annotation (Line(points={{73,55.5},{50,55.5},{50,38}}, color={63,81,181}));
-  connect(flashTank.C_hot_liquid, feed_water_pump.C_in) annotation (Line(points={{-36,-31.4},{-36,-30},{-28,-30},{-28,-80},{-51,-80}}, color={28,108,200}));
-  connect(flashTank.C_hot_steam, flash_tank_to_reheater_DP.C_in) annotation (Line(points={{-36,-14.6},{112,-14.6},{112,55.5},{100,55.5}}, color={28,108,200}));
+  connect(flashTank.C_liquid_out, feed_water_pump.C_in) annotation (Line(points={{-36,-31.4},{-36,-30},{-28,-30},{-28,-80},{-51,-80}}, color={28,108,200}));
+  connect(flashTank.C_steam_out, flash_tank_to_reheater_DP.C_in) annotation (Line(points={{-36,-14.6},{112,-14.6},{112,55.5},{100,55.5}}, color={28,108,200}));
   connect(feed_water_pump.VRot, feed_water_pump_VRot_sensor.VRot) annotation (Line(points={{-60,-90.8},{-60,-101.84}}, color={0,0,127}));
   annotation (Diagram(coordinateSystem(extent={{-140,-140},{140,140}})), Icon(coordinateSystem(extent={{-140,-140},{140,140}}), graphics={
         Rectangle(

MetroscopeModelingLibrary/Examples/Nuclear/MainSteam/MoistureSeparatorReheater_direct.mo

@@ -108,8 +108,8 @@ equation
   connect(superheater_2.C_cold_out, superheated_steam_T_sensor.C_in) annotation (Line(points={{0,48},{-5.55112e-16,48},{-5.55112e-16,54}},              color={28,108,200}));
   connect(superheated_steam_T_sensor.C_out, superheated_steam_sink.C_in) annotation (Line(points={{0,74},{0,80},{75,80}}, color={28,108,200}));
   connect(cold_steam_source.C_out, steam_dryer.C_in) annotation (Line(points={{-65,-60},{-56.5,-60},{-56.5,-60.1983},{-45.5,-60.1983}}, color={28,108,200}));
-  connect(steam_dryer.C_hot_steam, superheater_1.C_cold_in) annotation (Line(points={{-10.5,-60.1983},{0,-60.1983},{0,-28}}, color={28,108,200}));
-  connect(steam_dryer.C_hot_liquid, dryer_liq_sink.C_in) annotation (Line(points={{-10.5,-75.8016},{-10.5,-74},{-10,-74},{-10,-86},{75,-86}},  color={28,108,200}));
+  connect(steam_dryer.C_steam_out, superheater_1.C_cold_in) annotation (Line(points={{-10.5,-60.1983},{0,-60.1983},{0,-28}}, color={28,108,200}));
+  connect(steam_dryer.C_liquid_out, dryer_liq_sink.C_in) annotation (Line(points={{-10.5,-75.8016},{-10.5,-74},{-10,-74},{-10,-86},{75,-86}},  color={28,108,200}));
   annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-160,-140},{160,140}}), graphics={
         Polygon(
           points={{-156,80},{-156,60},{-156,-62.5},{-156,-80},{-116,-80},{14,-80},{164,-80},{164,80},{14,80},{-116,80},{-156,80}},

MetroscopeModelingLibrary/Examples/Nuclear/MainSteam/MoistureSeparatorReheater_reverse.mo

@@ -110,8 +110,8 @@ equation
   connect(superheater_2.C_cold_out, superheated_steam_T_sensor.C_in) annotation (Line(points={{0,48},{-5.55112e-16,48},{-5.55112e-16,54}},              color={28,108,200}));
   connect(superheated_steam_T_sensor.C_out, superheated_steam_sink.C_in) annotation (Line(points={{0,74},{0,80},{75,80}}, color={28,108,200}));
   connect(cold_steam_source.C_out, steam_dryer.C_in) annotation (Line(points={{-65,-60},{-56.5,-60},{-56.5,-60.1983},{-45.5,-60.1983}}, color={28,108,200}));
-  connect(steam_dryer.C_hot_steam, superheater_1.C_cold_in) annotation (Line(points={{-10.5,-60.1983},{0,-60.1983},{0,-28}}, color={28,108,200}));
-  connect(steam_dryer.C_hot_liquid, dryer_liq_sink.C_in) annotation (Line(points={{-10.5,-75.8016},{-10.5,-74},{-10,-74},{-10,-86},{75,-86}},  color={28,108,200}));
+  connect(steam_dryer.C_steam_out, superheater_1.C_cold_in) annotation (Line(points={{-10.5,-60.1983},{0,-60.1983},{0,-28}}, color={28,108,200}));
+  connect(steam_dryer.C_liquid_out, dryer_liq_sink.C_in) annotation (Line(points={{-10.5,-75.8016},{-10.5,-74},{-10,-74},{-10,-86},{75,-86}},  color={28,108,200}));
   annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-160,-140},{160,140}}), graphics={
         Polygon(
           points={{-156,80},{-156,60},{-156,-62.5},{-156,-80},{-116,-80},{14,-80},{164,-80},{164,80},{14,80},{-116,80},{-156,80}},

MetroscopeModelingLibrary/Examples/Nuclear/MetroscopiaNPP/MetroscopiaNPP_direct.mo

@@ -119,8 +119,6 @@ model MetroscopiaNPP_direct
   MetroscopeModelingLibrary.Sensors.WaterSteam.PressureSensor HPT_P_out_sensor annotation (Placement(transformation(extent={{26,66},{38,78}})));
     MetroscopeModelingLibrary.WaterSteam.Volumes.SteamDryer steam_dryer(
     P_0=1940000,
-    T_0=483.95,
-    h_in_0=2.68e6,
     Q_in_0=1113,
     Q_liq_0=50)                                                         annotation (Placement(transformation(extent={{56,79.8182},{72,97.8182}})));
     MetroscopeModelingLibrary.WaterSteam.HeatExchangers.Superheater superheater(
@@ -506,8 +504,8 @@ equation
   connect(HPT_1.C_W_out, generator.C_in) annotation (Line(points={{-61,78.72},{-54,78.72},{-54,168},{315.6,168}},     color={244,125,35}));
   connect(HPT_1.C_in, HPT_P_in_sensor.C_out) annotation (Line(points={{-79,72},{-94,72}},           color={28,108,200}));
   connect(HPT_P_out_sensor.C_in, HPT_2.C_out) annotation (Line(points={{26,72},{9,72}},            color={28,108,200}));
-  connect(steam_dryer.C_in, HPT_P_out_sensor.C_out) annotation (Line(points={{56,91.2727},{56,92},{46,92},{46,72},{38,72}},        color={28,108,200}));
-  connect(superheater.C_cold_in, steam_dryer.C_hot_steam) annotation (Line(points={{72,104},{72,91.2727}},              color={28,108,200}));
+  connect(steam_dryer.C_in, HPT_P_out_sensor.C_out) annotation (Line(points={{56,92.4182},{56,92},{46,92},{46,72},{38,72}},        color={28,108,200}));
+  connect(superheater.C_cold_in,steam_dryer.C_steam_out)  annotation (Line(points={{72,104},{72,92.4182}},              color={28,108,200}));
   connect(superheater.C_hot_out, superheater_drains_P_sensor.C_in) annotation (Line(points={{88,112},{100,112}}, color={28,108,200}));
   connect(superheater_T_out_sensor.C_in,superheater. C_cold_out) annotation (Line(points={{88,130},{72,130},{72,120}},         color={28,108,200}));
   connect(superheater_control_valve.C_in, HP_control_valve.C_in) annotation (Line(points={{-136,112.182},{-136,112},{-158,112},{-158,72},{-135,72}},    color={28,108,200}));
@@ -533,7 +531,7 @@ equation
   connect(LPT1.C_out, LP_extract.C_in) annotation (Line(points={{169,130},{185.4,130}},                                 color={28,108,200}));
   connect(LPT2.C_in, LP_extract.C_main_out) annotation (Line(points={{221,130},{206.6,130}},                                 color={28,108,200}));
   connect(deaerator_inlet_pipe.C_in, LP_heater_T_out_sensor.C_out) annotation (Line(points={{186,-70},{206,-70}}, color={28,108,200}));
-  connect(steam_dryer.C_hot_liquid, steam_dryer_liq_out_pipe.C_in) annotation (Line(points={{72,84.7273},{72,-34},{142,-34},{142,-40}},
+  connect(steam_dryer.C_liquid_out, steam_dryer_liq_out_pipe.C_in) annotation (Line(points={{72,85.2182},{72,-34},{142,-34},{142,-40}},
                                                                                                                                      color={28,108,200}));
   connect(deaerator_inlet_pipe.C_out, deaerator_outlet_pipe.C_in) annotation (Line(points={{166,-70},{114,-70}}, color={28,108,200}));
   connect(steam_dryer_liq_out_pipe.C_out, deaerator_outlet_pipe.C_in) annotation (Line(points={{142,-60},{142,-70},{114,-70}}, color={28,108,200}));

MetroscopeModelingLibrary/Examples/Nuclear/MetroscopiaNPP/MetroscopiaNPP_direct_withStartValues.mo

@@ -2596,114 +2596,6 @@ d(start=777.39557),
 h(start=1154502.0),
 p(start=5000000.0),
 phase(start=0))),
-steam_dryer(
-C_hot_liquid(
-P(start=1940000.0),
-Q(start=-53.485546),
-h_outflow(start=901606.56)),
-C_hot_steam(
-P(start=1940000.0),
-Q(start=-1059.745),
-h_outflow(start=2778769.2)),
-C_in(
-P(start=1940000.0),
-Q(start=1113.2305),
-h_outflow(start=0.0)),
-P(start=1940000.0),
-P_0(start=1940000.0),
-Q_in(start=1113.2305),
-Q_in_0(start=1113.0),
-Q_liq_0(start=50.0),
-Q_vap_0(start=1063.0),
-T_0(start=483.95),
-h_in_0(start=2680000.0),
-h_liq_sat(start=901606.56),
-h_vap_sat(start=2797730.5),
-liquid_phase(
-C_in(
-P(start=1940000.0),
-Q(start=53.485546),
-h_outflow(start=0.0)),
-C_out(
-P(start=1940000.0),
-Q(start=-53.485546),
-h_outflow(start=901606.56)),
-DP(start=0.0),
-DP_0(start=0.0),
-P(start=1940000.0),
-P_0(start=1940000.0),
-P_in(start=1940000.0),
-P_in_0(start=1940000.0),
-P_out(start=1940000.0),
-P_out_0(start=1940000.0),
-Q(start=53.485546),
-Q_0(start=50.0),
-T_in(start=484.00024),
-T_in_0(start=483.95),
-T_out(start=483.99838),
-T_out_0(start=483.95),
-W(start=-95577256.0),
-W_input(start=-95577256.0),
-h_in(start=2688580.2),
-h_in_0(start=2680000.0),
-h_out(start=901606.56),
-h_out_0(start=901606.56),
-rho(start=431.01202),
-state_in(
-T(start=484.00024),
-d(start=10.33569),
-h(start=2688580.2),
-p(start=1940000.0),
-phase(start=0)),
-state_out(
-T(start=483.99838),
-d(start=851.68835),
-h(start=901606.56),
-p(start=1940000.0),
-phase(start=0))),
-steam_phase(
-C_in(
-P(start=1940000.0),
-Q(start=1059.745),
-h_outflow(start=0.0)),
-C_out(
-P(start=1940000.0),
-Q(start=-1059.745),
-h_outflow(start=2778769.2)),
-DP(start=0.0),
-DP_0(start=0.0),
-P(start=1940000.0),
-P_0(start=1940000.0),
-P_in(start=1940000.0),
-P_in_0(start=1940000.0),
-P_out(start=1940000.0),
-P_out_0(start=1940000.0),
-Q(start=1059.745),
-Q_0(start=1063.0),
-T_in(start=484.00024),
-T_in_0(start=483.95),
-T_out(start=484.00034),
-T_out_0(start=483.95),
-W(start=95577256.0),
-W_input(start=95577256.0),
-h_in(start=2688580.2),
-h_in_0(start=2680000.0),
-h_out(start=2778769.2),
-h_out_0(start=2797730.5),
-rho(start=10.090268),
-state_in(
-T(start=484.00024),
-d(start=10.33569),
-h(start=2688580.2),
-p(start=1940000.0),
-phase(start=0)),
-state_out(
-T(start=484.00034),
-d(start=9.844848),
-h(start=2778769.2),
-p(start=1940000.0),
-phase(start=0))),
-x_steam_out(start=0.99)),
 steam_dryer_liq_out_pipe(
 C_in(
 P(start=1940000.0),

MetroscopeModelingLibrary/Examples/Nuclear/MetroscopiaNPP/MetroscopiaNPP_faulty_withStartValues.mo

@@ -1848,14 +1848,6 @@ state_in(
 T(start=537.072),
 h(start=1154502.0))),
 steam_dryer(
-C_hot_liquid(
-P(start=1939992.1),
-Q(start=-53.48533),
-h_outflow(start=901605.6)),
-C_hot_steam(
-P(start=1939992.1),
-Q(start=-1059.7411),
-h_outflow(start=2778769.0)),
 C_in(
 P(start=1939992.1),
 Q(start=1113.2264),
@@ -1914,7 +1906,15 @@ h(start=2688580.0)),
 state_out(
 T(start=484.00012),
 h(start=2778769.0))),
-x_steam_out(start=0.99)),
+x_steam_out(start=0.99),
+C_steam_out(
+P(start=1939992.1),
+Q(start=-1059.7411),
+h_outflow(start=2778769.0)),
+C_liquid_out(
+P(start=1939992.1),
+Q(start=-53.48533),
+h_outflow(start=901605.6))),
 steam_dryer_liq_out_pipe(
 C_in(
 P(start=1939992.1),

MetroscopeModelingLibrary/Examples/Nuclear/MetroscopiaNPP/MetroscopiaNPP_internal_ramp_direct.mo

@@ -530,7 +530,7 @@ equation
   connect(HPT_1.C_in, HPT_P_in_sensor.C_out) annotation (Line(points={{-79,72},{-94,72}},           color={28,108,200}));
   connect(HPT_P_out_sensor.C_in, HPT_2.C_out) annotation (Line(points={{26,72},{9,72}},            color={28,108,200}));
   connect(steam_dryer.C_in, HPT_P_out_sensor.C_out) annotation (Line(points={{56,91.2727},{56,92},{46,92},{46,72},{38,72}},        color={28,108,200}));
-  connect(superheater.C_cold_in, steam_dryer.C_hot_steam) annotation (Line(points={{72,104},{72,91.2727}},              color={28,108,200}));
+  connect(superheater.C_cold_in,steam_dryer.C_steam_out)  annotation (Line(points={{72,104},{72,91.2727}},              color={28,108,200}));
   connect(superheater.C_hot_out, superheater_drains_P_sensor.C_in) annotation (Line(points={{88,112},{100,112}}, color={28,108,200}));
   connect(superheater_T_out_sensor.C_in,superheater. C_cold_out) annotation (Line(points={{88,130},{72,130},{72,120}},         color={28,108,200}));
   connect(superheater_control_valve.C_in, HP_control_valve.C_in) annotation (Line(points={{-136,112.182},{-136,112},{-158,112},{-158,72},{-135,72}},    color={28,108,200}));
@@ -556,7 +556,7 @@ equation
   connect(LPT1.C_out, LP_extract.C_in) annotation (Line(points={{169,130},{185.4,130}},                                 color={28,108,200}));
   connect(LPT2.C_in, LP_extract.C_main_out) annotation (Line(points={{221,130},{206.6,130}},                                 color={28,108,200}));
   connect(deaerator_inlet_pipe.C_in, LP_heater_T_out_sensor.C_out) annotation (Line(points={{186,-70},{206,-70}}, color={28,108,200}));
-  connect(steam_dryer.C_hot_liquid, steam_dryer_liq_out_pipe.C_in) annotation (Line(points={{72,84.7273},{72,-34},{142,-34},{142,-40}},
+  connect(steam_dryer.C_liquid_out, steam_dryer_liq_out_pipe.C_in) annotation (Line(points={{72,84.7273},{72,-34},{142,-34},{142,-40}},
                                                                                                                                      color={28,108,200}));
   connect(deaerator_inlet_pipe.C_out, deaerator_outlet_pipe.C_in) annotation (Line(points={{166,-70},{114,-70}}, color={28,108,200}));
   connect(steam_dryer_liq_out_pipe.C_out, deaerator_outlet_pipe.C_in) annotation (Line(points={{142,-60},{142,-70},{114,-70}}, color={28,108,200}));

MetroscopeModelingLibrary/Examples/Nuclear/MetroscopiaNPP/MetroscopiaNPP_internal_ramp_direct_withStartValues.mo

@@ -2597,14 +2597,6 @@ h(start=1154502.0),
 p(start=5000000.0),
 phase(start=0))),
 steam_dryer(
-C_hot_liquid(
-P(start=1940000.0),
-Q(start=-53.485546),
-h_outflow(start=901606.56)),
-C_hot_steam(
-P(start=1940000.0),
-Q(start=-1059.745),
-h_outflow(start=2778769.2)),
 C_in(
 P(start=1940000.0),
 Q(start=1113.2305),
@@ -2703,7 +2695,15 @@ d(start=9.844848),
 h(start=2778769.2),
 p(start=1940000.0),
 phase(start=0))),
-x_steam_out(start=0.99)),
+x_steam_out(start=0.99),
+C_steam_out(
+P(start=1940000.0),
+Q(start=-1059.745),
+h_outflow(start=2778769.2)),
+C_liquid_out(
+P(start=1940000.0),
+Q(start=-53.485546),
+h_outflow(start=901606.56))),
 steam_dryer_liq_out_pipe(
 C_in(
 P(start=1940000.0),