Improve performance in MarginalDamage3

MarginalDamage3 now runs the model only for those years for which it needs output.
fund-model · Nov 7, 2013 · 9a898e2 · 9a898e2
1 parent 87775de
commit 9a898e2
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/Fund/MarginalDamage3.cs b/Fund/MarginalDamage3.cs
@@ -31,7 +31,9 @@ public MarginalDamage3()
 
         public double Start()
         {
-            var f1 = FundModel.GetModel(storeFullVariablesByDefault: false);
+            int yearsToRun = EmissionYear.Value + YearsToAggregate;
+
+            var f1 = FundModel.GetModel(storeFullVariablesByDefault: false, years: yearsToRun);
             f1["impactwaterresources"].Variables["water"].StoreOutput = true;
             f1["ImpactForests"].Variables["forests"].StoreOutput = true;
             f1["ImpactHeating"].Variables["heating"].StoreOutput = true;
@@ -57,9 +59,9 @@ public double Start()
             var result1 = f1.Run(Parameters);
 
             var i_output1 = new ModelOutput();
-            i_output1.Load(result1);
+            i_output1.Load(result1, years: yearsToRun);
 
-            var f2 = FundModel.GetModel(storeFullVariablesByDefault: false);
+            var f2 = FundModel.GetModel(storeFullVariablesByDefault: false, years: yearsToRun);
             f2["impactwaterresources"].Variables["water"].StoreOutput = true;
             f2["ImpactForests"].Variables["forests"].StoreOutput = true;
             f2["ImpactHeating"].Variables["heating"].StoreOutput = true;
@@ -108,7 +110,7 @@ public double Start()
             var result2 = f2.Run(Parameters);
 
             var i_output2 = new ModelOutput();
-            i_output2.Load(result2);
+            i_output2.Load(result2, years: yearsToRun);
 
             // Take out growth effect effect of run 2 by transforming
             // the damage from run 2 into % of GDP of run 2, and then