mirror of https://gitlab.com/pamhyr/pamhyr2
Ensemble: Fix ensemble study meta data save.
parent
b5432498c6
commit
e7290fa81b
|
|
@ -420,19 +420,6 @@ class Study(SQLModel):
|
||||||
def _save(self, progress=None):
|
def _save(self, progress=None):
|
||||||
progress = progress if progress is not None else lambda: None
|
progress = progress if progress is not None else lambda: None
|
||||||
|
|
||||||
if self.status.scenario.is_ensemble():
|
|
||||||
self._save_submodel(
|
|
||||||
[
|
|
||||||
self.scenarios, self._ens_functions,
|
|
||||||
self._river._ensembles
|
|
||||||
],
|
|
||||||
data=progress
|
|
||||||
)
|
|
||||||
progress()
|
|
||||||
self.commit()
|
|
||||||
|
|
||||||
return
|
|
||||||
|
|
||||||
self.execute(
|
self.execute(
|
||||||
"INSERT OR REPLACE INTO info VALUES ('study_release', " +
|
"INSERT OR REPLACE INTO info VALUES ('study_release', " +
|
||||||
f"'{self.status.version}')"
|
f"'{self.status.version}')"
|
||||||
|
|
@ -479,6 +466,19 @@ class Study(SQLModel):
|
||||||
)
|
)
|
||||||
progress()
|
progress()
|
||||||
|
|
||||||
|
if self.status.scenario.is_ensemble():
|
||||||
|
self._save_submodel(
|
||||||
|
[
|
||||||
|
self.scenarios, self._ens_functions,
|
||||||
|
self._river._ensembles
|
||||||
|
],
|
||||||
|
data=progress
|
||||||
|
)
|
||||||
|
progress()
|
||||||
|
self.commit()
|
||||||
|
|
||||||
|
return
|
||||||
|
|
||||||
self._save_submodel(
|
self._save_submodel(
|
||||||
[
|
[
|
||||||
self.scenarios, self._ens_functions,
|
self.scenarios, self._ens_functions,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue