Fix bugs

pik-piam · Feb 21, 2025 · 7ce65b0 · 7ce65b0
1 parent a29b28b
commit 7ce65b0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/R/calcFeDemandIndustry.R b/R/calcFeDemandIndustry.R
@@ -207,7 +207,7 @@ calcFeDemandIndustry <- function(scenarios, use_ODYM_RECC = FALSE, last_empirica
     calcOutput(
       type = "Steel_Projections",
       subtype = "production",
-      scenario = gdpPopScen,
+      scenarios = gdpPopScen,
       match.steel.historic.values = TRUE,
       match.steel.estimates = "IEA_ETP",
       China_Production = readSource(type = "ExpertGuess",

diff --git a/R/calcIndustry_EEK.R b/R/calcIndustry_EEK.R
@@ -28,7 +28,7 @@ calcIndustry_EEK <- function(kap, scenarios) {
   industry_VA <- calcOutput(
     type = 'Industry_Value_Added',
     subtype = 'economic',
-    scenario = unique(c(scenarios, "SSP2")),
+    scenarios = unique(c(mrdrivers::toolReplaceShortcuts(scenarios), "SSP2")),
     match.steel.historic.values = TRUE,
     match.steel.estimates = 'IEA_ETP',
     China_Production = readSource(type = 'ExpertGuess',

diff --git a/R/calcIndustry_Value_Added.R b/R/calcIndustry_Value_Added.R
@@ -318,7 +318,7 @@ calcIndustry_Value_Added <- function(subtype = 'physical',
              'GDPpC', 'steel.VApt'),
 
     calcOutput(type = 'Steel_Projections',
-               scenario = scenarios,
+               scenarios = scenarios,
                match.steel.historic.values = match.steel.historic.values,
                match.steel.estimates = match.steel.estimates,
                China_Production = China_Production,

diff --git a/R/calcSteel_Projections.R b/R/calcSteel_Projections.R
@@ -1230,6 +1230,7 @@ calcSteel_Projections <- function(subtype = 'production',
              as.magpie(spatial = 2, temporal = 3, data = 4),
            weight = calcOutput(
              type = 'Steel_Projections',
+             scenarios = scenarios,
              match.steel.historic.values = match.steel.historic.values,
              match.steel.estimates = match.steel.estimates,
              aggregate = FALSE, years = unique(quitte::remind_timesteps$period),

diff --git a/inst/extdata/specific_material_relative.csv b/inst/extdata/specific_material_relative.csv
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 scenario,               base.scenario,   region,   subsector,         factor
 SDP,                    SSP1,            NA,       cement,            1
 SDP,                    SSP1,            NA,       chemicals,         1
@@ -152,13 +151,13 @@ SSP2_highDemDEU,        SSP2,            NA,       chemicals,         1
 SSP2_highDemDEU,        SSP2,            NA,       steel_primary,     1
 SSP2_highDemDEU,        SSP2,            NA,       steel_secondary,   1
 SSP2_highDemDEU,        SSP2,            NA,       otherInd,          1
-SSP2IndiaMedium,        SSP2,            NA,       cement,             1
-SSP2IndiaMedium,        SSP2,            NA,       chemicals,          1
-SSP2IndiaMedium,        SSP2,            NA,       steel_primary,      1
-SSP2IndiaMedium,        SSP2,            NA,       steel_secondary,    1
-SSP2IndiaMedium,        SSP2,            NA,       otherInd,           1
-SSP2IndiaHigh,          SSP2,            NA,       cement,             1
-SSP2IndiaHigh,          SSP2,            NA,       chemicals,          1
-SSP2IndiaHigh,          SSP2,            NA,       steel_primary,      1
-SSP2IndiaHigh,          SSP2,            NA,       steel_secondary,    1
-SSP2IndiaHigh,          SSP2,            NA,       otherInd,           1
+SSP2IndiaMedium,        SSP2,            NA,       cement,            1
+SSP2IndiaMedium,        SSP2,            NA,       chemicals,         1
+SSP2IndiaMedium,        SSP2,            NA,       steel_primary,     1
+SSP2IndiaMedium,        SSP2,            NA,       steel_secondary,   1
+SSP2IndiaMedium,        SSP2,            NA,       otherInd,          1
+SSP2IndiaHigh,          SSP2,            NA,       cement,            1
+SSP2IndiaHigh,          SSP2,            NA,       chemicals,         1
+SSP2IndiaHigh,          SSP2,            NA,       steel_primary,     1
+SSP2IndiaHigh,          SSP2,            NA,       steel_secondary,   1
+SSP2IndiaHigh,          SSP2,            NA,       otherInd,          1