Merge pull request #1621 from orichters/ndc

adjust NPi carbon price settings
remindmodel · Mar 18, 2024 · dcc3a54 · dcc3a54
2 parents f17b388 + 5bd2c18
commit dcc3a54
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 38 deletions.
diff --git a/core/datainput.gms b/core/datainput.gms
@@ -1308,9 +1308,22 @@ if(c_macscen eq 1,
 *pm_macCostSwitch(enty)=pm_macSwitch(enty);
 
 *** for NDC and NPi switch off landuse MACs
+$if %carbonprice% == "off"      pm_macSwitch(emiMacMagpie) = 0;
 $if %carbonprice% == "NDC"      pm_macSwitch(emiMacMagpie) = 0;
 $if %carbonprice% == "NPi"      pm_macSwitch(emiMacMagpie) = 0;
 
+*** Load historical carbon prices defined in $/t CO2, need to be rescaled to right unit
+pm_taxCO2eq(t,regi)$(t.val le 2020) = 0;
+parameter f_taxCO2eqHist(ttot,all_regi)       "historic CO2 prices ($/tCO2)"
+/
+$ondelim
+$include "./core/input/pm_taxCO2eqHist.cs4r"
+$offdelim
+/
+;
+pm_taxCO2eq(t,regi)$(t.val le 2020) = f_taxCO2eqHist(t,regi) * sm_DptCO2_2_TDpGtC;
+
+
 *DK* LU emissions are abated in MAgPIE in coupling mode
 *** An alternative to the approach below could be to introduce a new value for c_macswitch that only deactivates the LU MACs
 $if %cm_MAgPIE_coupling% == "on"  pm_macSwitch(enty)$emiMacMagpie(enty) = 0;

diff --git a/core/input/files b/core/input/files
@@ -45,3 +45,4 @@ p_regi_2_MAGICC_regions.cs3r
 p_share_ind_fehos.cs4r
 p_share_ind_fesos_bio.cs4r
 p_share_ind_fesos.cs4r
+pm_taxCO2eqHist.cs4r
diff --git a/modules/21_tax/off/not_used.txt b/modules/21_tax/off/not_used.txt
@@ -51,7 +51,6 @@ pm_pvp,input,questionnaire
 pm_taxemiMkt,input,questionnaire
 pm_taxemiMkt_iteration,input,questionnaire
 vm_Mport,input,questionnaire
-vm_deltaCap, variable, ???
 sm_TWa_2_MWh,input,questionnaire
 vm_emiCO2Sector,input,questionnaire
 pm_taxCO2eqSum,input,questionnare

diff --git a/modules/45_carbonprice/NDC/datainput.gms b/modules/45_carbonprice/NDC/datainput.gms
@@ -11,16 +11,6 @@ Execute_Loadpoint "input_ref" p45_taxCO2eq_bau = pm_taxCO2eq;
 
 pm_taxCO2eq(t,regi) = p45_taxCO2eq_bau(t,regi)
 
-*** Carbon prices defined in $/t CO2, has to be rescaled to right unit
-parameter f45_taxCO2eqHist(ttot,all_regi)       "historic CO2 prices ($/tCO2)"
-/
-$ondelim
-$include "./modules/45_carbonprice/NDC/input/pm_taxCO2eqHist.cs4r"
-$offdelim
-/
-;
-pm_taxCO2eq(t,regi)$(t.val < 2025) = f45_taxCO2eqHist(t,regi) * sm_DptCO2_2_TDpGtC;
-
 *** parameters for exponential increase after NDC targets
 Scalar p45_taxCO2eqGlobal2030 "startprice in 2030 (unit TDpGtC) of global CO2eq taxes towards which countries converge";
 p45_taxCO2eqGlobal2030 = 30 * sm_DptCO2_2_TDpGtC;

diff --git a/modules/45_carbonprice/NDC/input/files b/modules/45_carbonprice/NDC/input/files
@@ -1,4 +1,3 @@
 fm_2005shareTarget.cs3r
 fm_factorTargetyear.cs3r
 fm_histShare.cs3r
-pm_taxCO2eqHist.cs4r
diff --git a/modules/45_carbonprice/NPi/datainput.gms b/modules/45_carbonprice/NPi/datainput.gms
@@ -6,34 +6,19 @@
 *** |  Contact: [email protected]
 *** SOF ./modules/45_carbonprice/NPi/datainput.gms
 
-pm_taxCO2eq(ttot,regi)$(ttot.val lt 2020) = 0;
+*** Historic data including year 2020 is read in core/datainput.gms
 
-*** Carbon prices defined in $/t CO2, will be rescaled to right unit at the end of this file
-
-parameter f45_taxCO2eqHist(ttot,all_regi)       "historic CO2 prices ($/tCO2)"
-/
-$ondelim
-$include "./modules/45_carbonprice/NPi/input/pm_taxCO2eqHist.cs4r"
-$offdelim
-/
-;
-
-pm_taxCO2eq(t,regi)$(t.val < 2025) = f45_taxCO2eqHist(t,regi);
-
-*** convergence scheme post 2020: parabolic convergence up to 40$/tCO2 in the convergence year (here chosen as 2070) and then linear increase of 2$/year afterwards
-pm_taxCO2eq(ttot,regi)$( (ttot.val ge 2025) AND (ttot.val le 2070)) =
+*** convergence scheme post 2020: parabolic convergence up to 25$/tCO2 in the convergence year (here chosen as 2100) and then constant
+pm_taxCO2eq(ttot,regi)$( (ttot.val ge 2025) AND (ttot.val le 2100)) =
   pm_taxCO2eq("2020",regi) 
   + ( 
-      ( 40 - pm_taxCO2eq("2020",regi) ) 
+      ( 25 * sm_DptCO2_2_TDpGtC - pm_taxCO2eq("2020",regi) )
       * ( 
-          (ttot.val - 2020) / (2070 - 2020) 
+          (ttot.val - 2020) / (2100 - 2020)
         ) ** 2 
     )
 ;
-pm_taxCO2eq(ttot,regi)$(ttot.val gt 2070) = pm_taxCO2eq("2070",regi) + (ttot.val - 2070) * 0.5;
-
-*** rescale everything to $/t CO2
-pm_taxCO2eq(ttot,regi) = pm_taxCO2eq(ttot,regi) * sm_DptCO2_2_TDpGtC;
+pm_taxCO2eq(ttot,regi)$(ttot.val gt 2100) = pm_taxCO2eq("2100",regi);
 
 display pm_taxCO2eq;
 

diff --git a/modules/45_carbonprice/NPi/input/files b/modules/45_carbonprice/NPi/input/files
diff --git a/tutorials/02_RunningREMIND.md b/tutorials/02_RunningREMIND.md
@@ -92,12 +92,12 @@ sq
 ```
 in the terminal.
 
-To see how far your run is or whether it was stopped due to some problems, go to the `output` folder and type
-
+To see how far your run is or whether it was stopped due to some problems, you can check based on the output folder (shown as `WORK_DIR` in `sq`) by typing
 ``` bash
-rs2
+remindstatus output/default_2024-02-29_16.45.19
 ```
-in the console. For more commands to manage your runs, type **piaminfo**.
+in the console. If you are in the folder, `remindstatus` is sufficient.
+For a short version, use `rs2` (see help at `rs2 -h`). For more commands to manage your runs, type `piaminfo`.
 
 NOTE: A few words on the scripts that we currently use to start runs. The scripts containing the string 'start' have a double functionality:
 - they submit the run to the cluster or to your GAMS system if you work locally