fix merge conflicts

magpiemodel · Sep 18, 2024 · 5051b82 · 5051b82
1 parent 65db837
commit 5051b82
Showing 1 changed file with 0 additions and 35 deletions.
diff --git a/scripts/start/projects/project_EAT2p0.R b/scripts/start/projects/project_EAT2p0.R
@@ -192,16 +192,6 @@ cfg <- bau(cfg = cfg)
 cfg <- waste(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
 
-# BAU_RCP26 #
-# Decomposition Scenario. Apply lower climate impacts based on RCP 2.6 to BAU
-cfg$title <- "BAU_RCP26"
-# standard setting
-cfg <- setScenario(cfg, c("cc", "SSP2", "NPI"))
-cfg <- setScenario(cfg, c("EL2_default"), scenario_config = "config/projects/scenario_config_el2.csv")
-# scenario settings
-cfg <- bau(cfg = cfg)
-start_run(cfg, codeCheck = FALSE)
-
 # BAU_NoCC #
 # Decomposition scenario. Remove climate impacts (NoCC) from BAU to isolate climate effects
 cfg$title <- "BAU_NoCC"
@@ -214,17 +204,6 @@ cfg <- bau(cfg = cfg)
 cfg$gms$labor_prod <- "off"
 start_run(cfg, codeCheck = FALSE)
 
-# BAU_MITI #
-# Decomposition Scenario. Adds mitigation and land-use policies consistent with 1.5C by 2050 to BAU
-cfg$title <- "BAU_MITI"
-# standard setting, but with NDC activated (for miti)
-cfg <- setScenario(cfg, c("cc", "SSP2", "NDC"))
-cfg <- setScenario(cfg, c("EL2_default"), scenario_config = "config/projects/scenario_config_el2.csv")
-# scenario settings
-cfg <- bau(cfg = cfg)
-cfg <- miti(cfg = cfg)
-start_run(cfg, codeCheck = FALSE)
-
 # EL2 #
 # Full EAT-Lancet Scenario (diet, productivity, FLW) without mitigation and higher climate impacts based on RCP 7.0
 cfg$title <- "EL2"
@@ -291,20 +270,6 @@ cfg <- diet(cfg = cfg)
 cfg <- prod(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
 
-# ELM_RCP70 #
-# Decomposition Scenario. Applies RCP 7.0 climate impacts to ELM
-cfg$title <- "ELM_RCP70"
-# standard setting, but with NDC activated (for miti)
-cfg <- setScenario(cfg, c("cc", "SSP2", "NDC"))
-cfg <- setScenario(cfg, c("EL2_default"), scenario_config = "config/projects/scenario_config_el2.csv")
-# scenario settings
-cfg <- bau(cfg = cfg)
-cfg <- miti(cfg = cfg)
-cfg <- diet(cfg = cfg)
-cfg <- prod(cfg = cfg)
-cfg <- waste(cfg = cfg)
-start_run(cfg, codeCheck = FALSE)
-
 # ELM_NoCC #
 # Decomposition Scenario. Removes climate impacts (NoCC) from ELM
 cfg$title <- "ELM_NoCC"