Skip to content

Commit 61acb60

Browse files
committed
Add checks for new configs for naming.
1 parent be1d86c commit 61acb60

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

samples/CSP/sco2_analysis_python_V2/core/sco2_cycle_ssc.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,10 @@ def get_cycle_name_str(cycle_des_par_dict):
351351
return "simple"
352352
elif(cycle_config == 2):
353353
return "partialcooling"
354+
elif(cycle_config == 3):
355+
return "htrbp"
356+
elif(cycle_config==4):
357+
return "turbinesplitflow"
354358
else:
355359
return "unknowncycle"
356360

@@ -370,6 +374,14 @@ def mod_dict_for_cycle_config(dict_in, cycle_config_str):
370374
dict_out["cycle_config"] = 2
371375
dict_out["is_recomp_ok"] = 1
372376

377+
elif(cycle_config_str == "htrbp"):
378+
dict_out["cycle_config"] = 3
379+
dict_out["is_recomp_ok"] = 1
380+
381+
elif(cycle_config_str == "turbinesplitflow"):
382+
dict_out["cycle_config"] = 4
383+
dict_out["is_recomp_ok"] = 0
384+
373385
else:
374386
dict_out["cycle_config"] = -999
375387
dict_out["is_recomp_ok"] = -999

samples/CSP/sco2_analysis_python_V2/core/sco2_plots.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,6 +1165,10 @@ def cycle_label(cycle_data, is_multi_line = False, is_file_name = False):
11651165
elif cycle_data["cycle_config"] == 1 and cycle_data["is_recomp_ok"] == 1:
11661166
cycle_name = r'$\bf{Recompression}$'
11671167
cycle_abv = "RC"
1168+
elif cycle_data["cycle_config"] == 3:
1169+
cycle_name = r'$\bf{Recompression}$' + " " + r'$\bf{w/}$' + " " + r'$\bf{HTR Bypass}$'
1170+
elif cycle_data["cycle_config"] == 4:
1171+
cycle_name = r'$\bf{Turbine Split Flow}$'
11681172
else:
11691173
cycle_name = r'$\bf{Simple}$'
11701174
cycle_abv = "simple"

0 commit comments

Comments
 (0)