Scenario: Results: Fix scenario load and save results.

src/Model/River.py

@@ -16,6 +16,7 @@
 
 # -*- coding: utf-8 -*-
 
+import types
 import logging
 
 from tools import flatten, logger_exception
@@ -618,7 +619,7 @@ class River(Graph):
         objs.append(self._DIFAdisTS)
 
         if self._results is not None:
-            objs.append(self._results)
+            objs.append(self.results)
 
         self._save_submodel(execute, objs, data)
         return True
@@ -861,3 +862,15 @@ Last export at: @date."""
         )
 
         return has
+
+    @property
+    def results(self):
+        results = self._results
+        if isinstance(results, types.GeneratorType):
+            self._results = next(results)
+
+        return self._results
+
+    @results.setter
+    def results(self, results):
+        self._results = results

src/Model/Study.py

@@ -17,7 +17,6 @@
 # -*- coding: utf-8 -*-
 
 import os
-import types
 import shutil
 import logging
 from datetime import datetime
@@ -493,9 +492,11 @@ class Study(SQLModel):
 
             # Reload river data
             river = River._db_load(
-                sql_exec,
+                sql_exec, data=data
-                data=data
             )
+            data["study"] = self
+            river._db_load_results(sql_exec, data=data)
+
             self._river_scenario_cache[scenario] = river
             self._river = river
 
@@ -531,12 +532,8 @@ class Study(SQLModel):
 
     @property
     def results(self):
-        results = self._river._results
+        return self._river.results
-        if isinstance(results, types.GeneratorType):
-            self._river._results = next(results)
-
-        return self._river._results
 
     @results.setter
     def results(self, results):
-        self._river._results = results
+        self._river.results = results