Skip to content

Commit

Permalink
some typos
Browse files Browse the repository at this point in the history
  • Loading branch information
orichters committed Mar 18, 2024
1 parent 8be7659 commit a17d4d0
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
[[#1429](https://github.com/remindmodel/remind/pull/1429), [#1476](https://github.com/remindmodel/remind/pull/1476)]
- **scripts** '--test' mode for start.R and start_bundle_coupled.R does not write RData files anymore
[[#1500](https://github.com/remindmodel/remind/pull/1500)]
- prevent tradtional biomass spillover to other sectors than buildings
- prevent traditional biomass spillover to other sectors than buildings
[[#1519](https://github.com/remindmodel/remind/pull/1519)]
- fully fix landuse and MAGICC6 variables in delayed transition runs to reference run
[[#1565](https://github.com/remindmodel/remind/pull/1565)]
Expand Down
10 changes: 5 additions & 5 deletions main.gms
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ parameter
cm_LimRock = 1000; !! def = 1000
*'
parameter
cm_expoLinear_yearStart "time at which carbon price increases lineraly instead of exponentially"
cm_expoLinear_yearStart "time at which carbon price increases linearly instead of exponentially"
;
cm_expoLinear_yearStart = 2050; !! def = 2050
*'
Expand Down Expand Up @@ -1004,7 +1004,7 @@ parameter
*' This switch only has an effect if the flexibility tax is on by cm_flex_tax set to 1
*' Default value is based on data from German Langfristszenarien (see ./modules/32_power/IntC/datainput.gms).
parameter
cm_FlexTaxFeedback "switch deciding whether flexibility tax feedback on buildlings and industry electricity prices is on"
cm_FlexTaxFeedback "switch deciding whether flexibility tax feedback on buildings and industry electricity prices is on"
;
cm_FlexTaxFeedback = 0; !! def = 0 !! regexp = 0|1
*' cm_FlexTaxFeedback, switches on feedback of flexibility tax on buildings and industry.
Expand Down Expand Up @@ -1095,12 +1095,12 @@ parameter
*' * (any other number) limit of gas demand from 2025 on in Germany in EJ/yr
*'
parameter
c_SlackMultiplier "Muliplicative factor to up/downscale the slack size for v_changeProdStartyearSlack"
c_SlackMultiplier "Multiplicative factor to up/downscale the slack size for v_changeProdStartyearSlack"
;
c_SlackMultiplier = 1; !! def = 1
*'
parameter
c_changeProdCost "Muliplicative factor to up/downscale the costs for vm_changeProdStartyearCost"
c_changeProdCost "Multiplicative factor to up/downscale the costs for vm_changeProdStartyearCost"
;
c_changeProdCost = 5; !! def = 5
*'
Expand Down Expand Up @@ -1400,7 +1400,7 @@ $setGlobal cm_EnSecScen_price off !! def off
$setGlobal cm_indstExogScen off !! def off
*** cm_exogDem_scen
*** switch to fix FE or ES demand represented in CES function to trajectories
*** from exgenous sources (not EDGE models) given in file p47_exogDemScen.
*** from exogenous sources (not EDGE models) given in file p47_exogDemScen.
*** This switch fixes demand without recalibration of REMIND CES parameters.
*** This should be kept in mind when comparing those runs to baseline runs without fixing
*** as the fixing shifts the CES function away from its optimal point based on the CES parameters used.
Expand Down
1 change: 0 additions & 1 deletion modules/21_tax/off/not_used.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions standalone/MOFEX/MOFEX.gms
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ cm_iterative_target_adj "whether or not a tax or a budget target should be itera
cm_gdximport_target "whether or not the starting value for iteratively adjusted budgets, tax scenarios, or forcing targets (emiscen 5,6,8,9) should be read in from the input.gdx"
cm_gs_ew "grain size (for enhanced weathering, CDR module) [micrometre]"
cm_LimRock "limit amount of rock spread each year [Gt]"
cm_expoLinear_yearStart "time at which carbon price increases lineraly instead of exponentially"
cm_expoLinear_yearStart "time at which carbon price increases linearly instead of exponentially"

c_budgetCO2FFI "carbon budget for CO2 emissions from FFI (in GtCO2)"
c_abtrdy "first year in which advanced bio-energy technology are ready (unit is year; e.g. 2050)"
Expand Down Expand Up @@ -200,7 +200,7 @@ cm_bioprod_histlim "regional parameter to limit biomass (pebiolc.1) production
cm_flex_tax "switch for enabling flexibility tax"
cm_H2targets "switches on capacity targets for electrolysis in NDC techpol following national Hydrogen Strategies"
cm_PriceDurSlope_elh2 "slope of price duration curve of electrolysis"
cm_FlexTaxFeedback "switch deciding whether flexibility tax feedback on buildlings and industry electricity prices is on"
cm_FlexTaxFeedback "switch deciding whether flexibility tax feedback on buildings and industry electricity prices is on"
cm_VRE_supply_assumptions "default (0), optimistic (1), sombre (2), or bleak (3) assumptions on VRE supply"
cm_build_H2costAddH2Inv "additional h2 distribution costs for low diffusion levels (default value: 6.5$/ 100 /Kwh)"
cm_build_H2costDecayStart "simplified logistic function end of full value (ex. 5% -> between 0 and 5% the function will have the value 1). [%]"
Expand Down
2 changes: 1 addition & 1 deletion standalone/template.gms
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ cm_iterative_target_adj "whether or not a tax or a budget target should be itera
cm_gdximport_target "whether or not the starting value for iteratively adjusted budgets, tax scenarios, or forcing targets (emiscen 5,6,8,9) should be read in from the input.gdx"
cm_gs_ew "grain size (for enhanced weathering, CDR module) [micrometre]"
cm_LimRock "limit amount of rock spread each year [Gt]"
cm_expoLinear_yearStart "time at which carbon price increases lineraly instead of exponentially"
cm_expoLinear_yearStart "time at which carbon price increases linearly instead of exponentially"

c_budgetCO2FFI "carbon budget for CO2 emissions from FFI (in GtCO2)"
c_abtrdy "first year in which advanced bio-energy technology are ready (unit is year; e.g. 2050)"
Expand Down
4 changes: 2 additions & 2 deletions standalone/trade/trade.gms
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ cm_iterative_target_adj "whether or not a tax or a budget target should be itera
cm_gdximport_target "whether or not the starting value for iteratively adjusted budgets, tax scenarios, or forcing targets (emiscen 5,6,8,9) should be read in from the input.gdx"
cm_gs_ew "grain size (for enhanced weathering, CDR module) [micrometre]"
cm_LimRock "limit amount of rock spread each year [Gt]"
cm_expoLinear_yearStart "time at which carbon price increases lineraly instead of exponentially"
cm_expoLinear_yearStart "time at which carbon price increases linearly instead of exponentially"

c_budgetCO2FFI "carbon budget for CO2 emissions from FFI (in GtCO2)"
c_abtrdy "first year in which advanced bio-energy technology are ready (unit is year; e.g. 2050)"
Expand Down Expand Up @@ -204,7 +204,7 @@ cm_bioprod_histlim "regional parameter to limit biomass (pebiolc.1) production
cm_flex_tax "switch for enabling flexibility tax"
cm_H2targets "switches on capacity targets for electrolysis in NDC techpol following national Hydrogen Strategies"
cm_PriceDurSlope_elh2 "slope of price duration curve of electrolysis"
cm_FlexTaxFeedback "switch deciding whether flexibility tax feedback on buildlings and industry electricity prices is on"
cm_FlexTaxFeedback "switch deciding whether flexibility tax feedback on buildings and industry electricity prices is on"
cm_VRE_supply_assumptions "default (0), optimistic (1), sombre (2), or bleak (3) assumptions on VRE supply"
cm_build_H2costAddH2Inv "additional h2 distribution costs for low diffusion levels (default value: 6.5$/ 100 /Kwh)"
cm_build_H2costDecayStart "simplified logistic function end of full value (ex. 5% -> between 0 and 5% the function will have the value 1). [%]"
Expand Down

0 comments on commit a17d4d0

Please sign in to comment.