mirror of https://gitlab.com/pamhyr/pamhyr2
Study: Minor change.
parent
0df4cf0fd5
commit
42ea50d62e
|
|
@ -454,6 +454,8 @@ class Study(SQLModel):
|
||||||
for scenar in self.scenarios.lst:
|
for scenar in self.scenarios.lst:
|
||||||
scenar.drop_deleted_data(self.execute)
|
scenar.drop_deleted_data(self.execute)
|
||||||
|
|
||||||
|
progress()
|
||||||
|
|
||||||
self.commit()
|
self.commit()
|
||||||
|
|
||||||
def sql_save_request_count(self, *args, **kargs):
|
def sql_save_request_count(self, *args, **kargs):
|
||||||
|
|
@ -464,7 +466,7 @@ class Study(SQLModel):
|
||||||
[self.scenarios, self._river]
|
[self.scenarios, self._river]
|
||||||
)
|
)
|
||||||
logger.debug(cnt)
|
logger.debug(cnt)
|
||||||
return cnt + 7
|
return cnt + 8
|
||||||
|
|
||||||
def close(self):
|
def close(self):
|
||||||
"""Close db connection
|
"""Close db connection
|
||||||
|
|
@ -523,7 +525,8 @@ class Study(SQLModel):
|
||||||
data["study"] = self
|
data["study"] = self
|
||||||
river._db_load_results(sql_exec, data=data)
|
river._db_load_results(sql_exec, data=data)
|
||||||
|
|
||||||
self._river_scenario_cache[scenario] = river
|
# FIXME: Disable scenario cache to save memory usage
|
||||||
|
# self._river_scenario_cache[scenario] = river
|
||||||
self.status.scenario = old_scenario
|
self.status.scenario = old_scenario
|
||||||
|
|
||||||
return river
|
return river
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue