From d47d7cb3c68e9280d4d0bd36e59680f644a654ee Mon Sep 17 00:00:00 2001 From: pvjeetze Date: Mon, 19 Feb 2024 16:38:43 +0100 Subject: [PATCH 1/2] changed SEALS reporting and underlying function --- scripts/output/extra/reportMAgPIE2SEALS.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/output/extra/reportMAgPIE2SEALS.R b/scripts/output/extra/reportMAgPIE2SEALS.R index 9045995e17..437b86a1d4 100644 --- a/scripts/output/extra/reportMAgPIE2SEALS.R +++ b/scripts/output/extra/reportMAgPIE2SEALS.R @@ -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) ) From 8934a353d4e9b47a10e218e5896d387290d09d36 Mon Sep 17 00:00:00 2001 From: pvjeetze Date: Mon, 19 Feb 2024 16:45:34 +0100 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa8d7dd03c..69e3616681 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 @@ -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