Make marginal components use pop comoponent

Both MarginalDamage and MarginalDamage3 were coded to get the population variable from SocioEconomic. Now they get population from the Population component.
fund-model · Apr 23, 2012 · beb5bcd · beb5bcd
1 parent ec56873
commit beb5bcd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Fund/MarginalDamage.cs b/Fund/MarginalDamage.cs
@@ -164,7 +164,7 @@ public double[] DoOneRun(int RunId, WeightingCombination[] i_weightingCombinatio
             f1["ImpactSeaLevelRise"].Variables["wetcost"].StoreOutput = true;
             f1["ImpactSeaLevelRise"].Variables["leavecost"].StoreOutput = true;
             f1["SocioEconomic"].Variables["income"].StoreOutput = true;
-            f1["SocioEconomic"].Variables["population"].StoreOutput = true;
+            f1["Population"].Variables["population"].StoreOutput = true;
 
             if (AdditionalInitCode != null)
                 AdditionalInitCode(f1);
@@ -195,7 +195,7 @@ public double[] DoOneRun(int RunId, WeightingCombination[] i_weightingCombinatio
             f2["ImpactSeaLevelRise"].Variables["wetcost"].StoreOutput = true;
             f2["ImpactSeaLevelRise"].Variables["leavecost"].StoreOutput = true;
             f2["SocioEconomic"].Variables["income"].StoreOutput = true;
-            f2["SocioEconomic"].Variables["population"].StoreOutput = true;
+            f2["Population"].Variables["population"].StoreOutput = true;
 
             if (AdditionalInitCode != null)
                 AdditionalInitCode(f2);

diff --git a/Fund/MarginalDamage3.cs b/Fund/MarginalDamage3.cs
@@ -46,7 +46,7 @@ public double Start()
             f1["ImpactSeaLevelRise"].Variables["wetcost"].StoreOutput = true;
             f1["ImpactSeaLevelRise"].Variables["leavecost"].StoreOutput = true;
             f1["socioeconomic"].Variables["income"].StoreOutput = true;
-            f1["socioeconomic"].Variables["population"].StoreOutput = true;
+            f1["Population"].Variables["population"].StoreOutput = true;
 
 
             if (AdditionalInitMethod != null)
@@ -74,7 +74,7 @@ public double Start()
             f2["ImpactSeaLevelRise"].Variables["wetcost"].StoreOutput = true;
             f2["ImpactSeaLevelRise"].Variables["leavecost"].StoreOutput = true;
             f2["socioeconomic"].Variables["income"].StoreOutput = true;
-            f2["socioeconomic"].Variables["population"].StoreOutput = true;
+            f2["Population"].Variables["population"].StoreOutput = true;
 
             if (AdditionalInitMethod != null)
                 AdditionalInitMethod(f2);