Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

shift unit from US$2005 to US$2017 #1812

Merged
merged 47 commits into from
Sep 23, 2024

Conversation

LaviniaBaumstark
Copy link
Member

@LaviniaBaumstark LaviniaBaumstark commented Sep 5, 2024

Purpose of this PR

Shift the unit of all monatary parameters and variables in REMIND to a new unit (i.e. form $US2005 to US$2017).
Most of the changes happened in the input data generation and therefore a new input data revision and minimum R-package versions are required.
Where hard coded monetary values are used in GAMS, conversion factors are introduced: s_D2015_2_D2017, sm_D2005_2_D2017, sm_D2020_2_D2017, sm_EURO2023_2_D2017

Type of change

  • Refactoring

Checklist:

  • My code follows the coding etiquette
  • I performed a self-review of my own code
  • I adjusted the reporting in remind2 where it was needed
  • All (except testing that validation data exist) automated model tests pass (FAIL 0 in the output of make test)
  • The changelog CHANGELOG.md has been updated correctly

Further information (optional):

  • Test runs are here:
  • Comparison of results (what changes by this PR?):

…GDPaPOPaSSP2

convert p36_CESMkup and pm_tau_pe_tax from 2005$US to 2017$US and delete p21_tau_pe2se_inconv
Copy link
Contributor

@gabriel-abrahao gabriel-abrahao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The MACCs conversion looks right to me, pending @fbenke-pik 's removal of the incorrect conversion in the updated mrcommons::convertImageMacc().

Copy link
Contributor

@orichters orichters left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked the changed, added some witty comments. I cannot find any obvious reason or errors. So maybe it is in the parts that you haven't touched?

@@ -605,9 +597,12 @@ s_MtCO2_2_GtC "conversion factor from Mt

s_MtCH4_2_TWa "Energy content of methane. MtCH4 --> TWa: 1 MtCH4 = 1.23 * 10^6 toe * 42 GJ/toe * 10^-9 EJ/GJ * 1 TWa/31.536 EJ = 0.001638 TWa (BP statistical review)" /0.001638/

sm_h2kg_2_h2kWh "convert kilogramme of hydrogen to kwh energy value." /32.5/
s_D2015_2_D2017 "Convert $2015 to $2017" /1.0292/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, a new type style, as USD, US$, US, USD_ and EUR, EUR_ used in our output files were not enough 🥳

p02_inconvpen_lap(ttot,regi,te)$(ttot.val ge 2005) = p02_inconvpen_lap(ttot,regi,te) * 4.3 * 1E-4; !! this is now equivalent to 1$/GJ at 1000$/per Capita in the welfare logarithm
p02_inconvpen_lap(ttot,regi,te)$(ttot.val ge 2005) = p02_inconvpen_lap(ttot,regi,te) * (1/sm_giga_2_non) / sm_GJ_2_TWa; !! conversion util/(GJ/cap) -> util/(TWa/Gcap)
*RP* these values are all calculated on seprod level.
display p02_inconvpen_lap;
$ENDIF.INCONV

*BS* 2020-03-12: additional inputs for inequality
* To Do: rename file, then also in "files" and moinput::fullREMIND.R
*** To Do: rename file, then also in "files" and moinput::fullREMIND.R
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great you adjusted the Todo that refers to some moinput package that I have never heard of.

@@ -115,20 +104,7 @@ $ifThen.SEtaxRampUpParam not "%cm_SEtaxRampUpParam%" == "off"
);
$endif.SEtaxRampUpParam

***cb 20110923 load paths for ressource export taxes
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that option was just deleted?

@@ -83,19 +83,6 @@ p32_shThresholdTotVREAddIntCost(t)$(t.val > 2045) = 95;

p32_FactorAddIntCostTotVRE = 1.5;

$ontext
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what was the purpose of that code, anyway?

modules/35_transport/edge_esm/presolve.gms Show resolved Hide resolved
@LaviniaBaumstark LaviniaBaumstark changed the title shift unit for US$2005 to US$2017 shift unit from US$2005 to US$2017 Sep 21, 2024
@LaviniaBaumstark LaviniaBaumstark marked this pull request as ready for review September 21, 2024 09:03
…SSP1, SDP_MC, SSP2_lowEn and SSP5 (calibration runs: /p/tmp/lavinia/REMIND/REMIND_calibration_unitShift_2024_09_21/remind)
@LaviniaBaumstark LaviniaBaumstark merged commit 29c8771 into remindmodel:develop Sep 23, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants