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

AdisTT: Handling cases where parameters do not have time series

dev_dylan
Dylan Jeannin 2026-07-17 15:05:21 +02:00
parent 67433ae325
commit 5287f30636
3 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Model/Scenario.py
View File

@ -54,8 +54,10 @@ class Scenario(SQLSubModel):
"river_reach", "river_node", "river_reach", "river_node",
"geotiff", "reservoir", "reservoir_data", "geotiff", "reservoir", "reservoir_data",
# Temperature # Temperature
"boundary_condition_temperature", "boundary_condition_data_temperature", "boundary_condition_temperature",
"initial_conditions_temperature", "initial_conditions_temperature_spec", "boundary_condition_data_temperature",
"initial_conditions_temperature",
"initial_conditions_temperature_spec",
"weather_parameters", "weather_parameters_data", "weather_parameters", "weather_parameters_data",
] ]

43
src/Solver/AdisTT.py
View File

@ -450,7 +450,7 @@ class AdisTTwc(AdisTT):
if qlog is not None: if qlog is not None:
qlog.put("Export TEMs files") qlog.put("Export TEMs files")
name = "TEM" name = "TEM"
with adistt_file_open( with adistt_file_open(
os.path.join(repertory, f"{name}.POL"), "w+" os.path.join(repertory, f"{name}.POL"), "w+"
@ -476,7 +476,8 @@ class AdisTTwc(AdisTT):
) )
TEM_BCs = ( TEM_BCs = (
study.river._BoundaryConditionsTemperature.BCs_Temperature_List study.river._BoundaryConditionsTemperature
.BCs_Temperature_List
) )
if TEM_BCs: if TEM_BCs:
@ -525,8 +526,7 @@ class AdisTTwc(AdisTT):
f.write(f"*État initial pour le polluant {TEM_name}\n") f.write(f"*État initial pour le polluant {TEM_name}\n")
f.write(" ".join(("DEFAULT =", f.write(" ".join(("DEFAULT =",
f"{TEM_IC_default.temperature}", f"{TEM_IC_default.temperature}",
"0.0 0.0 0.0\n"))) "0.0 0.0 0.0\n"))) # fake 0 to match adists
# fake 0 to match adists
if len(TEM_IC_default._data) != 0: if len(TEM_IC_default._data) != 0:
self._export_ICs_AdisTT_Spec( self._export_ICs_AdisTT_Spec(
@ -549,8 +549,7 @@ class AdisTTwc(AdisTT):
f"{ic_spec.start_rk}", f"{ic_spec.start_rk}",
f"{ic_spec.end_rk}", f"{ic_spec.end_rk}",
f"{ic_spec.temperature}" f"{ic_spec.temperature}"
f"0.0 0.0 0.0 0.0\n"))) f"0.0 0.0 0.0 0.0\n"))) # fake 0 to match adists
# fake 0 to match adists
return True return True
@ -615,7 +614,7 @@ class AdisTTwc(AdisTT):
# ) as f: # ) as f:
# files.append(f"{name}.DIF") # files.append(f"{name}.DIF")
# f.write(f"*Définition des paramètres des fonctions de calcul du\n") # f.write(f"*Définition des paramètres des fonctions de calcul du\n")
# f.write(f"*coefficient de diffusion\n") # f.write(f"*coefficient de diffusion\n")
# difAdisTT = study.river.dif_adistt.DIF_AdisTT_List # difAdisTT = study.river.dif_adistt.DIF_AdisTT_List
@ -944,10 +943,6 @@ class AdisTTwc(AdisTT):
"CCF": ("cld0", "CLD"), "CCF": ("cld0", "CLD"),
} }
_required_weather_extensions = (
"TDA", "HSA", "RAY", "VEN", "TNA", "QNA",
)
def _export_temperature_initial_conditions(self, study, repertory): def _export_temperature_initial_conditions(self, study, repertory):
initial_conditions = study.river.ic_temperature.Initial_Conditions_List initial_conditions = study.river.ic_temperature.Initial_Conditions_List
filename = "TEM.INI" filename = "TEM.INI"
@ -998,13 +993,14 @@ class AdisTTwc(AdisTT):
def _export_weather_file(self, study, repertory, weather_parameter, def _export_weather_file(self, study, repertory, weather_parameter,
extension): extension):
reach = weather_parameter.reach
if reach is None or len(weather_parameter.data) == 0:
return None
filename = f"TEM.{extension}" filename = f"TEM.{extension}"
path = os.path.join(repertory, filename) path = os.path.join(repertory, filename)
mode = "a" if os.path.exists(path) else "w+" mode = "a" if os.path.exists(path) else "w+"
with adistt_file_open(path, mode) as f: with adistt_file_open(path, mode) as f:
reach = weather_parameter.reach
if reach is None:
return None
reach_name = self.get_reach_name(reach) reach_name = self.get_reach_name(reach)
f.write( f.write(
f"${reach_name} {weather_parameter.begin_rk} " f"${reach_name} {weather_parameter.begin_rk} "
@ -1029,13 +1025,6 @@ class AdisTTwc(AdisTT):
if os.path.exists(path): if os.path.exists(path):
os.remove(path) os.remove(path)
# These files are mandatory for the AdisTT master file. They are
# created even when no spatial time series is defined in the study.
for extension in self._required_weather_extensions:
adistt_file_open(
os.path.join(repertory, f"TEM.{extension}"), "w+"
).close()
initial_file = self._export_temperature_initial_conditions( initial_file = self._export_temperature_initial_conditions(
study, repertory study, repertory
) )
@ -1058,20 +1047,16 @@ class AdisTTwc(AdisTT):
filename = f"{name}.TEM" filename = f"{name}.TEM"
with adistt_file_open(os.path.join(repertory, filename), "w+") as f: with adistt_file_open(os.path.join(repertory, filename), "w+") as f:
defaults = study.river.weather_parameters defaults = study.river.weather_parameters
for type_, (parameter, _) in self._weather_files.items(): for type_, (parameter, extension) in self._weather_files.items():
default = defaults.default_for_type(type_) default = defaults.default_for_type(type_)
if default is not None: if default is not None:
f.write(f"{parameter} = {default.value}\n") prefix = "*" if extension in weather_files else ""
f.write(f"{prefix}{parameter} = {default.value}\n")
f.write(f"file_ini = {initial_file}\n") f.write(f"file_ini = {initial_file}\n")
f.write(f"file_cl = {boundary_file}\n") f.write(f"file_cl = {boundary_file}\n")
for extension in self._required_weather_extensions:
f.write(
f"file_{extension.lower()} = TEM.{extension}\n"
)
for _, extension in self._weather_files.values(): for _, extension in self._weather_files.values():
if (extension in weather_files if extension in weather_files:
and extension not in self._required_weather_extensions):
f.write( f.write(
f"file_{extension.lower()} = " f"file_{extension.lower()} = "
f"{weather_files[extension]}\n" f"{weather_files[extension]}\n"

2
src/View/WeatherParameters/Edit/translate.py
View File

@ -37,7 +37,7 @@ class WPETranslate(WeatherParametersTranslate):
"discharge": self._dict["unit_discharge"], "discharge": self._dict["unit_discharge"],
"temperature": _translate("WeatherParameters", "Temperature (°C)"), "temperature": _translate("WeatherParameters", "Temperature (°C)"),
"humidity": _translate("WeatherParameters", "humidity": _translate("WeatherParameters",
"Humidity"), "Humidity"),
"radiation": _translate("WeatherParameters", "Radiation (W/m²)"), "radiation": _translate("WeatherParameters", "Radiation (W/m²)"),
"wind speed": _translate("WeatherParameters", "Wind Speed (m/s)"), "wind speed": _translate("WeatherParameters", "Wind Speed (m/s)"),
"albedo": _translate("WeatherParameters", "Albedo"), "albedo": _translate("WeatherParameters", "Albedo"),