Skip to content

Commit d4712a6

Browse files
valentind-metvalentind-met
authored
Pressure loss simplification (#450)
* simplification of pressure losses * use of rho_0 for initialization of fluegases components * changelog update
1 parent 43f296d commit d4712a6

File tree

15 files changed

+46
-71
lines changed

15 files changed

+46
-71
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Use [gitmoji](https://gitmoji.dev/) to identify your changes.
1919
- 🔧 Added `rho_0` as an initialization parameter in the `FlowModel` [PR#440](https://github.com/Metroscope-dev/metroscope-modeling-library/pull/440)
2020

2121
### 💥 Changed <!--Make sure to add a link to the PR and issues related to your change-->
22+
- Pressure losses equations in Pipe, ControlValve and SlidingValve now use inlet density instead of mean density. This change can affect calibrated models. [PR#450](https://github.com/Metroscope-dev/metroscope-modeling-library/pull/450)
2223

2324
### 🔥 Removed <!--Make sure to add a link to the PR and issues related to your change-->
2425

‎MetroscopeModelingLibrary/Examples/Nuclear/MetroscopiaNPP/MetroscopiaNPP_direct.mo‎

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -583,8 +583,7 @@ equation
583583
HP_heater.Kfr_cold = HP_heater_Kfr_cold;
584584
HP_reheater_drains_control_valve.Cv_max = HP_heater_drains_control_valve_Cvmax;
585585

586-
connect(HP_control_valve.C_out, HPT_P_in_sensor.C_in) annotation (Line(points={{-125,72},
587-
{-116,72},{-116,72},{-106,72}}, color={28,108,200}));
586+
connect(HP_control_valve.C_out, HPT_P_in_sensor.C_in) annotation (Line(points={{-125,72},{-116,72},{-116,72},{-106,72}}, color={28,108,200}));
588587
connect(HP_control_valve.Opening, HP_control_valve_opening_sensor.Opening) annotation (Line(points={{-130,80.7273},{-130,82},{-131,82},{-131,85.9}},
589588
color={0,0,127}));
590589
connect(HPT_1.C_out, HP_extract.C_in) annotation (Line(points={{-61,72},{-50.6,72}}, color={28,108,200}));
@@ -598,22 +597,18 @@ equation
598597
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}));
599598
connect(HPT_1.C_in, HPT_P_in_sensor.C_out) annotation (Line(points={{-79,72},{-94,72}}, color={28,108,200}));
600599
connect(HPT_P_out_sensor.C_in, HPT_2.C_out) annotation (Line(points={{26,72},{9,72}}, color={28,108,200}));
601-
connect(steam_dryer.C_in, HPT_P_out_sensor.C_out) annotation (Line(points={{56,
602-
91.2727},{56,92},{46,92},{46,72},{38,72}}, color={28,108,200}));
603-
connect(superheater.C_cold_in, steam_dryer.C_hot_steam) annotation (Line(points={{72,104},
604-
{72,91.2727}}, color={28,108,200}));
600+
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}));
601+
connect(superheater.C_cold_in, steam_dryer.C_hot_steam) annotation (Line(points={{72,104},{72,91.2727}}, color={28,108,200}));
605602
connect(superheater.C_hot_out, superheater_drains_P_sensor.C_in) annotation (Line(points={{88,112},{100,112}}, color={28,108,200}));
606603
connect(superheater_T_out_sensor.C_in,superheater. C_cold_out) annotation (Line(points={{88,130},{72,130},{72,120}}, color={28,108,200}));
607-
connect(superheater_control_valve.C_in, HP_control_valve.C_in) annotation (Line(points={{-136,
608-
112.182},{-136,112},{-158,112},{-158,72},{-135,72}}, color={28,108,200}));
604+
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}));
609605
connect(superheater.C_hot_in, superheater_bleed_P_sensor.C_out) annotation (Line(points={{56,112},{-35,112},{-35,112.182},{-94,112.182}}, color={28,108,200}));
610-
connect(superheater_bleed_P_sensor.C_in, superheater_control_valve.C_out) annotation (Line(points={{-106,
611-
112.182},{-116,112.182},{-116,112.182},{-126,112.182}}, color={28,108,200}));
606+
connect(superheater_bleed_P_sensor.C_in, superheater_control_valve.C_out) annotation (Line(points={{-106,112.182},{-116,112.182},{-116,112.182},{-126,112.182}}, color={28,108,200}));
612607
connect(LPT1.C_W_out, generator.C_in) annotation (Line(points={{169,136.72},{188,136.72},{188,168},{315.6,168}}, color={244,125,35}));
613608
connect(LPT2.C_W_out, generator.C_in) annotation (Line(points={{239,136.72},{262,136.72},{262,168},{315.6,168}}, color={244,125,35}));
614609
connect(LPT2.C_out, P_cond_sensor.C_in) annotation (Line(points={{239,130},{286,130}}, color={28,108,200}));
615-
connect(P_cond_sensor.C_out, condenser.C_hot_in) annotation (Line(points={{298,130},
616-
{392.5,130},{392.5,74.2864}}, color={28,108,200}));
610+
connect(P_cond_sensor.C_out, condenser.C_hot_in) annotation (Line(points={{298,130},{392.5,130},{392.5,74.2864}},
611+
color={28,108,200}));
617612
connect(superheater_T_out_sensor.C_out, LPT1.C_in) annotation (Line(points={{100,130},{151,130}}, color={28,108,200}));
618613
connect(extraction_pump.C_power, LP_pump_Wm_source.C_out) annotation (Line(points={{372,-61.36},{372,-50.8}}, color={244,125,35}));
619614
connect(extraction_pump.C_out, extraction_pump_T_out_sensor.C_in) annotation (Line(points={{364,-70},{350,-70}}, color={28,108,200}));
@@ -645,31 +640,23 @@ equation
645640
connect(superheater_drains_P_sensor.C_out, superheater_drains_pipe.C_in) annotation (Line(points={{112,112},{122,112},{122,40}}, color={28,108,200}));
646641
connect(superheater_drains_pipe.C_out, HP_heater.C_hot_in) annotation (Line(points={{122,20},{122,16},{-40,16},{-40,-62}}, color={28,108,200}));
647642
connect(HP_heater_T_out_sensor.C_out, Q_feedwater_sensor.C_in) annotation (Line(points={{-98,-70},{-104,-70}}, color={28,108,200}));
648-
connect(HP_reheater_drains_control_valve.Opening, HP_reheater_drains_control_valve_opening_sensor.Opening) annotation (Line(points={{11,
649-
-113.091},{11,-108.1}}, color={0,0,127}));
650-
connect(HP_heater_T_drains_sensor.C_out, HP_reheater_drains_control_valve.C_in) annotation (Line(points={{-40,
651-
-105},{-40,-121.818},{6,-121.818}}, color={28,108,200}));
652-
connect(LP_reheater_drains_control_valve.Opening, LP_reheater_drains_control_valve_opening_sensor.Opening) annotation (Line(points={{293,
653-
-111.091},{293,-106.1}}, color={0,0,127}));
654-
connect(LP_heater.C_hot_out, LP_reheater_drains_control_valve.C_in) annotation (Line(points={{268,-78},
655-
{268,-119.818},{288,-119.818}}, color={28,108,200}));
643+
connect(HP_reheater_drains_control_valve.Opening, HP_reheater_drains_control_valve_opening_sensor.Opening) annotation (Line(points={{11,-113.091},{11,-108.1}}, color={0,0,127}));
644+
connect(HP_heater_T_drains_sensor.C_out, HP_reheater_drains_control_valve.C_in) annotation (Line(points={{-40,-105},{-40,-121.818},{6,-121.818}}, color={28,108,200}));
645+
connect(LP_reheater_drains_control_valve.Opening, LP_reheater_drains_control_valve_opening_sensor.Opening) annotation (Line(points={{293,-111.091},{293,-106.1}}, color={0,0,127}));
646+
connect(LP_heater.C_hot_out, LP_reheater_drains_control_valve.C_in) annotation (Line(points={{268,-78},{268,-119.818},{288,-119.818}}, color={28,108,200}));
656647
connect(steam_generator.steam_outlet, P_steam_sensor.C_in) annotation (Line(points={{-170,-24},{-170,3}}, color={28,108,200}));
657-
connect(P_steam_sensor.C_out, HP_control_valve.C_in) annotation (Line(points={{-170,17},
658-
{-170,72},{-135,72}}, color={28,108,200}));
648+
connect(P_steam_sensor.C_out, HP_control_valve.C_in) annotation (Line(points={{-170,17},{-170,72},{-135,72}}, color={28,108,200}));
659649
connect(superheater.C_vent, pressureCut.C_in) annotation (Line(points={{88,104.2},{88,86},{94,86}}, color={28,108,200}));
660650
connect(pressureCut.C_out, superheater_drains_pipe.C_in) annotation (Line(points={{114,86},{122,86},{122,40}}, color={28,108,200}));
661651
connect(cold_source.C_out, CW_T_in_sensor.C_in) annotation (Line(points={{305,67.7778},{305,67},{318,67}}, color={28,108,200}));
662652
connect(CW_T_in_sensor.C_out, CW_P_in_sensor.C_in) annotation (Line(points={{332,67},{346,67}}, color={28,108,200}));
663653
connect(CW_P_in_sensor.C_out, condenser.C_cold_in) annotation (Line(points={{360,67},{378,67},{378,59.679},{377,59.679}}, color={28,108,200}));
664654
connect(CW_T_out_sensor.C_out, cold_sink.C_in) annotation (Line(points={{437,60},{455,60}}, color={28,108,200}));
665655
connect(condenser.C_cold_out, CW_T_out_sensor.C_in) annotation (Line(points={{407.69,59.679},{407.69,60},{423,60}}, color={28,108,200}));
666-
connect(LP_reheater_drains_control_valve.C_out, condenser.C_hot_in) annotation (Line(points={{298,
667-
-119.818},{400,-119.818},{400,-120},{500,-120},{500,100},{392.5,100},
668-
{392.5,74.2864}}, color={28,108,200}));
669-
connect(HP_reheater_drains_control_valve.C_out, deaerator_outlet_pipe.C_in) annotation (Line(points={{16,
670-
-121.818},{78,-121.818},{78,-122},{142,-122},{142,-70},{114,-70}}, color={28,108,200}));
671-
connect(steam_generator.purge_outlet, Q_purge_sensor.C_in) annotation (Line(points={{-170,
672-
-115.233},{-170,-125}}, color={28,108,200}));
656+
connect(LP_reheater_drains_control_valve.C_out, condenser.C_hot_in) annotation (Line(points={{298,-119.818},{400,-119.818},{400,-120},{500,-120},{500,100},{392.5,100},{392.5,74.2864}},
657+
color={28,108,200}));
658+
connect(HP_reheater_drains_control_valve.C_out, deaerator_outlet_pipe.C_in) annotation (Line(points={{16,-121.818},{78,-121.818},{78,-122},{142,-122},{142,-70},{114,-70}}, color={28,108,200}));
659+
connect(steam_generator.purge_outlet, Q_purge_sensor.C_in) annotation (Line(points={{-170,-115.233},{-170,-125}}, color={28,108,200}));
673660
connect(Q_feedwater_sensor.C_out, loopBreaker.C_in) annotation (Line(points={{-118,-70},{-132,-70}}, color={28,108,200}));
674661
connect(loopBreaker.C_out, steam_generator.feedwater_inlet) annotation (Line(points={{-152,-70},{-159,-70}}, color={28,108,200}));
675662
connect(Q_purge_sensor.C_out, sink.C_in) annotation (Line(points={{-170,-139},{-170,-145}}, color={28,108,200}));

0 commit comments

Comments
 (0)