simBirths only populates BLANK/None state vars at birth econ-ark#761

sbenthall · Sep 14, 2020 · 61b5ad8 · 61b5ad8
1 parent 93923f0
commit 61b5ad8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/HARK/ConsumptionSaving/ConsIndShockModel.py b/HARK/ConsumptionSaving/ConsIndShockModel.py
@@ -1681,8 +1681,8 @@ def unpackcFunc(self):
 
     def initializeSim(self):
         self.PermShkAggNow = self.PermGroFacAgg  # This never changes during simulation
-        AgentType.initializeSim(self)
         self.state_vars['PlvlAggNow'] = 1.0
+        AgentType.initializeSim(self)
 
     def simBirth(self, which_agents):
         """

diff --git a/HARK/core.py b/HARK/core.py
@@ -442,7 +442,8 @@ def initializeSim(self):
         all_agents = np.ones(self.AgentCount, dtype=bool)
         blank_array = np.zeros(self.AgentCount)
         for var in self.state_vars:
-            self.state_vars[var] = copy(blank_array)
+            if self.state_vars[var] is None:
+                self.state_vars[var] = copy(blank_array)
         for var_name in self.poststate_vars:
             self.poststate_vars[var_name] = copy(blank_array)
         self.t_age = np.zeros(