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

Merge branch 'temperature_test' into monopk-ic-adistt

monopk-ic-adistt
Dylan Jeannin 2026-07-17 10:12:30 +02:00
parent cf61fd8d09 885c8ea502
commit c8ea9bd774
287 changed files with 1449 additions and 692 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -1,4 +1,4 @@
Sylvain COULIBALY, INRAE, 2020 - 2022
Théophile TERRAZ, INRAE, 2022 - 2024
Pierre-Antoine ROUBY, INRAE, 2023 - 2025
Pierre-Antoine ROUBY, INRAE, 2023 - 2026
Dylan JEANNIN, INRAE, 2026

2
src/Checker/Adists.py
View File

@ -1,5 +1,5 @@
# Adists.py -- Pamhyr study checkers
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Checker/Checker.py
View File

@ -1,5 +1,5 @@
# Checker.py -- Pamhyr abstract checker class
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Checker/Mage.py
View File

@ -1,5 +1,5 @@
# Mage.py -- Pamhyr MAGE checkers
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Checker/Study.py
View File

@ -1,5 +1,5 @@
# Study.py -- Pamhyr study checkers
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Meshing/AMeshingTool.py
View File

@ -1,5 +1,5 @@
# AMeshingTool.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Meshing/Internal.py
View File

@ -1,5 +1,5 @@
# Internal.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Meshing/Mage.py
View File

@ -1,5 +1,5 @@
# Mage.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Meshing/__init__.py
View File

@ -1,5 +1,5 @@
# __init__.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Meshing/test_Meshing.py
View File

@ -1,5 +1,5 @@
# test_Model.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/BoundaryCondition/BoundaryCondition.py
View File

@ -1,5 +1,5 @@
# BoundaryCondition.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/BoundaryCondition/BoundaryConditionList.py
View File

@ -1,5 +1,5 @@
# BoundaryConditionList.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/BoundaryCondition/BoundaryConditionTypes.py
View File

@ -1,5 +1,5 @@
# BoundaryConditionTypes.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py
View File

@ -1,5 +1,5 @@
# BoundaryConditionsAdisTS.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/BoundaryConditionsAdisTS/BoundaryConditionsAdisTSList.py
View File

@ -1,5 +1,5 @@
# BoundaryConditionsAdisTSList.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/D90AdisTS/D90AdisTS.py
View File

@ -1,5 +1,5 @@
# D90AdisTS.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/D90AdisTS/D90AdisTSList.py
View File

@ -1,5 +1,5 @@
# D90AdisTSList.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/D90AdisTS/D90AdisTSSpec.py
View File

@ -1,5 +1,5 @@
# D90AdisTSSpec.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/DIFAdisTS/DIFAdisTS.py
View File

@ -1,5 +1,5 @@
# DIFAdisTS.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/DIFAdisTS/DIFAdisTSList.py
View File

@ -1,5 +1,5 @@
# DIFAdisTSList.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/DIFAdisTS/DIFAdisTSSpec.py
View File

@ -1,5 +1,5 @@
# DIFAdisTSSpec.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Except.py
View File

@ -1,5 +1,5 @@
# Except.py -- Pamhyr model exceptions
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Friction/Friction.py
View File

@ -1,5 +1,5 @@
# Friction.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Friction/FrictionList.py
View File

@ -1,5 +1,5 @@
# FrictionList.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Geometry/Point.py
View File

@ -1,5 +1,5 @@
# Point.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Geometry/PointXY.py
View File

@ -1,5 +1,5 @@
# PointXY.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Geometry/PointXYZ.py
View File

@ -1,5 +1,5 @@
# PointXYZ.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Geometry/Profile.py
View File

@ -1,5 +1,5 @@
# Profile.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

98
src/Model/Geometry/ProfileXYZ.py
View File

@ -1,5 +1,5 @@
# ProfileXYZ.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -91,6 +91,9 @@ class ProfileXYZ(Profile, SQLSubModel):
self._station = []
self.station_up_to_date = False
self._get_water_limits_cache = {}
self._get_water_limits_ac_cache = {}
@classmethod
def _db_create(cls, execute, ext=""):
execute(f"""
@ -619,6 +622,7 @@ class ProfileXYZ(Profile, SQLSubModel):
"""
return [x for x in lst if not np.isnan(x)]
@timer
def speed(self, q, z):
area = self.wet_area(z)
@ -670,6 +674,7 @@ class ProfileXYZ(Profile, SQLSubModel):
length += line.length
return length
@timer
def compute_wet_area(self, z):
area = 0.0
if len(self.tab.L) > 0:
@ -710,6 +715,7 @@ class ProfileXYZ(Profile, SQLSubModel):
if len(line.coords) > 2:
poly = geometry.Polygon(line)
area += poly.area
return area
def wet_radius(self, z):
@ -732,6 +738,7 @@ class ProfileXYZ(Profile, SQLSubModel):
line = geometry.LineString(list(zip(station, zz)))
return line
@timer
def wet_lines(self, z):
points = self._points
if len(points) < 3:
@ -808,7 +815,6 @@ class ProfileXYZ(Profile, SQLSubModel):
return points
def get_nb_wet_areas(self, z):
n_zones = 0
points = self._points
if points[0].z <= z:
@ -820,10 +826,13 @@ class ProfileXYZ(Profile, SQLSubModel):
return n_zones
@timer
def get_all_water_limits_ac(self, z):
"""
Determine all water limits for z elevation.
"""
if z in self._get_water_limits_ac_cache:
return self._get_water_limits_ac_cache[z]
points = self._points
if len(points) < 3:
@ -856,69 +865,94 @@ class ProfileXYZ(Profile, SQLSubModel):
logger.error(f"ERROR in get_all_water_limits_ac")
return [], []
return start, list(reversed(end))
res = start, list(reversed(end))
self._get_water_limits_ac_cache[z] = res
return res
@timer
def get_water_limits(self, z):
if z in self._get_water_limits_cache:
return self._get_water_limits_cache[z]
v = self.get_water_limits_compute(z)
return v
def get_water_limits_compute(self, z):
"""
Determine left and right limits of water elevation.
"""
# Get the index of first point with elevation lesser than water
# elevation (for the right and left river side)
i_left = -1
i_right = -1
i_left = next(
filter(
lambda i: self.point(i).z <= z,
range(self.number_points)
),
-1
)
for i in range(self.number_points):
if self.point(i).z <= z:
i_left = i
break
for i in reversed(range(self.number_points)):
if self.point(i).z <= z:
i_right = i
break
i_right = next(
filter(
lambda i: self.point(i).z <= z,
reversed(range(self.number_points))
),
-1
)
# Interpolate points at river left side
if (i_left > 0):
if abs(self.point(i_left - 1).z - self.point(i_left).z) < 1e-20:
pt_left = self.point(i_left)
pi = self.point(i_left)
pim1 = self.point(i_left - 1)
if abs(pim1.z - pi.z) < 1e-20:
pt_left = pi
else:
fact = (z - self.point(i_left).z) / \
(self.point(i_left - 1).z - self.point(i_left).z)
x = self.point(i_left).x + fact * \
(self.point(i_left - 1).x - self.point(i_left).x)
y = self.point(i_left).y + fact * \
(self.point(i_left - 1).y - self.point(i_left).y)
fact = (z - pi.z) / (pim1.z - pi.z)
x = pi.x + fact * (pim1.x - pi.x)
y = pi.y + fact * (pim1.y - pi.y)
pt_left = PointXYZ(x=x, y=y, z=z, name="wl_left")
else:
pt_left = self.point(0)
# Interpolate points at river right side
if (i_right < self.number_points - 1):
if abs(self.point(i_right + 1).z - self.point(i_right).z) < 1e-20:
pt_right = self.point(i_right)
pi = self.point(i_right)
pip1 = self.point(i_right + 1)
if abs(pip1.z - pi.z) < 1e-20:
pt_right = pi
else:
fact = (z - self.point(i_right).z) / \
(self.point(i_right + 1).z - self.point(i_right).z)
x = self.point(i_right).x + fact * \
(self.point(i_right + 1).x - self.point(i_right).x)
y = self.point(i_right).y + fact * \
(self.point(i_right + 1).y - self.point(i_right).y)
fact = (z - pi.z) / (pip1.z - pi.z)
x = pi.x + fact * (pip1.x - pi.x)
y = pi.y + fact * (pip1.y - pi.y)
pt_right = PointXYZ(x=x, y=y, z=z, name="wl_right")
else:
pt_right = self.point(self.number_points - 1)
return pt_left, pt_right
v = (pt_left, pt_right)
# Put results in cache
self._get_water_limits_cache[z] = v
# Create a generator to improve results data reading speed
yield v
@timer
def compute_tabulation(self):
sorted_points = sorted(self._points, key=lambda p: p.z)
self.tab.z = np.array([p.z for p in sorted_points], np.float64)
self.tab.L = np.zeros(len(self.tab.z), np.float64)
self.tab.A = np.zeros(len(self.tab.z), np.float64)
for i in range(1, len(self.tab.z)):
self.tab.L[i] = self.compute_wet_width(self.tab.z[i])
dx = (self.tab.L[i] + self.tab.L[i-1])/2
dz = self.tab.z[i] - self.tab.z[i-1]
self.tab.A[i] = self.tab.A[i-1] + dz * dx
self.tab_up_to_date = True

2
src/Model/Geometry/Reach.py
View File

@ -1,5 +1,5 @@
# Reach.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Geometry/Vector_1d.py
View File

@ -1,5 +1,5 @@
# Vector_1d.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/HydraulicStructures/Basic/HydraulicStructures.py
View File

@ -1,5 +1,5 @@
# HydraulicStructures.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/HydraulicStructures/Basic/Types.py
View File

@ -1,5 +1,5 @@
# Types.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/HydraulicStructures/Basic/Value.py
View File

@ -1,5 +1,5 @@
# Value.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/HydraulicStructures/HydraulicStructures.py
View File

@ -1,5 +1,5 @@
# HydraulicStructures.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/HydraulicStructures/HydraulicStructuresList.py
View File

@ -1,5 +1,5 @@
# HydraulicStructuresList.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/InitialConditions/InitialConditions.py
View File

@ -1,5 +1,5 @@
# InitialConditions.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/InitialConditions/InitialConditionsDict.py
View File

@ -1,5 +1,5 @@
# InitialConditionsDict.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py
View File

@ -1,5 +1,5 @@
# InitialConditionsAdisTS.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSList.py
View File

@ -1,5 +1,5 @@
# InitialConditionsAdisTSList.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py
View File

@ -1,5 +1,5 @@
# InitialConditionsAdisTSSpec.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/LateralContribution/LateralContribution.py
View File

@ -1,5 +1,5 @@
# LateralContribution.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/LateralContribution/LateralContributionList.py
View File

@ -1,5 +1,5 @@
# LateralContributionList.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/LateralContribution/LateralContributionTypes.py
View File

@ -1,5 +1,5 @@
# LateralContributionTypes.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py
View File

@ -1,5 +1,5 @@
# LateralContributionAdisTS.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/LateralContributionsAdisTS/LateralContributionsAdisTSList.py
View File

@ -1,5 +1,5 @@
# LateralContributionsAdisTSList.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Network/Edge.py
View File

@ -1,5 +1,5 @@
# Edge.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Network/Graph.py
View File

@ -1,5 +1,5 @@
# Graph.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Network/Node.py
View File

@ -1,5 +1,5 @@
# Node.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Network/Point.py
View File

@ -1,5 +1,5 @@
# Point.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Network/__init__.py
View File

@ -1,5 +1,5 @@
# __init__.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Network/test_network.py
View File

@ -1,5 +1,5 @@
# test_Network.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/OutputRKAdists/OutputRKAdists.py
View File

@ -1,5 +1,5 @@
# OutputRKAdists.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Pollutants/Pollutants.py
View File

@ -1,5 +1,5 @@
# Pollutants.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Reservoir/Reservoir.py
View File

@ -1,5 +1,5 @@
# Reservoir.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Reservoir/ReservoirList.py
View File

@ -1,5 +1,5 @@
# ReservoirList.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

239
src/Model/Results/Results.py
View File

@ -1,5 +1,5 @@
# Results.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -22,6 +22,8 @@ import numpy as np
from copy import deepcopy
from datetime import datetime
from tools import timer
from Model.Scenario import Scenario
from Model.Tools.PamhyrDB import SQLSubModel
from Model.Results.River.River import River
@ -155,8 +157,185 @@ class AdditionalData(SQLSubModel):
return True
class TableData(SQLSubModel):
_sub_classes = []
def __init__(self, id=-1, study=None,
legend="", data=None,
owner_scenario=-1):
super(TableData, self).__init__(
id=id, status=study.status,
owner_scenario=owner_scenario
)
self._study = study
self._legend = legend
self._data = data
@property
def data(self):
return self._data
@classmethod
def _db_create(cls, execute, ext=""):
execute(f"""
CREATE TABLE results_table_data{ext} (
{cls.create_db_add_pamhyr_id()},
result INTEGER NOT NULL,
legend TEXT NOT NULL,
unit TEXT NOT NULL,
data_shape_x INTEGER NOT NULL,
data_shape_y INTEGER NOT NULL,
data_shape_z INTEGER DEFAULT -1,
data BLOB NOT NULL,
{Scenario.create_db_add_scenario()},
{Scenario.create_db_add_scenario_fk()},
FOREIGN KEY(result) REFERENCES results(pamhyr_id),
PRIMARY KEY(pamhyr_id, result, legend, scenario)
)
""")
if ext != "":
return True
return cls._create_submodel(execute)
@classmethod
def _db_update(cls, execute, version, data=None):
major, minor, release = version.strip().split(".")
create = False
if major == "0" and int(minor) == 2:
if int(release) < 7 and not create:
cls._db_create(execute)
create = True
return cls._update_submodel(execute, version, data)
@classmethod
def _db_load(cls, execute, data=None):
res = {}
study = data['study']
status = data['status']
scenario = data["scenario"]
result = data["result"]
rid = data["result_pid"]
table = execute(
"SELECT pamhyr_id, " +
"legend, unit, " +
"data_shape_x, data_shape_y, data_shape_z, " +
"data, " +
"scenario " +
"FROM results_table_data " +
f"WHERE scenario = {scenario.id} " +
f"AND result = {rid}"
)
for v in table:
it = iter(v)
pid = next(it)
legend = next(it)
unit = next(it)
data_shape_x = next(it)
data_shape_y = next(it)
data_shape_z = next(it)
data = next(it)
owner_scenario = next(it)
dtype = cls._unit_to_dtype(unit)
np_data = np.frombuffer(data, dtype=dtype)
if data_shape_y == -1:
np_data = np.reshape(np_data, data_shape_x)
elif data_shape_z == -1:
np_data = np.reshape(np_data, (data_shape_x,
data_shape_y))
else:
np_data = np.reshape(np_data, (data_shape_x,
data_shape_y,
data_shape_z))
new_table = cls(study=study,
legend=legend, data=np_data,
owner_scenario=owner_scenario)
res[legend] = new_table
return res
def _db_save(self, execute, data=None):
if self._status.scenario.id != self._owner_scenario:
return
shape_x = -1
shape_y = -1
shape_z = -1
shape = self._data.shape
if len(shape) == 2:
shape_x, shape_y = shape
elif len(shape == 1):
shape_x, = shape
elif len(shape == 3):
shape_x, shape_y, shape_z = shape
else:
logger.error(
f"Failed to parse numpy shape: {shape}"
)
execute(
"INSERT INTO " +
"results_table_data (pamhyr_id, result, " +
"legend, unit, " +
"data_shape_x, data_shape_y, data_shape_z, " +
"data, " +
"scenario) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
self._pamhyr_id, data["result"],
self._legend, self._dtype_to_unit(self._data.dtype),
shape_x, shape_y, shape_z,
self._data,
self._owner_scenario
)
return True
@classmethod
def _unit_to_dtype(cls, unit):
t = {
"i32": np.int32, "i64": np.int64,
"u32": np.uint32, "u64": np.uint64,
"f32": np.float32, "f64": np.float64,
}
return t[unit]
def _dtype_to_unit(self, dtype):
t = {
np.dtype(np.int32): "i32", np.dtype(np.int64): "i64",
np.dtype(np.uint32): "u32", np.dtype(np.uint64): "u64",
np.dtype(np.float32): "f32", np.dtype(np.float64): "f64",
}
return t[dtype]
def table(self):
return self._data
def __len__(self):
return len(self._data)
def __getitem__(self, key):
if isinstance(key, tuple):
return self._data[key[0], key[1]]
self._date[key]
class Results(SQLSubModel):
_sub_classes = [River, AdditionalData]
_sub_classes = [River, TableData, AdditionalData]
def __init__(self, id=-1, study=None, solver=None,
repertory="", name="0"):
@ -167,7 +346,7 @@ class Results(SQLSubModel):
self._name = name
self._study = study
self._river = River(self._study)
self._river = River(self._study, self)
self._solver = solver
self._repertory = repertory
@ -177,8 +356,11 @@ class Results(SQLSubModel):
"creation_date": datetime.now(),
"study_revision": study.status.version,
"additional_data": [],
"table": {},
}
self._ts_index = {}
if solver is not None:
self.set("solver_type", solver._type)
@ -195,6 +377,7 @@ class Results(SQLSubModel):
def study(self):
return self._study
@timer
def set(self, key, value):
self._meta_data[key] = value
@ -212,6 +395,16 @@ class Results(SQLSubModel):
def get(self, key):
return self._meta_data[key]
def set_timestamp_index(self, index):
self._ts_index = index
def get_timestamp_id(self, ts):
return self._ts_index[ts]
def compute_timestamp_index(self):
for i, ts in enumerate(self._meta_data["timestamps"]):
self._ts_index[ts] = i
def reload(self):
return self._solver.results(
self._study,
@ -309,11 +502,20 @@ class Results(SQLSubModel):
new_results.set("study_revision", revision)
new_results.set("creation_date", creation_date)
data["result_pid"] = pid
data["result"] = new_results
table_data = TableData._db_load(execute, data)
new_results.set("table", table_data)
sf = ">" + ''.join(itertools.repeat("d", nb_timestamps))
ts = struct.unpack(sf, timestamps_bytes)
new_results.set("timestamps", ts)
data["timestamps"] = sorted(ts)
new_results.compute_timestamp_index()
data["parent"] = new_results
new_results._river = River._db_load(execute, data)
new_results.set(
@ -321,6 +523,20 @@ class Results(SQLSubModel):
AdditionalData._db_load(execute, data)
)
# Update global index
i = 0
for reach in new_results._river.reachs:
nb = len(reach.profiles)
reach.set_global_index(range(i, i + nb + 1))
i += nb
if "Z" in table_data:
for ts in data["timestamps"]:
new_results._river.update_water_limits(
ts,
table_data["Z"][new_results.get_timestamp_id(ts), :]
)
yield (solver_type, new_results)
def _db_save_clear(self, execute, solver_type, data=None):
@ -343,6 +559,11 @@ class Results(SQLSubModel):
f"WHERE scenario = {self._owner_scenario} " +
f"AND result = {pid}"
)
execute(
"DELETE FROM results_table_data " +
f"WHERE scenario = {self._owner_scenario} " +
f"AND result = {pid}"
)
execute(
"DELETE FROM results_add_data " +
f"WHERE scenario = {self._owner_scenario} " +
@ -386,7 +607,19 @@ class Results(SQLSubModel):
data["result"] = self._pamhyr_id
self._river._db_save(execute, data)
tables = self.get("table")
for legend in tables:
tables[legend]._db_save(execute, data)
for add_data in self.get("additional_data"):
add_data._db_save(execute, data)
return True
def new_table_data(self, legend, data):
return TableData(
study=self._study,
legend=legend,
data=data,
owner_scenario=self._owner_scenario
)

2
src/Model/Results/ResultsAdisTS.py
View File

@ -1,5 +1,5 @@
# Results.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

95
src/Model/Results/River/River.py
View File

@ -1,5 +1,5 @@
# River.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -14,12 +14,13 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
import types
import struct
import logging
import itertools
import numpy as np
from tools import flatten
from tools import flatten, timer
from functools import reduce
from datetime import datetime
@ -30,15 +31,17 @@ logger = logging.getLogger()
class Profile(SQLSubModel):
def __init__(self, profile, study):
def __init__(self, profile, study, parent):
super(Profile, self).__init__(
id=-1, status=study.status,
owner_scenario=study.status.scenario.id
)
self._parent = parent
self._study = study
self._profile = profile # Source profile in the study
self._data = {} # Dict of dict {<ts>: {<key>: <value>, ...}, ...}
self._global_index = -1
def __len__(self):
return len(self._data)
@ -55,15 +58,26 @@ class Profile(SQLSubModel):
def geometry(self):
return self._profile
@property
def global_index(self):
return self._global_index
@global_index.setter
def global_index(self, id):
self._global_index = id
@timer
def set(self, timestamp, key, data):
if timestamp not in self._data:
self._data[timestamp] = {}
self._data[timestamp][key] = data
@timer
def get_ts(self, timestamp):
return self._data[timestamp]
@timer
def get_key(self, key):
res = list(
map(lambda ts: self._data[ts][key],
@ -71,17 +85,26 @@ class Profile(SQLSubModel):
)
return res
@timer
def get_ts_key(self, timestamp, key):
if timestamp in self._data:
if key in self._data[timestamp]:
return self._data[timestamp][key]
v = self._data[timestamp][key]
# If is a generator, compute value(s)
if isinstance(v, types.GeneratorType):
v = next(v)
self._data[timestamp][key] = v
return v
return None
def has_sediment_layers(self):
return any(map(lambda ts: "sl" in self._data[ts], self._data))
def has_bedload(self):
return any(map(lambda ts: "zfd" in self._data[ts], self._data))
return any(map(lambda ts: "sl" in self._data[ts], self._data))
@classmethod
def _db_create(cls, execute, ext=""):
@ -114,9 +137,9 @@ class Profile(SQLSubModel):
@classmethod
def _db_load(cls, execute, data=None):
new = {}
status = data['status']
parent = data['parent']
study = data['study']
reach = data['reach']
profile = data['profile']
@ -124,6 +147,8 @@ class Profile(SQLSubModel):
loaded = data['loaded_pid']
timestamps = data['timestamps']
new = cls(profile, study, parent)
values = execute(
"SELECT pamhyr_id, result, key, " +
"len_data, data, scenario " +
@ -143,12 +168,6 @@ class Profile(SQLSubModel):
data = next(it)
owner_scenario = next(it)
if profile not in new:
new_data = cls(profile, study)
new[profile] = new_data
else:
new_data = new[profile]
if key in ["Z", "Q", "V"]:
sf = ">" + ''.join(itertools.repeat("f", len_data))
len_values = len(values)
@ -161,11 +180,11 @@ class Profile(SQLSubModel):
)
for timestamp, value in zip(timestamps, values):
new_data.set(timestamp, key, value)
new.set(timestamp, key, value)
if key == "Z":
new_data.update_water_limits(timestamp, value)
new.update_water_limits(timestamp, value)
return list(new.values())
return new
@classmethod
def _db_load_data_sl_format(cls, values, len_data, timestamps):
@ -257,19 +276,20 @@ class Profile(SQLSubModel):
class Reach(SQLSubModel):
_sub_classes = [Profile]
def __init__(self, reach, study, with_init=True):
def __init__(self, reach, study, parent, with_init=True):
super(Reach, self).__init__(
id=-1, status=study.status,
owner_scenario=study.status.scenario.id
)
self._parent = parent
self._study = study
self._reach = reach # Source reach in the study
self._profiles = []
if with_init:
self._profiles = list(
map(
lambda p: Profile(p, self._study),
lambda p: Profile(p, self._study, self._parent),
reach.profiles
)
)
@ -279,6 +299,9 @@ class Reach(SQLSubModel):
lambda p: p.name[0:8] != 'interpol', self._profiles
)
)
self._global_index = (-1, -1)
self._buffers = {}
def __len__(self):
@ -307,6 +330,17 @@ class Reach(SQLSubModel):
def profile(self, id):
return self._profiles[id]
def set_global_index(self, indexs):
self._global_index = (indexs[0], indexs[-1])
for profile, ind in zip(self._profiles, indexs):
profile.global_index = ind
@property
def global_index(self):
return self._global_index
@timer
def set(self, profile_id, timestamp, key, data):
self._profiles[profile_id].set(timestamp, key, data)
@ -322,6 +356,10 @@ class Reach(SQLSubModel):
for i, p in enumerate(self._profiles):
self._buffers[key][:, i] = p.get_key(key)
def update_water_limits(self, timestamp, z_data):
for profile, z in zip(self._profiles, z_data):
profile.update_water_limits(timestamp, z)
@classmethod
def _db_create(cls, execute, ext=""):
return cls._create_submodel(execute)
@ -335,12 +373,13 @@ class Reach(SQLSubModel):
reach = data["reach"]
new_reach = cls(
data["reach"], data["study"], with_init=False
data["reach"], data["study"], data["parent"],
with_init=False
)
for i, profile in enumerate(reach.profiles):
data["profile"] = profile
new_reach._profiles += Profile._db_load(execute, data)
new_reach._profiles += [Profile._db_load(execute, data)]
return new_reach
@ -354,13 +393,14 @@ class Reach(SQLSubModel):
class River(SQLSubModel):
_sub_classes = [Reach]
def __init__(self, study):
def __init__(self, study, parent):
super(River, self).__init__(
id=-1, status=study.status,
owner_scenario=study.status.scenario.id
)
self._study = study
self._parent = parent
# Dict with timestamps as key
self._reachs = []
@ -381,7 +421,7 @@ class River(SQLSubModel):
def add(self, reach_id):
reachs = self._study.river.enable_edges()
new = Reach(reachs[reach_id].reach, self._study)
new = Reach(reachs[reach_id].reach, self._study, self._parent)
self._reachs.append(new)
return new
@ -394,6 +434,15 @@ class River(SQLSubModel):
)
)
def update_water_limits(self, timestamp, data):
for reach in self._reachs:
ind = reach.global_index
reach.update_water_limits(
timestamp,
data[ind[0]:ind[1]]
)
@classmethod
def _db_create(cls, execute, ext=""):
return cls._create_submodel(execute)
@ -405,7 +454,9 @@ class River(SQLSubModel):
@classmethod
def _db_load(cls, execute, data=None):
study = data["study"]
new_river = cls(study)
parent = data["parent"]
new_river = cls(study, parent)
for reach in study.river.reachs():
data["reach"] = reach.reach

2
src/Model/Results/River/RiverAdisTS.py
View File

@ -1,5 +1,5 @@
# River.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/River.py
View File

@ -1,5 +1,5 @@
# River.py -- Pamhyr river model
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Serializable.py
View File

@ -1,5 +1,5 @@
# Serializable.py -- Pamhyr pickle abstract class
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/SolverParameters/SolverParametersList.py
View File

@ -1,5 +1,5 @@
# SolverParametersList.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Status.py
View File

@ -1,5 +1,5 @@
# Status.py -- Pamhyr model status class
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Stricklers/Stricklers.py
View File

@ -1,5 +1,5 @@
# Stricklers.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Stricklers/StricklersList.py
View File

@ -1,5 +1,5 @@
# StricklersList.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Study.py
View File

@ -1,5 +1,5 @@
# Study.py -- Pamhyr Study class
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Tools/PamhyrDB.py
View File

@ -1,5 +1,5 @@
# PamhyrDB.py -- Pamhyr abstract model database classes
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Tools/PamhyrDict.py
View File

@ -1,5 +1,5 @@
# PamhyrDict.py -- Pamhyr abstract dict for model classes
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Tools/PamhyrList.py
View File

@ -1,5 +1,5 @@
# PamhyrList.py -- Pamhyr Abstract List object for the Model
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/Tools/PamhyrListExt.py
View File

@ -1,5 +1,5 @@
# PamhyrList.py -- Pamhyr Abstract List object for the Model
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/__init__.py
View File

@ -1,5 +1,5 @@
# __init__.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Model/test_Model.py
View File

@ -1,5 +1,5 @@
# test_Model.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/SQL.py
View File

@ -1,5 +1,5 @@
# SQL.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Scripts/AScript.py
View File

@ -1,5 +1,5 @@
# AScript.py -- Pamhyr abstract script class
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Scripts/Hello.py
View File

@ -1,5 +1,5 @@
# Hello.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Scripts/ListSolver.py
View File

@ -1,5 +1,5 @@
# ListSolver.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Scripts/MageMesh.py
View File

@ -1,5 +1,5 @@
# MageMesh.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Scripts/P3DST.py
View File

@ -1,5 +1,5 @@
# P3DST.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Scripts/Run.py
View File

@ -1,5 +1,5 @@
# Run.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

20
src/Scripts/mage_to_mascaret.py
View File

@ -1,3 +1,20 @@
# mage_to_mascaret.py -- Pamhyr
# Copyright (C) 2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# -*- coding: utf-8 -*-
#!/bin/env python3
import sys
@ -336,6 +353,3 @@ if __name__ == "__main__":
print( 'Number of arguments:', len(sys.argv), 'arguments.')
print( 'Argument List:', str(sys.argv))
mage_to_mascaret(sys.argv[1])

17
src/Scripts/mascaret_to_mage.py
View File

@ -1,3 +1,20 @@
# mascaret_to_mage.py -- Pamhyr
# Copyright (C) 2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# -*- coding: utf-8 -*-
#!/bin/env python3
import sys

2
src/Solver/ASolver.py
View File

@ -1,5 +1,5 @@
# ASolver.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Solver/AdisTS.py
View File

@ -1,5 +1,5 @@
# AdisTS.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Solver/CommandLine.py
View File

@ -1,5 +1,5 @@
# CommandLine.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/Solver/GenericSolver.py
View File

@ -1,5 +1,5 @@
# GenericSolver.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

135
src/Solver/Mage.py
View File

@ -1,5 +1,5 @@
# Mage.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -407,7 +407,7 @@ class Mage(CommandLineSolver):
# name = f"Reach_{lateral.reach.id + 1:>3}".replace(" ", "0")
f.write(f"* {lateral.reach.name} ({name}) {lateral.lctype}\n")
f.write(
f"${name} " +
f"${name} " +
f"{lateral.begin_rk:>10.4f} {lateral.end_rk:>10.4f}\n"
)
header = lateral.header
@ -1083,7 +1083,7 @@ class Mage8(Mage):
newline()
reachs = []
iprofiles = {}
iprofiles = []
profile_len = []
reach_offset = {}
@ -1098,15 +1098,18 @@ class Mage8(Mage):
i1 = data[2*i] - 1
i2 = data[2*i+1] - 1
# Keep profiles index of all river
r.set_global_index(range(i1, i2 + 1))
# Add profile id correspondance to reach
key = (i1, i2)
iprofiles[key] = r
for key in range(i1, i2 + 1):
iprofiles.append(i)
# Profile ID offset
reach_offset[r] = i1
profile_len.append(i2-i1+1)
profile_len.append(i2 - i1 + 1)
logger.debug(f"read_bin: iprofiles = {iprofiles}")
logger.debug(f"read_bin: iprofiles = {len(iprofiles)}")
endline()
@ -1124,16 +1127,6 @@ class Mage8(Mage):
# Data
newline()
def ip_to_r(i): return iprofiles[
next(
filter(
lambda k: k[0] <= i <= k[1],
iprofiles
)
)
]
def ip_to_ri(r, i): return i - reach_offset[r]
# check results and geometry consistency
for i, r in enumerate(reachs):
lp = len(r.profiles)
@ -1144,6 +1137,8 @@ class Mage8(Mage):
return
ts = set()
tmp_table = {}
end = False
while not end:
n = read_int(1)[0]
@ -1152,18 +1147,21 @@ class Mage8(Mage):
f, dtype=np.byte, count=1)).decode()
data = read_float(n)
# logger.debug(f"read_bin: timestamp = {timestamp} sec")
if key not in tmp_table:
tmp_table[key] = []
tmp_table[key].append(data)
ts.add(timestamp)
if key in ["Z", "Q"]:
for i, d in enumerate(data):
# Get reach corresponding to profile ID
reach = ip_to_r(i)
reach = reachs[iprofiles[i]]
# Get profile id in reach
ri = ip_to_ri(reach, i)
ri = i - reach_offset[reach]
# Set data for profile RI
reach.set(ri, timestamp, key, d)
# reach.set(ri, timestamp, key, d)
if key == "Z":
profile = reach.profile(ri)
limits = profile.geometry.get_water_limits(d)
@ -1176,6 +1174,15 @@ class Mage8(Mage):
endline()
end = newline().size <= 0
ts_index = {}
for i, t in enumerate(sorted(ts)):
ts_index[t] = i
results.set_timestamp_index(ts_index)
table = {}
for k in tmp_table:
table[k] = np.array(tmp_table[k])
results.set("timestamps", ts)
ts_list = sorted(ts)
logger.info(f"compute tab...")
@ -1185,19 +1192,33 @@ class Mage8(Mage):
logger.info(f"compute velocity...")
for r in reachs:
for t in ts_list:
for i, p in enumerate(r.profiles):
velocity_arr = np.zeros((len(ts), len(iprofiles)))
for ti, t in enumerate(ts_list):
j = 0
for r in reachs:
for pi, p in enumerate(r.profiles):
v = p.geometry.speed(
p.get_ts_key(t, "Q"),
p.get_ts_key(t, "Z")
table["Q"][ti, p.global_index],
table["Z"][ti, p.global_index],
)
r.set(i, t, "V", v)
# r.set(pi, t, "V", v)
velocity_arr[ti, j] = v
j += 1
table["V"] = velocity_arr
for legend in table:
table[legend] = results.new_table_data(
legend, table[legend]
)
results.set("table", table)
logger.info(f"read_bin: ... end with {len(ts)} timestamp read")
results.bufferize("Z")
results.bufferize("Q")
results.bufferize("V")
# results.bufferize("Z")
# results.bufferize("Q")
# results.bufferize("V")
logger.info(f"reading time: '{time.time() - start}'")
@timer
@ -1267,8 +1288,8 @@ class Mage8(Mage):
reachs.append(r)
# ID of first and last reach profiles
i1 = data[2*i] - 1
i2 = data[2*i+1] - 1
i1 = data[2 * i] - 1
i2 = data[2 * i + 1] - 1
# Add profile id correspondance to reach
key = (i1, i2)
@ -1322,6 +1343,7 @@ class Mage8(Mage):
newline()
npts = read_int(n)
endline()
sum_npts = sum(npts)
logger.debug(f"read_gra: Number of points: {sum_npts}")
@ -1371,35 +1393,42 @@ class Mage8(Mage):
logger.info(f"compute river bed elevation...")
zfd_lst = []
for r in reachs:
z_min = r.geometry.get_z_min()
sls = list(map(
sls = map(
lambda p: p.get_ts_key(ts_list[0], "sl")[0],
r.profiles
))
)
z_br = list(map(
lambda z, sl: reduce(
lambda z, h: z - h[0],
sl, z
),
z_min, # Original geometry
sls # Original sediment layers
))
for t in ts_list:
sls = list(map(
lambda z, sl: reduce(
lambda z, h: z - h[0],
sl, z
),
z_min, # Original geometry
sls # Original sediment layers
))
for its, t in enumerate(ts_list):
sls = map(
lambda p: p.get_ts_key(t, "sl")[0],
r.profiles
))
)
zfd = list(map(
lambda z, sl: reduce(
lambda z, h: z + h[0],
sl, z
),
z_br, # bedrock
sls # Original sediment layers
))
for i, p in enumerate(r.profiles):
r.set(i, t, "zfd", zfd[i])
lambda z, sl: reduce(
lambda z, h: z + h[0],
sl, z
),
z_br, # bedrock
sls # Original sediment layers
))
zfd_lst.append(np.array(zfd))
table = results.get("table")
table["zfd"] = results.new_table_data(
"zfd", np.array(zfd_lst)
)
results.set("sediment_timestamps", ts)
logger.info(f"read_gra: ... end with {len(ts)} timestamp read")

2
src/Solver/Solvers.py
View File

@ -1,5 +1,5 @@
# Solvers.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/View/About/Window.py
View File

@ -1,5 +1,5 @@
# Window.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/View/BoundaryCondition/Edit/GenerateDialog.py
View File

@ -1,5 +1,5 @@
# GenerateDialog.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/View/BoundaryCondition/Edit/Plot.py
View File

@ -1,5 +1,5 @@
# Plot.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/View/BoundaryCondition/Edit/Table.py
View File

@ -1,5 +1,5 @@
# Table.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/View/BoundaryCondition/Edit/UndoCommand.py
View File

@ -1,5 +1,5 @@
# UndoCommand.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/View/BoundaryCondition/Edit/Window.py
View File

@ -1,5 +1,5 @@
# Window.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

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

@ -1,5 +1,5 @@
# translate.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/View/BoundaryCondition/Table.py
View File

@ -1,5 +1,5 @@
# Table.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/View/BoundaryCondition/UndoCommand.py
View File

@ -1,5 +1,5 @@
# UndoCommand.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/View/BoundaryCondition/Window.py
View File

@ -1,5 +1,5 @@
# Window.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/View/BoundaryCondition/translate.py
View File

@ -1,5 +1,5 @@
# translate.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
src/View/BoundaryConditionsAdisTS/Edit/Plot.py
View File

@ -1,5 +1,5 @@
# Plot.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
# Copyright (C) 2023-2026 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

Some files were not shown because too many files have changed in this diff Show More