From beb5bcd1fa9d72a9cce2f09100b98549994b438f Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Mon, 23 Apr 2012 11:46:32 +0200 Subject: [PATCH] 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/MarginalDamage.cs | 4 ++-- Fund/MarginalDamage3.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Fund/MarginalDamage.cs b/Fund/MarginalDamage.cs index 262b8ac8..eb22ae0e 100644 --- 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 index 27a92859..f430f724 100644 --- 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);