parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RubarBE: Rename 'tps.*' file to 'condin.*'.

compare_results
Pierre-Antoine Rouby 2024-09-18 14:15:14 +02:00
parent 8ce85e5d23
commit 7ebb683fac
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Solver/RubarBE.py
View File

@ -143,7 +143,7 @@ class RubarBE(CommandLineSolver):
self._export_ts(study, repertory, qlog, name=name) self._export_ts(study, repertory, qlog, name=name)
self._export_geomac_i(study, repertory, qlog, name=name) self._export_geomac_i(study, repertory, qlog, name=name)
self._export_mail(study, repertory, qlog, name=name) self._export_mail(study, repertory, qlog, name=name)
self._export_tps(study, repertory, qlog, name=name) self._export_condin(study, repertory, qlog, name=name)
self._export_stricklers(study, repertory, qlog, name=name) self._export_stricklers(study, repertory, qlog, name=name)
def _export_donnee(self, study, repertory, qlog, name="0"): def _export_donnee(self, study, repertory, qlog, name="0"):
@ -361,13 +361,13 @@ class RubarBE(CommandLineSolver):
ind += 1 ind += 1
f.write("\n") f.write("\n")
def _export_tps(self, study, repertory, qlog, name="0"): def _export_condin(self, study, repertory, qlog, name="0"):
if qlog is not None: if qlog is not None:
qlog.put("Export TPS file") qlog.put("Export CONDIN file")
with open( with open(
os.path.join( os.path.join(
repertory, f"tps.{name}" repertory, f"condin.{name}"
), "w+" ), "w+"
) as f: ) as f:
for edge in study.river.enable_edges(): for edge in study.river.enable_edges():
@ -376,7 +376,7 @@ class RubarBE(CommandLineSolver):
f.write(f"0.0\n") f.write(f"0.0\n")
ics = study.river.initial_conditions.get(edge) ics = study.river.initial_conditions.get(edge)
data = self._export_tps_init_data(ics) data = self._export_condin_init_data(ics)
profiles = reach.profiles profiles = reach.profiles
first = profiles[0] first = profiles[0]
@ -388,8 +388,8 @@ class RubarBE(CommandLineSolver):
) )
return return
f_h_s = self._export_tps_profile_height_speed(first, data) f_h_s = self._export_condin_profile_height_speed(first, data)
l_h_s = self._export_tps_profile_height_speed(last, data) l_h_s = self._export_condin_profile_height_speed(last, data)
# First mail # First mail
f.write(f"{1:>5} {f_h_s[0]} {f_h_s[1]}") f.write(f"{1:>5} {f_h_s[0]} {f_h_s[1]}")
@ -404,7 +404,7 @@ class RubarBE(CommandLineSolver):
ind += 1 ind += 1
continue continue
cur_h, cur_s = self._export_tps_profile_height_speed( cur_h, cur_s = self._export_condin_profile_height_speed(
profile, data profile, data
) )
@ -420,7 +420,7 @@ class RubarBE(CommandLineSolver):
# Last mail # Last mail
f.write(f"{ind:>5} {f_h_s[0]} {f_h_s[1]}") f.write(f"{ind:>5} {f_h_s[0]} {f_h_s[1]}")
def _export_tps_init_data(self, ics): def _export_condin_init_data(self, ics):
data = {} data = {}
for d in ics.data: for d in ics.data:
@ -431,7 +431,7 @@ class RubarBE(CommandLineSolver):
return data return data
def _export_tps_profile_height_speed(self, profile, data): def _export_condin_profile_height_speed(self, profile, data):
z = data[profile.rk][0] z = data[profile.rk][0]
q = data[profile.rk][1] q = data[profile.rk][1]