mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
Friction, Reservoir, Geometry: Some fixes and minor change.
This commit is contained in:
1 parent
7bb0c9d57e
commit
6ec677a047
6 files changed
+32
-27
No files matched your search
@@ -30,6 +30,7 @@ logger = logging.getLogger()
|
||||
|
||||
class Friction(SQLSubModel):
|
||||
def __init__(self, id: int = -1,
|
||||
reach=None,
|
||||
status=None,
|
||||
owner_scenario=-1):
|
||||
super(Friction, self).__init__(
|
||||
@@ -37,7 +38,7 @@ class Friction(SQLSubModel):
|
||||
owner_scenario=owner_scenario
|
||||
)
|
||||
|
||||
self._reach = None
|
||||
self._reach = reach
|
||||
self._begin_rk = 0.0
|
||||
self._end_rk = 0.0
|
||||
self._begin_strickler = None
|
||||
@@ -64,7 +65,7 @@ class Friction(SQLSubModel):
|
||||
)
|
||||
""")
|
||||
|
||||
if ext == "_tmp":
|
||||
if ext != "":
|
||||
return True
|
||||
|
||||
return cls._create_submodel(execute)
|
||||
@@ -217,7 +218,7 @@ class Friction(SQLSubModel):
|
||||
|
||||
return (
|
||||
self._begin_strickler._owner_scenario == ssi
|
||||
or self._end_strickler._owner_scenario == ssi
|
||||
# or self._end_strickler._owner_scenario == ssi
|
||||
or super(Friction, self).must_be_saved()
|
||||
)
|
||||
|
||||
|
||||
Reference in new issue
Block a user