Merge pull request #891 from jdebacker/simplify_extrap

Merging
PSLmodels · Nov 21, 2023 · d8a0fa4 · d8a0fa4
2 parents aa8c933 + 3627248
commit d8a0fa4
Show file tree

Hide file tree

Showing 5 changed files with 224 additions and 305 deletions.
diff --git a/docs/book/content/api/utils.rst b/docs/book/content/api/utils.rst
@@ -18,4 +18,4 @@ ogcore.utils
     pickle_file_compare, comp_array, comp_scalar, dict_compare,
     to_timepath_shape, get_initial_path, safe_read_pickle, rate_conversion,
     save_return_table, print_progress, fetch_files_from_web, not_connected,
-    avg_by_bin
+    avg_by_bin, extrapolate_arrays
diff --git a/ogcore/SS.py b/ogcore/SS.py
@@ -1386,7 +1386,11 @@ def run_SS(p, client=None):
             Yss = TR_ss / p.alpha_T[-1]  # may not be right - if
             # budget_balance = True, but that's ok - will be fixed in
             # SS_solver
-        if ENFORCE_SOLUTION_CHECKS and not sol.success == 1:
+        if (
+            (ENFORCE_SOLUTION_CHECKS)
+            and not (sol.success == 1)
+            and (np.absolute(np.array(sol.fun)).max() > p.mindist_SS)
+        ):
             raise RuntimeError("Steady state equilibrium not found")
         # Return SS values of variables
         fsolve_flag = True