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.

Sign up for GitHub

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

bugfix fader GHG emission pricing policy and Sync of NPI and NDC policies to 2025 #755

Merged
merged 12 commits into from
Dec 3, 2024
+156 −144
Merged

bugfix fader GHG emission pricing policy and Sync of NPI and NDC policies to 2025 #755

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c49c11f
bugfix fader
flohump Nov 29, 2024
c0d3d3f
update fader default
flohump Nov 29, 2024
711f9c2
update magpie4 version
flohump Dec 2, 2024
9340349
bugfix timber config
flohump Dec 2, 2024
2f1efb9
Update default.cfg
mishkos Dec 2, 2024
adc36cc
Update start_npi_ndc.R
mishkos Dec 2, 2024
9e79cb7
Update CHANGELOG.md
mishkos Dec 2, 2024
87428b9
additional_data_rev4.59.tgz
flohump Dec 2, 2024
41624b5
bugfix vm_carbon_stock.l in equations
flohump Dec 2, 2024
f5e1215
renamed _country_dummy to _country_switch in all modules
flohump Dec 2, 2024
93ef0e9
renamed _country_dummy to _country_switch in all modules
flohump Dec 2, 2024
e2e6481
add source
flohump Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- **10_land** Simplified land transition matrix for improved feasibility
- **44_biodiversity** bugfix biorealm_biome.cs3 in input data (shares did not add-up to 1)
- **config** additional data increased to `additional_data_rev4.58.tgz` which fixes missing gdp2017 conversions in f20_processing_unitcosts
- **56_ghg_policy** Fader for GHG emission pricing policy

## [4.8.2] - 2024-09-24

Expand Down
4 changes: 2 additions & 2 deletions modules/56_ghg_policy/price_aug22/preloop.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ im_pollutant_prices(t_all,i,"co2_c",emis_source) = im_pollutant_prices(t_all,i,"
im_pollutant_prices(t_all,i,pollutants,emis_source)$(s56_ghgprice_devstate_scaling = 1) = im_pollutant_prices(t_all,i,pollutants,emis_source)*im_development_state(t_all,i);

if (s56_fader_functional_form = 1,
m_linear_time_interpol(p56_fader,s56_fader_start,s56_fader_target,0,s56_fader_target);
m_linear_time_interpol(p56_fader,s56_fader_start,s56_fader_end,0,s56_fader_target);
elseif s56_fader_functional_form = 2,
m_sigmoid_time_interpol(p56_fader,s56_fader_start,s56_fader_target,0,s56_fader_target);
m_sigmoid_time_interpol(p56_fader,s56_fader_start,s56_fader_end,0,s56_fader_target);
);

***build and apply temporal fader for GHG policy
Expand Down