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

changed SEALS reporting and underlying function #629

Merged
merged 2 commits into from
Feb 20, 2024
Merged

changed SEALS reporting and underlying function #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d47d7cb
changed SEALS reporting and underlying function
pvjeetze Feb 19, 2024
8934a35
changelog
pvjeetze Feb 19, 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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- **scenario_config.csv** settings for cfg$gms$s35_secdf_distribution in `ForestryEndo` and `ForestryExo` changed from `2` to `0`
- **scenario_config.csv** removed erroneous setting `cc` from column `input`
- **default.cfg** update default `cfg$gms$c56_pollutant_prices` and `cfg$gms$c60_2ndgen_biodem` to `R32M46-SSP2EU-NPi`
- **default.cfg** update input data to rev 4.96
- **default.cfg** update input data to rev 4.96
- **default.cfg** changed default for `cfg$gms$s56_buffer_aff` from 0.2 to 0.5
- **default.cfg** changed default for `cfg$gms$s32_aff_prot` from 0 to 1
- **21_trade** s21_trade_bal_damper for roundwood changed from 0.75 to 0.65
Expand All @@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- **58_peatland** removed realization "on"

### fixed
- **scripts** Fixed writing of NetCDF files in output/reportMAgPIE2SEALS.R
- **scripts** Fixed disaggregation.R and disaggregation_LUH2.R to be used with 67k
- **scripts** bugfix highres.R for bioenergy demand and GHG prices in coupled runs
- **35_natveg** bugfixes ac_est
Expand Down
4 changes: 2 additions & 2 deletions scripts/output/extra/reportMAgPIE2SEALS.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ title <- cfg$title

# Restructure data to conform to SEALS
reportLandUseForSEALS(
magCellLand = "cell.land_0.5_share.nc",
magCellLand = "cell.land_0.5_share.mz",
outFile = paste0("cell.land_0.5_SEALS_", title, ".nc"),
dir = outputdir, selectyears = c(2015, 2020, 2025, 2030, 2035, 2040, 2045, 2050)
dir = outputdir, selectyears = c(2020, 2030, 2040, 2050)
)
Loading