quick fix for AdisTS

This commit is contained in:
Theophile Terraz committed 2025-11-18 17:25:48 +01:00
1 parent c1905aa7e1
commit c2a8f38ef5
4 files changed
+78 -6

No files matched your search

+64 -2
View File
@@ -96,6 +96,69 @@ class AdisTS(CommandLineSolver):
return lst
##########
# Export #
##########
_alph = list(
map(
chr,
chain(
range(48, 58), # 0..9
range(65, 91), # A..Z
range(97, 123) # a..z
)
)
)
_l_alph = len(_alph)
_nodes_cnt = 0
_nodes_names = {}
_nodes_views = set()
def get_reach_name(self, reach):
return f"Reach_{reach.pamhyr_id:>3}".replace(" ", "0")
def get_node_name(self, node):
"""Generate a 3 char name for node
Args:
node: The node
Returns:
A 3 char name string
"""
n = node.pamhyr_id
if n in self._nodes_names:
return self._nodes_names[n]
name = ""
checked_new = False
while not checked_new:
self._nodes_cnt += 1
nc = self._nodes_cnt
name = "".join(
map(
lambda i: self._alph[i % self._l_alph],
[
int(nc / (self._l_alph * self._l_alph)),
int(nc / self._l_alph),
nc
]
)
)
checked_new = name not in self._nodes_views
self._nodes_views.add(name)
self._nodes_names[n] = name
return name
def cmd_args(self, study):
lst = super(AdisTS, self).cmd_args(study)
return lst
@@ -365,8 +428,7 @@ class AdisTSwc(AdisTS):
node = next(filter(
lambda x: x.id == BC.node, study.river._nodes
))
node_name = f"{node.id:3}".replace(" ", "x")
f.write(f"${node_name}\n")
f.write(f"${self.get_node_name(node)}\n")
if BC.type == "Concentration":
f.write(f"*temps |concentration\n")