Updated files

rickecon · Sep 19, 2024 · 3169b8f · 3169b8f
1 parent bc6db91
commit 3169b8f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/ogcore/SS.py b/ogcore/SS.py
@@ -924,6 +924,8 @@ def SS_solver(
     I_g_vec_ss[-1] = I_g_ss
     net_capital_outflows_vec = np.zeros(p.M)
     net_capital_outflows_vec[-1] = net_capital_outflows
+    RM_vec_ss = np.zeros(p.M)
+    RM_vec_ss[-1] = RM_ss
 
     RC = aggr.resource_constraint(
         Y_vec_ss,
@@ -932,7 +934,7 @@ def SS_solver(
         I_d_vec_ss,
         I_g_vec_ss,
         net_capital_outflows_vec,
-        RM_ss,
+        RM_vec_ss,
     )
     if VERBOSE:
         print("Foreign debt holdings = ", D_f_ss)

diff --git a/ogcore/TPI.py b/ogcore/TPI.py
@@ -1273,14 +1273,16 @@ def run_TPI(p, client=None):
     I_g_vec[:, -1] = I_g[: p.T]
     net_capital_outflows_vec = np.zeros((p.T, p.M))
     net_capital_outflows_vec[:, -1] = net_capital_outflows[: p.T]
+    RM_vec = np.zeros((p.T, p.M))
+    RM_vec[:, -1] = RM[: p.T]
     RC_error = aggr.resource_constraint(
         Y_vec,
         C_m_vec,
         G_vec,
         I_d_vec,
         I_g_vec,
         net_capital_outflows_vec,
-        RM[: p.T],
+        RM_vec,
     )
     # Compute total investment (not just domestic)
     I_total = aggr.get_I(None, K[1 : p.T + 1], K[: p.T], p, "total_tpi")

diff --git a/ogcore/default_parameters.json b/ogcore/default_parameters.json
@@ -4290,7 +4290,7 @@
         "type": "float",
         "value": [
             {
-                "value": 1e-09
+                "value": 1e-08
             }
         ],
         "validators": {
@@ -4308,7 +4308,7 @@
         "type": "float",
         "value": [
             {
-                "value": 1e-05
+                "value": 1e-04
             }
         ],
         "validators": {