Merge remote-tracking branch 'upstream/master' into fix_test_warnings

jdebacker · jdebacker · commit b8ed1d0c7a68 · 2025-11-08T00:18:05.000-05:00
diff --git a/ogcore/SS.py b/ogcore/SS.py
@@ -1095,7 +1095,7 @@ def SS_solver(
         )
 
     if ENFORCE_SOLUTION_CHECKS and (max(np.absolute(RC)) > p.RC_SS):
-        logging.warning("Resource Constraint Difference:", RC)
+        logging.warning(f"Resource Constraint Difference: {RC}")
         err = "Steady state aggregate resource constraint not satisfied"
         raise RuntimeError(err)
 

Original file line number	Diff line number	Diff line change
`@@ -1095,7 +1095,7 @@ def SS_solver(`
`1095`	`1095`	`)`
`1096`	`1096`
`1097`	`1097`	`if ENFORCE_SOLUTION_CHECKS and (max(np.absolute(RC)) > p.RC_SS):`
`1098`		`- logging.warning("Resource Constraint Difference:", RC)`
	`1098`	`+ logging.warning(f"Resource Constraint Difference: {RC}")`
`1099`	`1099`	`err = "Steady state aggregate resource constraint not satisfied"`
`1100`	`1100`	`raise RuntimeError(err)`
`1101`	`1101`