diff --git a/src/Solver/RubarBE.py b/src/Solver/RubarBE.py index 5c9f7909b65cbeab16dde80bee36d0e817304535..9d2e7beefaa06b9e425d07cb28b184b4631d0dce 100644 --- a/src/Solver/RubarBE.py +++ b/src/Solver/RubarBE.py @@ -143,7 +143,7 @@ class RubarBE(CommandLineSolver): self._export_ts(study, repertory, qlog, name=name) self._export_geomac_i(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) def _export_donnee(self, study, repertory, qlog, name="0"): @@ -361,13 +361,13 @@ class RubarBE(CommandLineSolver): ind += 1 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: - qlog.put("Export TPS file") + qlog.put("Export CONDIN file") with open( os.path.join( - repertory, f"tps.{name}" + repertory, f"condin.{name}" ), "w+" ) as f: for edge in study.river.enable_edges(): @@ -376,7 +376,7 @@ class RubarBE(CommandLineSolver): f.write(f"0.0\n") ics = study.river.initial_conditions.get(edge) - data = self._export_tps_init_data(ics) + data = self._export_condin_init_data(ics) profiles = reach.profiles first = profiles[0] @@ -388,8 +388,8 @@ class RubarBE(CommandLineSolver): ) return - f_h_s = self._export_tps_profile_height_speed(first, data) - l_h_s = self._export_tps_profile_height_speed(last, data) + f_h_s = self._export_condin_profile_height_speed(first, data) + l_h_s = self._export_condin_profile_height_speed(last, data) # First mail f.write(f"{1:>5} {f_h_s[0]} {f_h_s[1]}") @@ -404,7 +404,7 @@ class RubarBE(CommandLineSolver): ind += 1 continue - cur_h, cur_s = self._export_tps_profile_height_speed( + cur_h, cur_s = self._export_condin_profile_height_speed( profile, data ) @@ -420,7 +420,7 @@ class RubarBE(CommandLineSolver): # Last mail 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 = {} for d in ics.data: @@ -431,7 +431,7 @@ class RubarBE(CommandLineSolver): 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] q = data[profile.rk][1]