From 3169b8f68053f31cc72719a2ded974609b89c3e3 Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Thu, 19 Sep 2024 00:13:51 -0600 Subject: [PATCH] Updated files --- ogcore/SS.py | 4 +++- ogcore/TPI.py | 4 +++- ogcore/default_parameters.json | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ogcore/SS.py b/ogcore/SS.py index 6ad13a9ca..6d147df84 100644 --- 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 index 8b9b0f736..acf514424 100644 --- a/ogcore/TPI.py +++ b/ogcore/TPI.py @@ -1273,6 +1273,8 @@ 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, @@ -1280,7 +1282,7 @@ def run_TPI(p, client=None): 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 index 26e3e926b..88fe4ea42 100644 --- 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": {