diff --git a/CHANGELOG.md b/CHANGELOG.md index 99fe45d58..50992afad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,13 +17,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### added - **29_cropland** new module `29_cropland` accounting for crop area, fallow cropland and tree cover on cropland with two realizations: `detail_apr24` and `simple_apr24` (default). - **10_land** added interface `pm_land_hist` with historic land use patterns -- **32_forestry** added technical balance term `v32_land_missing_ndc` ### removed -- +- **32_forestry** removed technical balance term `v32_land_missing_ndc` ### fixed -- +- **22_land_conservation** avoid infeasibilities due to very small numbers, account for cropland tree cover and lower bound of cropland + ## [4.8.0] - 2024-06-10 diff --git a/config/default.cfg b/config/default.cfg index 73aac6eb8..9593e25f2 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -175,7 +175,7 @@ oecd90andEU <- "ALB,AUS,AUT,BEL,BIH,BGR,CAN,CYP,CZE,DNK,EST,FIN,FRA, NLD,NOR,NZL,POL,PRT,ROU,SRB,SVK,SVN,ESP,SWE,CHE,MKD,TUR, GBR,USA" -EUR <- "ALB,AUT,BEL,BGR,CYP,CZE,DEU,DNK,ESP,EST,FIN,FRA,FRO, +isoCountriesEUR <- "ALB,AUT,BEL,BGR,CYP,CZE,DEU,DNK,ESP,EST,FIN,FRA,FRO, GBR,GGY,GIB,GRC,HRV,HUN,IMN,IRL,ITA,JEY,LTU,LUX,LVA,MLT, NLD,POL,PRT,ROU,SVK,SVN,SWE"