Fix axis for addition of emissions

RDCEP · May 9, 2016 · 920ef45 · 920ef45
1 parent 66cbe37
commit 920ef45
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/beam_carbon/beam.py b/beam_carbon/beam.py
@@ -351,7 +351,7 @@ def run(self):
             if i % self.intervals == 0 and self.temperature_dependent: # First interval in time step
                 self.temp_calibrate(temp_ocean)
 
-            h = self.get_H(carbon_mass[1])
+            h = self.get_H(carbon_mass[1], re_solve=False)
             self.B = self.get_B(h)
 
             if i % self.intervals == 0: # First interval in time step
@@ -369,8 +369,9 @@ def run(self):
                 temp_ocean = self.temperature.temp_ocean(
                     ta, temp_ocean)
 
-            carbon_mass += ((self.transfer_matrix * carbon_mass + emissions) /
-                         self.intervals).sum(axis=1)
+            carbon_mass += (((self.transfer_matrix * carbon_mass) /
+                             self.intervals).sum(axis=1) +
+                            emissions / self.intervals)
 
             if (i + 1) % self.intervals == 0:
                 output.iloc[:, _i + 1] = (