diff --git a/.Rbuildignore b/.Rbuildignore new file mode 100644 index 0000000000..9914e75a4b --- /dev/null +++ b/.Rbuildignore @@ -0,0 +1,3 @@ +^renv$ +^renv\.lock$ +^.*\.zenodo.json$ diff --git a/.Rprofile b/.Rprofile index 01c62074c4..6dc7bf9e63 100644 --- a/.Rprofile +++ b/.Rprofile @@ -1,23 +1,33 @@ -# source global .Rprofile (very important to load user specific settings) -# DO NOT EDIT THIS LINE! -if(file.exists("~/.Rprofile")) source("~/.Rprofile") +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) +# | authors, and contributors see CITATION.cff file. This file is part +# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of +# | AGPL-3.0, you are granted additional permissions described in the +# | MAgPIE License Exception, version 1.0 (see LICENSE file). +# | Contact: magpie@pik-potsdam.de +Sys.setenv(RENV_PATHS_LIBRARY = "renv/library") + +source("renv/activate.R") +if (!"https://rse.pik-potsdam.de/r/packages" %in% getOption("repos")) { + options(repos = c(getOption("repos"), pik = "https://rse.pik-potsdam.de/r/packages")) +} -# This profile can be used to link the model to a specified library snapshot -# (e.g. if your model version is from an older date and does not work with the -# newest libraries anymore) -# By default it is not active. Just uncomment the following lines and set the -# snapshot path to a path of your choice -# Please make also sure that in your config file this .Rprofile file is copied -# to the model output folder. Otherwise, the run itself will again use the -# default library set! +# bootstrapping, will only run once after this repo is freshly cloned +if (isTRUE(rownames(installed.packages(priority = "NA")) == "renv")) { + if (file.exists("DESCRIPTION") && !identical(readLines("DESCRIPTION"), readLines("DEPENDENCIES"))) { + warning("Unexpected DESCRIPTION file found, try removing it. Will not install dependencies.") + } else { + message("R package dependencies are not installed in this renv, installing now...") + renv::install("yaml", prompt = FALSE) # yaml is required to find dependencies in Rmd files + # renv will only consider a file called DESCRIPTION, so rename DEPENDENCIES + file.copy("DEPENDENCIES", "DESCRIPTION") + renv::hydrate() # auto-detect and install all dependencies + file.remove("DESCRIPTION") + message("Finished installing R package dependencies.") + } +} -# PLEASE NOTE: snapshots ending with '_R4' require R 4.1 (piam/1.24 and newer), -# other snapshots require R 3.6 (piam/1.20) -# snapshot <- "/p/projects/rd3mod/R/libraries/snapshots/2020_03_10" -# if(file.exists(snapshot)) { -# cat("Setting libPaths to",snapshot,"\n") -# .libPaths(snapshot) -# } else { -# cat("Could not find",snapshot,"\n") -# } +# source global .Rprofile (very important to load user specific settings) +if (file.exists("~/.Rprofile")) { + source("~/.Rprofile") +} diff --git a/.github/workflows/test-code.yaml b/.github/workflows/test-code.yaml index af57b9ec24..cad05908ee 100644 --- a/.github/workflows/test-code.yaml +++ b/.github/workflows/test-code.yaml @@ -9,41 +9,30 @@ on: - main - master - develop - + name: check jobs: check: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2 - - uses: r-lib/actions/setup-r@v1 - - - name: Query dependencies - run: | - saveRDS("gms", ".github/depends.Rds", version = 2) - writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version") - shell: Rscript {0} + - name: Remove .Rprofile + run: rm .Rprofile - - name: Cache R packages - uses: actions/cache@v2 + - uses: r-lib/actions/setup-r@v2 with: - path: ${{ env.R_LIBS_USER }} - key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }} - restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1- + extra-repositories: https://cloud.r-project.org https://rse.pik-potsdam.de/r/packages/ - name: Install R dependencies - run: | - repos <- c("https://cloud.r-project.org","https://rse.pik-potsdam.de/r/packages/") - install.packages(c("remotes"), repos=repos) - remotes::install_cran("gms", repos=repos) - shell: Rscript {0} - + uses: r-lib/actions/setup-r-dependencies@v2 + with: + packages: gms + extra-packages: gms + - name: pre-commit Hook run: source(".githooks/pre-commit") shell: Rscript {0} - - diff --git a/.gitignore b/.gitignore index fcddbfed40..ad2f6b223b 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,5 @@ gamslice.txt #ignore lock file /.lock + +/renv.lock diff --git a/.lintr b/.lintr new file mode 100644 index 0000000000..c02af8f2f3 --- /dev/null +++ b/.lintr @@ -0,0 +1,2 @@ +linters: lucode2::lintrRules() +encoding: "UTF-8" diff --git a/.snapshot.Rprofile b/.snapshot.Rprofile new file mode 100644 index 0000000000..cb4dc70c79 --- /dev/null +++ b/.snapshot.Rprofile @@ -0,0 +1,23 @@ +# source global .Rprofile (very important to load user specific settings) +# DO NOT EDIT THIS LINE! +if(file.exists("~/.Rprofile")) source("~/.Rprofile") + + +# This profile can be used to link the model to a specified library snapshot +# (e.g. if your model version is from an older date and does not work with the +# newest libraries anymore). +# By default it is not active. Just uncomment the following lines and set the +# snapshot path to a path of your choice. +# Please make also sure that in your config file this .Rprofile file is copied +# to the model output folder. Otherwise, the run itself will again use the +# default library set! + +# PLEASE NOTE: snapshots ending with '_R4' require R 4.1 (piam/1.24 and newer), +# other snapshots require R 3.6 (piam/1.20) +# snapshot <- "/p/projects/rd3mod/R/libraries/snapshots/2022_10_28_R4" +# if(file.exists(snapshot)) { +# cat("Setting libPaths to",snapshot,"\n") +# .libPaths(snapshot, include.site = FALSE) +# } else { +# cat("Could not find",snapshot,"\n") +# } diff --git a/.zenodo.json b/.zenodo.json index 3b6e8560b8..0ebe1d84ee 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -1,6 +1,6 @@ { "title": "MAgPIE - An Open Source land-use modeling framework", - "version": "4.6.1dev", + "version": "4.6.2dev", "creators": [ { "name": "Dietrich, Jan Philipp", @@ -109,5 +109,5 @@ "license": { "id": "AGPL-3.0-or-later" }, - "publication_date": "2022-12-13" + "publication_date": "2023-01-12" } diff --git a/CHANGELOG.md b/CHANGELOG.md index f3cba2859c..faf772f1ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,17 +5,22 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + ## [Unreleased] ### changed -- **36_employment** include labor costs from MACCs in employment -- **57_maccs** split costs into labor and capital -- **38_factor_cots** renamed `p36_cost_shares` to `pm_cost_share_crops` -- **config** scenario_fsec.csv update -- **scripts** FSDP_collect FSDP_process fsec.R updates +- **config** update input data to rev4.79 +- **config** and **38_factor_costs** changed name of `s38_fix_capital_need` to `s38_startyear_labor_substitution` +- **config** added `s38_target_labor_share`, `s38_targetyear_labor_share` and `s38_target_fulfillment` to define labor share target scnarios +- **38_factor_costs** changed name of set `req` to `factors` (also used in 11_costs, 57_maccs, 70_livestock) +- **38_factos_costs** sticky_labor realization: included option to set a labor share target +- **15_food** changed `anthro_iso_jun22` realisation such that results in case of `exo_diet = 1/0` and `exo_waste = 1/0` are identical until 2020 +- **62_material** Bioplastic demand identical in all scenarios until 2020 ### added -- **scripts** added output script that generates a short mif containing only variables relevant for the REMIND coupling +- **scripts** added start script which starts an empty model just regenerating a previous run +- **31_past** added additional limitation (single climate scenario input) for **grasslands_apr22** +- **59_som** added new **cellpool_jan23** realization with updated 2019 IPCC guidelines values ### removed - @@ -24,6 +29,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - +## [4.6.2] - 2023-01-12 + +### changed +- **36_employment** include labor costs from MACCs in employment +- **38_factor_cots** renamed `p36_cost_shares` to `pm_cost_share_crops` +- **57_maccs** split costs into labor and capital +- **config** scenario_fsec.csv update +- **config** updated SHAPE SDP scenarios in scenario_config.csv +- **scripts** FSDP_collect FSDP_process fsec.R updates + +### added +- **renv** MAgPIE now runs in an isolated, stable, reproducible R package environment +- **scripts** added output script that generates a short mif containing only variables relevant for the REMIND coupling +- **scripts** added output script that generates subnational validation outputs for fable_India projects +- **setup** required R packages are automatically installed + + ## [4.6.1] - 2022-12-13 ### changed @@ -54,6 +76,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - **config** changed default value for s56_limit_ch4_n2o_price from 1000 to 4000 for consistency with c57_macc_version = "PBL_2022" - **scripts** rewrite of land conversion cost calibration script `landconversion_cost.R` + ## [4.6.0] - 2022-11-09 ### changed @@ -222,6 +245,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - **scripts** fixed configuration error in FSEC output scripts, FSEC_dietaryIndicators.R and FSEC_environmentalPollutants.R - **scripts** scripts/start/extra/emulator.R Throw an error if no file can be found to take the GHG prices from + ## [4.4.0] - 2021-12-13 ### changed @@ -312,6 +336,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - **73_timber** plausible cost for balance variable in case of s73_timber_demand_switch = 0 to avoid cost distortion - **56_ghg_policy** choose the correct scenario for fixing the GHG prices until sm_fix_SSP2 + ## [4.3.5] - 2021-09-02 ### changed @@ -380,6 +405,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - - **15_food** single-cell protein substitution scenarios included in intersolve.gms. - **20_processing** The "mixed" scenario for single-cell protein production (c20_scp_type) was not working as expected. The corresponding code in 20_processing has been updated. + ## [4.3.3] - 2021-03-30 ### added @@ -439,6 +465,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - **32_forestry** Bugfixes for "ac_est" and carbon treshold afforestation; removed plantations from "vm_cdr_aff". - **core** bugfix m_fillmissingyears macro; was running over t before; now running over t_all_ + ## [4.3.1] - 2020-11-03 ### added @@ -477,6 +504,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - **35_natveg** Clearer calculations for harvested area for timber production. - **52_carbon** Fix to the Carbon densities received from LPJmL for timber plantations. + ## [4.2.1] - 2020-05-15 ### added @@ -494,7 +522,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - **NPI/NDC policy calculations** revision of calculation method - ## [4.2.0] - 2020-04-15 This release version is focussed on consistency between the MAgPIE setup and the [REMIND model] and result of a validation exercise of the coupled (REMIND 2.1)-(MAgPIE 4.2) system. @@ -575,6 +602,7 @@ This release version is focussed on consistency between the MAgPIE setup and the - **71_diagg_lvst** adjusted monogastric disaggregation for more flexiblity to avoid infeasibilities with EFPs (see 42_water_demand) - **15_food** correction regarding the convergence measure of the iterative execution of the food demand model and MAgPIE; correction accounting for unusual time step length in body height calculations; body height regression parameters updated + ## [4.0.1] - 2018-10-05 ### fixed @@ -586,7 +614,8 @@ This release version is focussed on consistency between the MAgPIE setup and the First open source release of the framework. See [MAgPIE 4.0 paper](https://doi.org/10.5194/gmd-12-1299-2019) for more information. -[Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.6.1...develop +[Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.6.2...develop +[4.6.2]: https://github.com/magpiemodel/magpie/compare/v4.6.1...v4.6.2 [4.6.1]: https://github.com/magpiemodel/magpie/compare/v4.6.0...v4.6.1 [4.6.0]: https://github.com/magpiemodel/magpie/compare/v4.5.0...v4.6.0 [4.5.0]: https://github.com/magpiemodel/magpie/compare/v4.4.0...v4.5.0 diff --git a/CITATION.cff b/CITATION.cff index 71fca45a4c..5466584a08 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -125,8 +125,8 @@ authors: email: popp@pik-potsdam.de title: MAgPIE - An Open Source land-use modeling framework -version: 4.6.1dev -date-released: 2022-12-13 +version: 4.6.2dev +date-released: 2023-01-12 repository-code: https://github.com/magpiemodel/magpie keywords: - landuse diff --git a/DEPENDENCIES b/DEPENDENCIES new file mode 100644 index 0000000000..bbcc45b41e --- /dev/null +++ b/DEPENDENCIES @@ -0,0 +1,38 @@ +Package: magpiemodel +Imports: + callr, + citation, + curl, + data.table, + dplyr, + gdx, + gdxrrw, + ggplot2, + ggrepel, + gms, + here, + iamc, + lucode2 (>= 0.36.0), + luplot, + luscale, + lusweave, + m4fsdp, + madrat, + magclass, + magpie4, + MagpieNCGains, + magpiesets, + mip, + mrcommons, + patchwork, + piamenv (>= 0.3.4), + quitte, + raster, + remulator, + renv, + stringr, + txtplot, + withr +Suggests: + goxygen, + qgraph diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000..8a642f040f --- /dev/null +++ b/Makefile @@ -0,0 +1,40 @@ +.PHONY: help docs update-renv update-all-renv check check-fix +.DEFAULT_GOAL := help + +# extracts the help text and formats it nicely +HELP_PARSING = 'm <- readLines("Makefile");\ + m <- grep("\#\#", m, value=TRUE);\ + command <- sub("^([^ ]*) *\#\#(.*)", "\\1", m);\ + help <- sub("^([^ ]*) *\#\#(.*)", "\\2", m);\ + cat(sprintf("%-8s%s", command, help), sep="\n")' + +help: ## Show this help. + @Rscript -e $(HELP_PARSING) + +docs: ## Generate/update model HTML documentation in the doc/ folder. + Rscript -e 'goxygen::goxygen(); warnings()' + @echo -e '\nOpen\ndoc/html/index.htm\nin your browser to view the generated documentation.' + +update-renv: ## Upgrade all pik-piam packages in your renv to the respective + ## latest release and write renv.lock to archive. + Rscript -e 'piamenv::updateRenv()' + +update-all-renv: ## Upgrade all packages (including CRAN packages) in your renv + ## to the respective latest release and write renv.lock to archive. + Rscript -e 'renv::update(exclude = "renv"); piamenv::archiveRenv()' + +archive-renv: ## Write renv.lock to archive. + Rscript -e 'piamenv::archiveRenv()' + +restore-renv: ## Restore renv to the state described in interactively + ## selected renv.lock from the archive or a run folder. + Rscript -e 'piamenv::restoreRenv()' + +check: ## Check if the GAMS code follows the coding etiquette + ## using gms::codeCheck. + Rscript -e 'invisible(gms::codeCheck(strict = TRUE))' + +check-fix: ## Check if the GAMS code follows the coding etiquette + ## and offer fixing any problems directly if possible + ## using gms::codeCheck. + Rscript -e 'invisible(gms::codeCheck(strict = TRUE, interactive = TRUE))' diff --git a/README.md b/README.md index c27f98b065..74e52fc9bf 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ https://www.pik-potsdam.de/research/projects/activities/land-use-modelling/magpi A framework description paper has been published in Geoscientific Model Development (GMD): https://doi.org/10.5194/gmd-12-1299-2019 -The model documentation for version 4.6.1 can be found at -https://rse.pik-potsdam.de/doc/magpie/4.6.1/ +The model documentation for version 4.6.2 can be found at +https://rse.pik-potsdam.de/doc/magpie/4.6.2/ A most recent version of the documentation can also be extracted from the model source code via the R package goxygen @@ -82,38 +82,11 @@ In addition *R* (https://www.r-project.org/) is required for pre- and postprocessing and run management (needs to be added to the PATH variable as well). -Some R packages are required to run MAgPIE. All are either distributed via -the offical R CRAN or via a separate repository hosted at -PIK (PIK-CRAN). Before proceeding PIK-CRAN should be added to the list of -available repositories via: -``` -options(repos = c(CRAN = "@CRAN@", pik = "https://rse.pik-potsdam.de/r/packages")) -``` - -Under Windows you need to install Rtools -(https://cran.r-project.org/bin/windows/Rtools/) and to add it to the PATH -variable. After that you can run the following lines of code: - -``` -pkgs <- c("gdxrrw", - "ggplot2", - "citation", - "curl", - "gdx", - "gms", # (>= 0.11) - "magclass", - "madrat", - "mip", - "lucode2", - "magpie4", # (>= 1.104) - "magpiesets", - "lusweave", - "luscale", - "goxygen", - "luplot", - "yaml") -install.packages(pkgs) -``` +Several R packages are required to run MAgPIE. Under Windows you first need to install +Rtools (https://cran.r-project.org/bin/windows/Rtools/) and to add it to the PATH +variable. When running R from the MAgPIE folder for the first time all +required packages are automatically installed into an isolated, +project specific R package environment (renv). For post-processing model outputs *Latex* is required (https://www.latex-project.org/get/). To be seen by the model it also needs to added to the PATH variable of your system. @@ -215,7 +188,7 @@ magpie@pik-potsdam.de Please contact magpie@pik-potsdam.de ## CITATION -See file CITATION.cff or the [How-to-Cite section](https://rse.pik-potsdam.de/doc/magpie/4.6.1/#how-to-cite) in the model documentation for information how to cite the model. +See file CITATION.cff or the [How-to-Cite section](https://rse.pik-potsdam.de/doc/magpie/4.6.2/#how-to-cite) in the model documentation for information how to cite the model. ## AUTHORS See list of authors in CITATION.cff diff --git a/config/default.cfg b/config/default.cfg index 583080352e..cf43fb7df4 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the @@ -22,11 +22,11 @@ cfg$model <- "main.gms" #def = "main.gms" #### input settings #### # which input data sets should be used? -cfg$input <- c(regional = "rev4.77_h12_magpie.tgz", - cellular = "rev4.77_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz", - validation = "rev4.77_h12_validation.tgz", +cfg$input <- c(regional = "rev4.79_h12_magpie.tgz", + cellular = "rev4.79_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz", + validation = "rev4.79_h12_validation.tgz", additional = "additional_data_rev4.36.tgz", - calibration = "calibration_H12_per_ton_fao_may22_glo_07Dec22.tgz") + calibration = "calibration_H12_09Jan23.tgz") # NOTE: It is recommended to recalibrate the model when changing cellular input data # as well as for any other setting that would affect initial values in the model, @@ -935,11 +935,25 @@ cfg$gms$factor_costs <- "per_ton_fao_may22" # default = per_ton_fao_may22 # NOTE: It is recommended to recalibrate the model when changing this setting! cfg$gms$c38_fac_req <- "glo" # default "glo" -# * Only relevant for sticky_labor implementation: scalar to determine until which year -# * the capital need (per unit of output) should be fixed to start value (i.e. not -# * allowing for substitution between labor and capital). -cfg$gms$s38_fix_capital_need <- 2020 # default 2020 +# * Only relevant for sticky_labor implementation: + +# * Year until which the capital share should be fixed to the historical values, not allowing for endogenous +# * substitution between labor and capital. +cfg$gms$s38_startyear_labor_substitution <- 2020 # default 2020 + +# * The following two settings are to create exogenous scenarios in which capital is substituted by labor to increase +# * employment: +# * The taget labor share defins a global target for labor share out of labor + capital needed per unit +# * of output. If 0, no target is set. +cfg$gms$s38_target_labor_share <- 0 # default 0 + +# * The target year defines the year for which the global target labor share should be set. +cfg$gms$s38_targetyear_labor_share <- 2050 + +# * The target fulfillment share indicates the share by which a region moves from its baseline +# * labor share towards the target value +cfg$gms$s38_target_fulfillment <- 0.5 # default 0.5 # ***--------------------- 39_landconversion ----------------------------- # * (calib): Costs for cropland expansion are scaled with a regional calibration factor @@ -1488,6 +1502,8 @@ cfg$gms$s58_fix_peatland <- 2015 # def = 2015 # ***------------------------- 59_som ------------------------------------- # * (static_jan19): static soil carbon loss for cropland # * (cellpool_aug16): dynamic soil organic matter pool on cellular level +# * (cellpool_jan23): dynamic soil organic matter pool on cellular level +# * with updated, regionalized stock change factors (IPCC guidelines 2019) cfg$gms$som <- "static_jan19" # def = static_jan19 # * static realization switch diff --git a/config/scenario_config.csv b/config/scenario_config.csv index 4dcd2f7ada..d28f508899 100644 --- a/config/scenario_config.csv +++ b/config/scenario_config.csv @@ -1,7 +1,7 @@ ;cc;nocc;nocc_hist;SSP1;SSP2;SSP3;SSP4;SSP5;SDP;SDP-EI;SDP-RC;SDP-MC;BASE;NPI;NDC;coupling;emulator;input;Tland;eat_lancet_diet;LAMA_Inequal;LAMA_Inequal-SustDemand;LAMA_Inequal-EnvirProt;LAMA_Inequal-GHGPrice;LAMA_Sustainability;NAVIGATE_AllOff;NAVIGATE_LandSup;NAVIGATE_LandDem;NAVIGATE_AllOn;ForestryEndo;ForestryExo;ForestryOff;frst_shock_none;frst_shock_002lin2030;frst_shock_004lin2030;frst_shock_008lin2030;frst_shock_016lin2030;rcp1p9;rcp2p6;rcp4p5;rcp6p0;rcp7p0;rcp8p5 gms$c09_pop_scenario;;;;SSP1;SSP2;SSP3;SSP4;SSP5;SSP1;SSP1;SSP1;SSP1;;;;;;;;;SSP4;SSP1;SSP4;SSP4;SSP1;;;;;;;;;;;;;;;;;; gms$c09_gdp_scenario;;;;SSP1;SSP2;SSP3;SSP4;SSP5;SSP1;SDP_EI;SDP_RC;SDP_MC;;;;;;;;;SSP4;SSP1;SSP4;SSP4;SSP1;;;;;;;;;;;;;;;;;; -gms$c09_pal_scenario;;;;SSP1;SSP2;SSP3;SSP4;SSP5;SSP1;SSP1;SSP1;SSP1;;;;;;;;;SSP4;SSP1;SSP4;SSP4;SSP1;;;;;;;;;;;;;;;;;; +gms$c09_pal_scenario;;;;SSP1;SSP2;SSP3;SSP4;SSP5;SSP1;SSP2;SSP1;SSP1;;;;;;;;;SSP4;SSP1;SSP4;SSP4;SSP1;;;;;;;;;;;;;;;;;; gms$c15_food_scenario;;;;SSP1;SSP2;SSP3;SSP4;SSP5;SSP1;SSP2;SSP1;SSP1;;;;;;;;SSP1;SSP4;SSP1;SSP4;SSP4;SSP1;;;;;;;;;;;;;;;;;; gms$c15_food_scenario_noselect;;;;;;;;;;;;;;;;;;;;;SSP4;SSP1;SSP4;SSP4;SSP1;;;;;;;;;;;;;;;;;; gms$s15_elastic_demand;;;;0;0;0;0;0;0;0;0;0;;;;;;;0;0;0;0;0;0;0;;;;;;;;;;;;;;;;;; @@ -9,7 +9,7 @@ gms$c15_rumdairy_scp_scen;;;;constant;constant;constant;constant;constant;consta gms$kfo_rd;;;;;;;;;;livst_rum;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; gms$c15_exo_foodscen;;;;;;;;;lin_zero_20_50;lin_zero_20_50;lin_zero_20_50;lin_zero_20_70;;;;;;;lin_zero_20_50;lin_zero_20_50;;lin_zero_20_50;;;lin_zero_20_50;;;;;;;;;;;;;;;;;; gms$s15_exo_waste;;;;0;0;0;0;0;1;1;1;1;;;;;;;1;1;0;1;0;0;1;0;0;1;1;;;;;;;;;;;;;; -gms$s15_waste_scen;;;;;;;;;1.2;1.36;1.2;1.3;;;;;;;1.2;1.2;;1.2;;;1.2;;;;;;;;;;;;;;;;;; +gms$s15_waste_scen;;;;;;;;;1.2;1.3;1.2;1.25;;;;;;;1.2;1.2;;1.2;;;1.2;;;;;;;;;;;;;;;;;; gms$s15_exo_diet;;;;0;0;0;0;0;1;1;1;1;;;;;;;1;1;0;1;0;0;1;0;0;1;1;;;;;;;;;;;;;; gms$c15_kcal_scen;;;;;;;;;healthy_BMI;no_underweight;healthy_BMI;healthy_BMI;;;;;;;healthy_BMI;healthy_BMI;;healthy_BMI;;;healthy_BMI;;;;;;;;;;;;;;;;;; gms$c15_EAT_scen;;;;;;;;;FLX;;FLX;FLX;;;;;;;FLX;FLX;;FLX;;;FLX;;;;;;;;;;;;;;;;;; @@ -33,23 +33,26 @@ gms$s30_snv_scenario_target;;;;;;;;;;;;2030;;;;;;;;;2030;2030;2030;2030;2030;;;; gms$c31_past_suit_scen;;;;ssp126;ssp245;ssp370;ssp460;ssp585;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ssp126;ssp126;ssp245;ssp460;ssp370;ssp585 gms$s32_aff_plantation;;;;0;0;0;0;0;0;1;0;0;;;;;;;0;;;;;;;;;;;;;;;;;;;;;;;; gms$s32_aff_bii_coeff;;;;0;0;0;0;0;0;1;0;0;;;;;;;0;;;;;;;;;;;;;;;;;;;;;;;; -gms$s32_max_aff_area;;;;Inf;Inf;Inf;Inf;Inf;500;400;0;700;;;;;;;500;;Inf;Inf;Inf;500;500;;;;;;;;;;;;;;;;;; +gms$s32_max_aff_area;;;;Inf;Inf;Inf;Inf;Inf;500;350;0;700;;;;;;;500;;Inf;Inf;Inf;500;500;;;;;;;;;;;;;;;;;; gms$c32_aff_mask;;;;noboreal;noboreal;noboreal;noboreal;noboreal;onlytropical;onlytropical;onlytropical;onlytropical;;;;;;;onlytropical;;noboreal;noboreal;noboreal;noboreal;noboreal;;;;;;;;;;;;;;;;;; gms$c34_urban_scenario;;;;SSP1;SSP2;SSP3;SSP4;SSP5;SSP1;SSP1;SSP2;SSP1;;;;;;;;;SSP4;SSP1;SSP4;SSP4;SSP1;;;;;;;;;;;;;;;;;; gms$c32_aff_policy;;;;;;;;;;;;;none;npi;ndc;;;;;;ndc;ndc;ndc;ndc;ndc;;;;;;;;;;;;;;;;;; +gms$s32_planing_horizon;;;;50;50;50;50;50;50;30;50;50;;;;;;;50;;;;;;;;;;;;;;;;;;;;;;;; gms$c35_ad_policy;;;;;;;;;;;;;none;npi;ndc;;;;;;ndc;ndc;ndc;ndc;ndc;;;;;;;;;;;;;;;;;; gms$c35_aolc_policy;;;;;;;;;;;;;none;npi;ndc;;;;;;ndc;ndc;ndc;ndc;ndc;;;;;;;;;;;;;;;;;; gms$s35_forest_damage_end;;;;2030;2050;2050;2050;2030;2030;2030;2030;2030;;;;;;;2030;;2030;2030;2030;2030;2030;;;;;;;;;;;;;;;;;; gms$s42_watdem_nonagr_scenario;;;;1;2;3;2;1;1;1;3;1;;;;;;;;;2;1;2;2;1;;;;;;;;;;;;;;;;;; gms$s42_irrig_eff_scenario;;;;2;2;2;2;2;3;3;3;3;;;;;;;3;;3;3;3;3;3;;;;;;;;;;;;;;;;;; -gms$c42_env_flow_policy;;;;on;off;off;mixed;on;on;on;mixed;on;;;;;;;on;;on;on;on;on;on;;;;;;;;;;;;;;;;;; -gms$s44_target_price;;;;0;0;0;0;0;0;100;0;0;;;;;;;0;;;;;;;;;;;;;;;;;;;;;;;; +gms$c42_env_flow_policy;;;;on;off;off;mixed;on;on;on;on;on;;;;;;;on;;on;on;on;on;on;;;;;;;;;;;;;;;;;; +gms$s42_efp_targetyear;;;;2040;2040;2040;2040;2040;2040;2050;2070;2050;;;;;;;2040;;2040;2040;2040;2040;2040;;;;;;;;;;;;;;;;;; +gms$s44_target_price;;;;0;0;0;0;0;0;0;0;0;;;;;;;0;;;;;;;;;;;;;;;;;;;;;;;; gms$c50_scen_neff;;;;baseeff_add3_add10_add20_max75;baseeff_add3_add5_add10_max65;baseeff_add3_add0_add0_max55;baseeff_add3_add10_add15_max75;baseeff_add3_add5_add15_max75;baseeff_add3_add15_add25_max75;baseeff_add3_add15_add25_max75;baseeff_add3_add15_add25_max65;baseeff_add3_add15_add25_max75;;;;;;;baseeff_add3_add15_add25_max75;;baseeff_add3_add15_add25_max75;baseeff_add3_add15_add25_max75;baseeff_add3_add15_add25_max75;baseeff_add3_add15_add25_max75;baseeff_add3_add15_add25_max75;;;;;;;;;;;;;;;;;; gms$c50_scen_neff_noselect;;;;baseeff_add3_add10_add20_max75;baseeff_add3_add5_add10_max65;baseeff_add3_add0_add0_max55;baseeff_add3_add10_add15_max75;baseeff_add3_add5_add15_max75;baseeff_add3_add15_add25_max75;baseeff_add3_add15_add25_max75;baseeff_add3_add15_add25_max65;baseeff_add3_add15_add25_max75;;;;;;;baseeff_add3_add15_add25_max75;;baseeff_add3_add10_add15_max75;baseeff_add3_add10_add15_max75;baseeff_add3_add10_add15_max75;baseeff_add3_add10_add15_max75;baseeff_add3_add10_add15_max75;;;;;;;;;;;;;;;;;; gms$c55_scen_conf;;;;ssp1;ssp2;ssp3;ssp4;ssp5;ssp1;ssp1;ssp1;ssp1;;;;;;;ssp1;;ssp1;ssp1;ssp1;ssp1;ssp1;;;;;;;;;;;;;;;;;; gms$c55_scen_conf_noselect;;;;ssp1;ssp2;ssp3;ssp4;ssp5;ssp1;ssp1;ssp1;ssp1;;;;;;;ssp1;;ssp4;ssp4;ssp1;ssp4;ssp1;;;;;;;;;;;;;;;;;; gms$c56_pollutant_prices;;;;;;;;;;;;;;;;coupling;emulator;coupling;;;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;;;;;;;;;;;;;;;;;; gms$c56_pollutant_prices_noselect;;;;;;;;;;;;;;;;coupling;emulator;coupling;;;R21M42-SDP-NPi;R21M42-SDP-NPi;R21M42-SDP-NPi;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;;;;;;;;;;;;;;;;;; +gms$s56_c_price_exp_aff;;;;50;50;50;50;50;50;30;50;50;;;;;;;50;;;;;;;;;;;;;;;;;;;;;;;; gms$s56_buffer_aff;;;;0.2;0.2;0.2;0.2;0.2;0.2;0.5;0.2;0.3;;;;;;;0.2;;;;;;;;;;;;;;;;;;;;;;;; gms$c56_emis_policy;;;;redd+natveg_nosoil;redd+natveg_nosoil;redd+natveg_nosoil;redd+natveg_nosoil;redd+natveg_nosoil;redd+natveg_nosoil;redd+natveg_nosoil;redd+_nosoil;all_nosoil;;;;;;;redd+natveg_nosoil;;;;;;;;;;;;;;;;;;;;;;;; gms$maccs;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -74,7 +77,7 @@ gms$s73_timber_demand_switch;;;;;;;;;;;;;;;;;;;;;1;1;1;1;1;;;;;1;1;0;;;;;;;;;;; gms$s35_forest_damage;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4;4;4;4;4;;;;;; gms$c32_shock_scenario;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;none;002lin2030;004lin2030;008lin2030;016lin2030;;;;;; gms$c35_shock_scenario;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;none;002lin2030;004lin2030;008lin2030;016lin2030;;;;;; -input['cellular'];;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.77_h12_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.77_h12_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;rev4.77_h12_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.77_h12_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.77_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.77_h12_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz +input['cellular'];;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.79_h12_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.79_h12_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;rev4.79_h12_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.79_h12_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.79_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.79_h12_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz gms$c52_land_carbon_sink_rcp;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;RCP19;RCP26;RCP45;RCP60;RCPBU;RCPBU gms$c57_macc_version;;;;;;;;;;;;;;;;;;;;;;;;;;PBL_2022;PBL_2022;PBL_2022;PBL_2022;;;;;;;;;;;;;; gms$c57_macc_scenario;;;;;;;;;;;;;;;;;;;;;;;;;;Default;Optimistic;Default;Optimistic;;;;;;;;;;;;;; diff --git a/config/scenario_fsec.csv b/config/scenario_fsec.csv index e3ebc5cb39..9e67020936 100644 --- a/config/scenario_fsec.csv +++ b/config/scenario_fsec.csv @@ -58,9 +58,9 @@ gms$s62_max_dem_bioplastic;0;;;;400;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; gms$c70_fac_req_regr;reg;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; gms$c70_feed_scen;;;;;;;;;;;;;;;;;ssp1;;;;;;;;;;;;;;;;;;;;;;; gms$c73_build_demand;;;;;;;;;;;;;;;;;;;;;;;50pc;;;;;;;;;;;;;;;;; -input['cellular'];rev4.78FSEC_e2bdb6cd_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.78FSEC_e2bdb6cd_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.78FSEC_e2bdb6cd_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.78FSEC_e2bdb6cd_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;rev4.78FSEC_e2bdb6cd_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.78FSEC_e2bdb6cd_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.78FSEC_e2bdb6cd_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.78FSEC_e2bdb6cd_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz -input['regional'];rev4.78FSEC_e2bdb6cd_magpie.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -input['validation'];rev4.78FSEC_e2bdb6cd_validation.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +input['cellular'];rev4.79FSEC_e2bdb6cd_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.79FSEC_e2bdb6cd_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.79FSEC_e2bdb6cd_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.79FSEC_e2bdb6cd_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;rev4.79FSEC_e2bdb6cd_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.79FSEC_e2bdb6cd_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.79FSEC_e2bdb6cd_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.79FSEC_e2bdb6cd_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz +input['regional'];rev4.79FSEC_e2bdb6cd_magpie.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +input['validation'];rev4.79FSEC_e2bdb6cd_validation.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; input['additional'];additional_data_rev4.36.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; input['calibration'];calibration_FSEC_28Nov22.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; magicc_emis_scen;bjoernAR6_C_SSP2-NDC.mif;;;bjoernAR6_C_SSP2-PkBudg900.mif;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;bjoernAR6_C_SSP1-NDC.mif;;;; diff --git a/core/calculations.gms b/core/calculations.gms index d057d788b9..42fb7f9d20 100644 --- a/core/calculations.gms +++ b/core/calculations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/core/declarations.gms b/core/declarations.gms index 7c24dc5470..d9063d43bb 100644 --- a/core/declarations.gms +++ b/core/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/core/load_gdx.gms b/core/load_gdx.gms index 3118d5b4a9..ba75e4b3cf 100644 --- a/core/load_gdx.gms +++ b/core/load_gdx.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/core/macros.gms b/core/macros.gms index f07cf7bd3c..cf8cc4fc36 100644 --- a/core/macros.gms +++ b/core/macros.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/core/sets.gms b/core/sets.gms index 8e599b280b..1a689613c2 100644 --- a/core/sets.gms +++ b/core/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/literature.bib b/literature.bib index cea62fbac2..69e294e521 100644 --- a/literature.bib +++ b/literature.bib @@ -1115,6 +1115,12 @@ @techreport{ipcc_2006_2006 year = {2006} } +@misc{calvo_buendia_ipcc_2019, + title = {{{IPCC}} 2019, 2019 {{Refinement}} to the 2006 {{IPCC Guidelines}} for {{National Greenhouse Gas Inventories}},}, + publisher = {Published: IPCC, Switzerland}, + year = {2019}, + editor = {E. {Calvo Buendia} and K. Tanabe and A. Kranjc and J. Baasansuren and M. Fukuda and S. Ngarize and A.Osako and Y. Pyrozhenko and P. Shermanau and S. Federici (eds)}, +} @article{lal_world_2005, title = {World crop residues production and implications of its use as a biofuel}, diff --git a/main.gms b/main.gms index 8d994e0ee8..1c6b9cddf3 100644 --- a/main.gms +++ b/main.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -146,25 +146,25 @@ $title magpie *##################### R SECTION START (VERSION INFO) ########################## * -* Used data set: rev4.77_h12_magpie.tgz -* md5sum: NA -* Repository: https://rse.pik-potsdam.de/data/magpie/public +* Used data set: rev4.79_h12_magpie.tgz +* md5sum: 4f3f5fd72716fe371d646c69c30e6fd3 +* Repository: /p/projects/rd3mod/inputdata/output * -* Used data set: rev4.77_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz -* md5sum: NA -* Repository: https://rse.pik-potsdam.de/data/magpie/public +* Used data set: rev4.79_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz +* md5sum: a18af444eb4a3d24956f66e31e8634d8 +* Repository: /p/projects/rd3mod/inputdata/output * -* Used data set: rev4.77_h12_validation.tgz -* md5sum: NA -* Repository: https://rse.pik-potsdam.de/data/magpie/public +* Used data set: rev4.79_h12_validation.tgz +* md5sum: 0a617c2999127a50146ac106cd6ee4bf +* Repository: /p/projects/rd3mod/inputdata/output * -* Used data set: additional_data_rev4.33.tgz -* md5sum: NA -* Repository: https://rse.pik-potsdam.de/data/magpie/public +* Used data set: additional_data_rev4.36.tgz +* md5sum: e24c46872f77dc15ad8603bdac1e6065 +* Repository: /p/projects/rd3mod/mirror/rse.pik-potsdam.de/data/magpie/public * -* Used data set: calibration_H12_per_ton_fao_may22_glo_23Nov22.tgz -* md5sum: NA -* Repository: https://rse.pik-potsdam.de/data/magpie/public +* Used data set: calibration_H12_09Jan23.tgz +* md5sum: 0fd18901ec047862918bf598ac126411 +* Repository: /p/projects/rd3mod/mirror/rse.pik-potsdam.de/data/magpie/public * * Low resolution: c200 * High resolution: 0.5 @@ -177,11 +177,11 @@ $title magpie * * Regionscode: 62eff8f7 * -* Regions data revision: 4.77 +* Regions data revision: 4.79 * * lpj2magpie settings: * * LPJmL data: MRI-ESM2-0:ssp370 -* * Revision: 4.77 +* * Revision: 4.79 * * aggregation settings: * * Input resolution: 0.5 @@ -193,7 +193,7 @@ $title magpie * * Call: withCallingHandlers(expr, message = messageHandler, warning = warningHandler, error = errorHandler) * * -* Last modification (input data): Thu Dec 08 10:40:17 2022 +* Last modification (input data): Tue Jan 17 11:25:32 2023 * *###################### R SECTION END (VERSION INFO) ########################### diff --git a/modules/09_drivers/aug17/declarations.gms b/modules/09_drivers/aug17/declarations.gms index 93c91b326c..dc613e9071 100644 --- a/modules/09_drivers/aug17/declarations.gms +++ b/modules/09_drivers/aug17/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/09_drivers/aug17/input.gms b/modules/09_drivers/aug17/input.gms index 1dcdc1a633..0cde5e180c 100644 --- a/modules/09_drivers/aug17/input.gms +++ b/modules/09_drivers/aug17/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/09_drivers/aug17/preloop.gms b/modules/09_drivers/aug17/preloop.gms index 3487de3313..792dfdc74a 100644 --- a/modules/09_drivers/aug17/preloop.gms +++ b/modules/09_drivers/aug17/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/09_drivers/aug17/realization.gms b/modules/09_drivers/aug17/realization.gms index 366b2e20ed..e94e4962ec 100644 --- a/modules/09_drivers/aug17/realization.gms +++ b/modules/09_drivers/aug17/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/09_drivers/aug17/sets.gms b/modules/09_drivers/aug17/sets.gms index b54b520b0a..59478fe362 100644 --- a/modules/09_drivers/aug17/sets.gms +++ b/modules/09_drivers/aug17/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/09_drivers/module.gms b/modules/09_drivers/module.gms index 1671f24973..ffeb5dbafd 100644 --- a/modules/09_drivers/module.gms +++ b/modules/09_drivers/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/10_land/landmatrix_dec18/declarations.gms b/modules/10_land/landmatrix_dec18/declarations.gms index 963516b5a7..d005b72df4 100644 --- a/modules/10_land/landmatrix_dec18/declarations.gms +++ b/modules/10_land/landmatrix_dec18/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/10_land/landmatrix_dec18/equations.gms b/modules/10_land/landmatrix_dec18/equations.gms index 0654e435d9..e24e9bc390 100644 --- a/modules/10_land/landmatrix_dec18/equations.gms +++ b/modules/10_land/landmatrix_dec18/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/10_land/landmatrix_dec18/input.gms b/modules/10_land/landmatrix_dec18/input.gms index e2efc7a49e..56f4edb78c 100644 --- a/modules/10_land/landmatrix_dec18/input.gms +++ b/modules/10_land/landmatrix_dec18/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/10_land/landmatrix_dec18/postsolve.gms b/modules/10_land/landmatrix_dec18/postsolve.gms index af8ed3d9af..50a2d71fdd 100644 --- a/modules/10_land/landmatrix_dec18/postsolve.gms +++ b/modules/10_land/landmatrix_dec18/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/10_land/landmatrix_dec18/preloop.gms b/modules/10_land/landmatrix_dec18/preloop.gms index f57a11cfac..ae47145544 100644 --- a/modules/10_land/landmatrix_dec18/preloop.gms +++ b/modules/10_land/landmatrix_dec18/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/10_land/landmatrix_dec18/presolve.gms b/modules/10_land/landmatrix_dec18/presolve.gms index a17d16f64e..e9a797f6d5 100644 --- a/modules/10_land/landmatrix_dec18/presolve.gms +++ b/modules/10_land/landmatrix_dec18/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/10_land/landmatrix_dec18/realization.gms b/modules/10_land/landmatrix_dec18/realization.gms index 19503e9e3c..2f1e4fb284 100644 --- a/modules/10_land/landmatrix_dec18/realization.gms +++ b/modules/10_land/landmatrix_dec18/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/10_land/landmatrix_dec18/scaling.gms b/modules/10_land/landmatrix_dec18/scaling.gms index 94d182e47a..62e3dab685 100644 --- a/modules/10_land/landmatrix_dec18/scaling.gms +++ b/modules/10_land/landmatrix_dec18/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/10_land/landmatrix_dec18/sets.gms b/modules/10_land/landmatrix_dec18/sets.gms index 14d085a2ee..f1b38d6aab 100644 --- a/modules/10_land/landmatrix_dec18/sets.gms +++ b/modules/10_land/landmatrix_dec18/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/10_land/landmatrix_dec18/start.gms b/modules/10_land/landmatrix_dec18/start.gms index 9a4a7d611f..2211b09058 100644 --- a/modules/10_land/landmatrix_dec18/start.gms +++ b/modules/10_land/landmatrix_dec18/start.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/10_land/module.gms b/modules/10_land/module.gms index a96d12876a..d9a4355503 100644 --- a/modules/10_land/module.gms +++ b/modules/10_land/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/11_costs/default/declarations.gms b/modules/11_costs/default/declarations.gms index 543f05a47e..2f1272c244 100644 --- a/modules/11_costs/default/declarations.gms +++ b/modules/11_costs/default/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/11_costs/default/equations.gms b/modules/11_costs/default/equations.gms index f5325ddd74..ce57618e07 100644 --- a/modules/11_costs/default/equations.gms +++ b/modules/11_costs/default/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -12,11 +12,11 @@ *' The global costs of production are represented by the sum of regional *' production costs of different production activities. - q11_cost_reg(i2) .. v11_cost_reg(i2) =e= sum(req,vm_cost_prod_crop(i2,req)) + q11_cost_reg(i2) .. v11_cost_reg(i2) =e= sum(factors,vm_cost_prod_crop(i2,factors)) + sum(kres,vm_cost_prod_kres(i2,kres)) + vm_cost_prod_past(i2) + vm_cost_prod_fish(i2) - + sum(req,vm_cost_prod_livst(i2,req)) + + sum(factors,vm_cost_prod_livst(i2,factors)) + sum((cell(i2,j2),land), vm_cost_landcon(j2,land)) + sum((cell(i2,j2),k), vm_cost_transp(j2,k)) + vm_tech_cost(i2) @@ -25,7 +25,7 @@ + vm_p_fert_costs(i2) + vm_emission_costs(i2) - vm_reward_cdr_aff(i2) - + sum(req,vm_maccs_costs(i2,req)) + + sum(factors,vm_maccs_costs(i2,factors)) + vm_cost_AEI(i2) + vm_cost_trade(i2) + vm_cost_fore(i2) diff --git a/modules/11_costs/default/postsolve.gms b/modules/11_costs/default/postsolve.gms index 9defbbe7d5..42f957fcb1 100644 --- a/modules/11_costs/default/postsolve.gms +++ b/modules/11_costs/default/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/11_costs/default/realization.gms b/modules/11_costs/default/realization.gms index d9c891bb73..56694d1234 100644 --- a/modules/11_costs/default/realization.gms +++ b/modules/11_costs/default/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/11_costs/default/scaling.gms b/modules/11_costs/default/scaling.gms index cded736a81..080316fbfc 100644 --- a/modules/11_costs/default/scaling.gms +++ b/modules/11_costs/default/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/11_costs/module.gms b/modules/11_costs/module.gms index f091c1c558..77c290263a 100644 --- a/modules/11_costs/module.gms +++ b/modules/11_costs/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/12_interest_rate/module.gms b/modules/12_interest_rate/module.gms index 341066080b..08202aeee0 100644 --- a/modules/12_interest_rate/module.gms +++ b/modules/12_interest_rate/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/12_interest_rate/select_apr20/declarations.gms b/modules/12_interest_rate/select_apr20/declarations.gms index 016f6a793d..f9f68cab68 100644 --- a/modules/12_interest_rate/select_apr20/declarations.gms +++ b/modules/12_interest_rate/select_apr20/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/12_interest_rate/select_apr20/input.gms b/modules/12_interest_rate/select_apr20/input.gms index 7d0e475aec..bb54d53fda 100644 --- a/modules/12_interest_rate/select_apr20/input.gms +++ b/modules/12_interest_rate/select_apr20/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/12_interest_rate/select_apr20/preloop.gms b/modules/12_interest_rate/select_apr20/preloop.gms index cad49cee6a..768a57b504 100644 --- a/modules/12_interest_rate/select_apr20/preloop.gms +++ b/modules/12_interest_rate/select_apr20/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/12_interest_rate/select_apr20/realization.gms b/modules/12_interest_rate/select_apr20/realization.gms index 1c00130270..403731a435 100644 --- a/modules/12_interest_rate/select_apr20/realization.gms +++ b/modules/12_interest_rate/select_apr20/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/13_tc/endo_jan22/declarations.gms b/modules/13_tc/endo_jan22/declarations.gms index bf07ae095e..21fac84236 100644 --- a/modules/13_tc/endo_jan22/declarations.gms +++ b/modules/13_tc/endo_jan22/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/13_tc/endo_jan22/equations.gms b/modules/13_tc/endo_jan22/equations.gms index 5da41399c3..f6bfbccda1 100644 --- a/modules/13_tc/endo_jan22/equations.gms +++ b/modules/13_tc/endo_jan22/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/13_tc/endo_jan22/input.gms b/modules/13_tc/endo_jan22/input.gms index 1033fc5f95..3f01906ab9 100644 --- a/modules/13_tc/endo_jan22/input.gms +++ b/modules/13_tc/endo_jan22/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/13_tc/endo_jan22/nl_fix.gms b/modules/13_tc/endo_jan22/nl_fix.gms index 5de39c8ac2..b784ee209a 100644 --- a/modules/13_tc/endo_jan22/nl_fix.gms +++ b/modules/13_tc/endo_jan22/nl_fix.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/13_tc/endo_jan22/nl_relax.gms b/modules/13_tc/endo_jan22/nl_relax.gms index 7a79ce9e9e..b217e477eb 100644 --- a/modules/13_tc/endo_jan22/nl_relax.gms +++ b/modules/13_tc/endo_jan22/nl_relax.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/13_tc/endo_jan22/nl_release.gms b/modules/13_tc/endo_jan22/nl_release.gms index b8cf24a285..5f22d75717 100644 --- a/modules/13_tc/endo_jan22/nl_release.gms +++ b/modules/13_tc/endo_jan22/nl_release.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/13_tc/endo_jan22/postsolve.gms b/modules/13_tc/endo_jan22/postsolve.gms index d8ffae596d..1116099f19 100644 --- a/modules/13_tc/endo_jan22/postsolve.gms +++ b/modules/13_tc/endo_jan22/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/13_tc/endo_jan22/preloop.gms b/modules/13_tc/endo_jan22/preloop.gms index 9f45cba655..006fa2973b 100644 --- a/modules/13_tc/endo_jan22/preloop.gms +++ b/modules/13_tc/endo_jan22/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/13_tc/endo_jan22/presolve.gms b/modules/13_tc/endo_jan22/presolve.gms index 5067c2ce8c..d12ddc99e8 100644 --- a/modules/13_tc/endo_jan22/presolve.gms +++ b/modules/13_tc/endo_jan22/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/13_tc/endo_jan22/realization.gms b/modules/13_tc/endo_jan22/realization.gms index 10b9844f00..6704866921 100644 --- a/modules/13_tc/endo_jan22/realization.gms +++ b/modules/13_tc/endo_jan22/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/13_tc/endo_jan22/scaling.gms b/modules/13_tc/endo_jan22/scaling.gms index c68ce9b9b9..9720954370 100644 --- a/modules/13_tc/endo_jan22/scaling.gms +++ b/modules/13_tc/endo_jan22/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/13_tc/endo_jan22/sets.gms b/modules/13_tc/endo_jan22/sets.gms index 62eb2d52a6..252f3ed05a 100644 --- a/modules/13_tc/endo_jan22/sets.gms +++ b/modules/13_tc/endo_jan22/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/13_tc/exo/declarations.gms b/modules/13_tc/exo/declarations.gms index 6a11313cdb..523e85f92f 100644 --- a/modules/13_tc/exo/declarations.gms +++ b/modules/13_tc/exo/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/13_tc/exo/input.gms b/modules/13_tc/exo/input.gms index db75f00ebf..ed586381b2 100644 --- a/modules/13_tc/exo/input.gms +++ b/modules/13_tc/exo/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/13_tc/exo/postsolve.gms b/modules/13_tc/exo/postsolve.gms index 0b572a91de..871ad5d274 100644 --- a/modules/13_tc/exo/postsolve.gms +++ b/modules/13_tc/exo/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/13_tc/exo/preloop.gms b/modules/13_tc/exo/preloop.gms index 5b4310a1fb..ae3c95d04e 100644 --- a/modules/13_tc/exo/preloop.gms +++ b/modules/13_tc/exo/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/13_tc/exo/presolve.gms b/modules/13_tc/exo/presolve.gms index 26ff857048..2c4ab4c9be 100644 --- a/modules/13_tc/exo/presolve.gms +++ b/modules/13_tc/exo/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/13_tc/exo/realization.gms b/modules/13_tc/exo/realization.gms index 3f5d7c6d44..bceeb44a1a 100644 --- a/modules/13_tc/exo/realization.gms +++ b/modules/13_tc/exo/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/13_tc/exo/sets.gms b/modules/13_tc/exo/sets.gms index 3829c4d9ac..b2b502bc88 100644 --- a/modules/13_tc/exo/sets.gms +++ b/modules/13_tc/exo/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/13_tc/module.gms b/modules/13_tc/module.gms index e4af481a51..be7a2dfdfb 100644 --- a/modules/13_tc/module.gms +++ b/modules/13_tc/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/14_yields/managementcalib_aug19/declarations.gms b/modules/14_yields/managementcalib_aug19/declarations.gms index bb304d900c..baacf31688 100644 --- a/modules/14_yields/managementcalib_aug19/declarations.gms +++ b/modules/14_yields/managementcalib_aug19/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/14_yields/managementcalib_aug19/equations.gms b/modules/14_yields/managementcalib_aug19/equations.gms index 8dde13ce4a..0488f75081 100644 --- a/modules/14_yields/managementcalib_aug19/equations.gms +++ b/modules/14_yields/managementcalib_aug19/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/14_yields/managementcalib_aug19/input.gms b/modules/14_yields/managementcalib_aug19/input.gms index 0731fcbd7d..2eea9d4afb 100644 --- a/modules/14_yields/managementcalib_aug19/input.gms +++ b/modules/14_yields/managementcalib_aug19/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/14_yields/managementcalib_aug19/nl_fix.gms b/modules/14_yields/managementcalib_aug19/nl_fix.gms index 2c3a8af58d..1d6e5a63c3 100644 --- a/modules/14_yields/managementcalib_aug19/nl_fix.gms +++ b/modules/14_yields/managementcalib_aug19/nl_fix.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/14_yields/managementcalib_aug19/nl_release.gms b/modules/14_yields/managementcalib_aug19/nl_release.gms index d4f67de511..266f0de831 100644 --- a/modules/14_yields/managementcalib_aug19/nl_release.gms +++ b/modules/14_yields/managementcalib_aug19/nl_release.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/14_yields/managementcalib_aug19/postsolve.gms b/modules/14_yields/managementcalib_aug19/postsolve.gms index b30cbf4ff8..8572264573 100644 --- a/modules/14_yields/managementcalib_aug19/postsolve.gms +++ b/modules/14_yields/managementcalib_aug19/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/14_yields/managementcalib_aug19/preloop.gms b/modules/14_yields/managementcalib_aug19/preloop.gms index 22b21cea25..473521abe9 100644 --- a/modules/14_yields/managementcalib_aug19/preloop.gms +++ b/modules/14_yields/managementcalib_aug19/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/14_yields/managementcalib_aug19/presolve.gms b/modules/14_yields/managementcalib_aug19/presolve.gms index 10546199c9..d2001e34a3 100644 --- a/modules/14_yields/managementcalib_aug19/presolve.gms +++ b/modules/14_yields/managementcalib_aug19/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/14_yields/managementcalib_aug19/realization.gms b/modules/14_yields/managementcalib_aug19/realization.gms index bc01adebc5..f260b42bce 100644 --- a/modules/14_yields/managementcalib_aug19/realization.gms +++ b/modules/14_yields/managementcalib_aug19/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/14_yields/managementcalib_aug19/sets.gms b/modules/14_yields/managementcalib_aug19/sets.gms index a0013142fa..5fac9eba23 100644 --- a/modules/14_yields/managementcalib_aug19/sets.gms +++ b/modules/14_yields/managementcalib_aug19/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/14_yields/module.gms b/modules/14_yields/module.gms index 74c7bdcc25..e2341262dc 100644 --- a/modules/14_yields/module.gms +++ b/modules/14_yields/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/15_food/anthro_iso_jun22/declarations.gms b/modules/15_food/anthro_iso_jun22/declarations.gms index d352f6159f..ea0f578a70 100644 --- a/modules/15_food/anthro_iso_jun22/declarations.gms +++ b/modules/15_food/anthro_iso_jun22/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/15_food/anthro_iso_jun22/equations.gms b/modules/15_food/anthro_iso_jun22/equations.gms index 50a63f4bef..6cb9c227b4 100644 --- a/modules/15_food/anthro_iso_jun22/equations.gms +++ b/modules/15_food/anthro_iso_jun22/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/15_food/anthro_iso_jun22/exodietmacro.gms b/modules/15_food/anthro_iso_jun22/exodietmacro.gms index 8455093909..6a34f37efb 100644 --- a/modules/15_food/anthro_iso_jun22/exodietmacro.gms +++ b/modules/15_food/anthro_iso_jun22/exodietmacro.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -336,6 +336,11 @@ $endif p15_bmi_shr_calibrated(t,iso,sex,age,bmi_group15) = p15_bmi_shr_calibrated(t,iso,sex,age,bmi_group15) * (1-i15_exo_foodscen_fader(t,iso)) + p15_bmi_shr_target(t,iso,sex,age,bmi_group15) * i15_exo_foodscen_fader(t,iso); + +); +*' End of special postprocessing food demand scenarios. + + *' 4.) The fourth step estimates the calorie supply at household level by multiplying *' daily per capita calorie intake with the demand2intake ratio that was estimated *' previously. It assures that if commodities with higher food waste ratio are @@ -352,14 +357,6 @@ $endif (sum(kfo,p15_kcal_pc_iso(t,iso,kfo)) / p15_intake_total(t,iso))$( p15_intake_total(t,iso) > 0); - p15_demand2intake_ratio_detail(t,iso,kfo)=1$(p15_intake_detail(t,iso,kfo) = 0) + - (p15_kcal_pc_iso(t,iso,kfo) / p15_intake_detail(t,iso,kfo))$(p15_intake_detail(t,iso,kfo) > 0); - -); -*' End of special postprocessing food demand scenarios. - - - * ###### Exogenous food waste scenario @@ -372,6 +369,8 @@ $endif = p15_demand2intake_ratio(t,iso)*(1-i15_exo_foodscen_fader(t,iso)) + s15_waste_scen*i15_exo_foodscen_fader(t,iso); +); + *' waste calculation by crop type p15_waste_pc(t,iso,kfo)$(sum(kfo2, p15_waste_pc(t,iso,kfo2))<>0) = p15_waste_pc(t,iso,kfo) / sum(kfo2, p15_waste_pc(t,iso,kfo2))* @@ -380,13 +379,10 @@ $endif *' Waste ratio is applied p15_kcal_pc_iso(t,iso,kfo) = p15_intake_detail(t,iso,kfo) + p15_waste_pc(t,iso,kfo); +*' Demand intake detail p15_demand2intake_ratio_detail(t,iso,kfo)=1$(p15_intake_detail(t,iso,kfo) = 0) + (p15_kcal_pc_iso(t,iso,kfo) / p15_intake_detail(t,iso,kfo))$(p15_intake_detail(t,iso,kfo) > 0); -); - - - *' The country-level parameter p15_kcal_pc_iso is aggregated to the *' regional level. After removing estimates from countries that are not included diff --git a/modules/15_food/anthro_iso_jun22/input.gms b/modules/15_food/anthro_iso_jun22/input.gms index c4bb30b93f..df78bb3565 100644 --- a/modules/15_food/anthro_iso_jun22/input.gms +++ b/modules/15_food/anthro_iso_jun22/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/15_food/anthro_iso_jun22/intersolve.gms b/modules/15_food/anthro_iso_jun22/intersolve.gms index 4b9654f44c..25482da3d6 100644 --- a/modules/15_food/anthro_iso_jun22/intersolve.gms +++ b/modules/15_food/anthro_iso_jun22/intersolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/15_food/anthro_iso_jun22/postsolve.gms b/modules/15_food/anthro_iso_jun22/postsolve.gms index 76919edd3e..9c28615dab 100644 --- a/modules/15_food/anthro_iso_jun22/postsolve.gms +++ b/modules/15_food/anthro_iso_jun22/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/15_food/anthro_iso_jun22/preloop.gms b/modules/15_food/anthro_iso_jun22/preloop.gms index 37c36ad5d3..31002538ff 100644 --- a/modules/15_food/anthro_iso_jun22/preloop.gms +++ b/modules/15_food/anthro_iso_jun22/preloop.gms @@ -1,9 +1,9 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the *** | MAgPIE License Exception, version 1.0 (see LICENSE file). -*** | Contact: c15_livescenmagpie@pik-potsdam.de +*** | Contact: magpie@pik-potsdam.de i15_bmi_intercept(sex,agegroup15,bmi_tree15) = f15_bmi_shr_paras(sex,agegroup15,bmi_tree15,"intercept"); i15_bmi_saturation(sex,agegroup15,bmi_tree15) = f15_bmi_shr_paras(sex,agegroup15,bmi_tree15,"saturation"); diff --git a/modules/15_food/anthro_iso_jun22/presolve.gms b/modules/15_food/anthro_iso_jun22/presolve.gms index 2e06af7860..e30f7d2b23 100644 --- a/modules/15_food/anthro_iso_jun22/presolve.gms +++ b/modules/15_food/anthro_iso_jun22/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/15_food/anthro_iso_jun22/realization.gms b/modules/15_food/anthro_iso_jun22/realization.gms index 5e38b1e274..87624010d9 100644 --- a/modules/15_food/anthro_iso_jun22/realization.gms +++ b/modules/15_food/anthro_iso_jun22/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/15_food/anthro_iso_jun22/scaling.gms b/modules/15_food/anthro_iso_jun22/scaling.gms index d5413452b0..d302122c32 100644 --- a/modules/15_food/anthro_iso_jun22/scaling.gms +++ b/modules/15_food/anthro_iso_jun22/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/15_food/anthro_iso_jun22/sets.gms b/modules/15_food/anthro_iso_jun22/sets.gms index d5bd0e0010..c825ada566 100644 --- a/modules/15_food/anthro_iso_jun22/sets.gms +++ b/modules/15_food/anthro_iso_jun22/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/15_food/anthropometrics_jan18/declarations.gms b/modules/15_food/anthropometrics_jan18/declarations.gms index 694fa4b0c3..d9b79e54c8 100644 --- a/modules/15_food/anthropometrics_jan18/declarations.gms +++ b/modules/15_food/anthropometrics_jan18/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/15_food/anthropometrics_jan18/equations.gms b/modules/15_food/anthropometrics_jan18/equations.gms index 50a63f4bef..6cb9c227b4 100644 --- a/modules/15_food/anthropometrics_jan18/equations.gms +++ b/modules/15_food/anthropometrics_jan18/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/15_food/anthropometrics_jan18/input.gms b/modules/15_food/anthropometrics_jan18/input.gms index 5d93ef3ce7..8a6eb2899d 100644 --- a/modules/15_food/anthropometrics_jan18/input.gms +++ b/modules/15_food/anthropometrics_jan18/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/15_food/anthropometrics_jan18/intersolve.gms b/modules/15_food/anthropometrics_jan18/intersolve.gms index d9b74e8b38..9a2c8bf68d 100644 --- a/modules/15_food/anthropometrics_jan18/intersolve.gms +++ b/modules/15_food/anthropometrics_jan18/intersolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/15_food/anthropometrics_jan18/postsolve.gms b/modules/15_food/anthropometrics_jan18/postsolve.gms index a9d5f18452..b0dbd73353 100644 --- a/modules/15_food/anthropometrics_jan18/postsolve.gms +++ b/modules/15_food/anthropometrics_jan18/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/15_food/anthropometrics_jan18/preloop.gms b/modules/15_food/anthropometrics_jan18/preloop.gms index 1c4318cf98..e619ac3db7 100644 --- a/modules/15_food/anthropometrics_jan18/preloop.gms +++ b/modules/15_food/anthropometrics_jan18/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/15_food/anthropometrics_jan18/presolve.gms b/modules/15_food/anthropometrics_jan18/presolve.gms index 76e708425d..bcad9706c7 100644 --- a/modules/15_food/anthropometrics_jan18/presolve.gms +++ b/modules/15_food/anthropometrics_jan18/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/15_food/anthropometrics_jan18/realization.gms b/modules/15_food/anthropometrics_jan18/realization.gms index 12cb931a06..b68f69bbf5 100644 --- a/modules/15_food/anthropometrics_jan18/realization.gms +++ b/modules/15_food/anthropometrics_jan18/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/15_food/anthropometrics_jan18/scaling.gms b/modules/15_food/anthropometrics_jan18/scaling.gms index d5413452b0..d302122c32 100644 --- a/modules/15_food/anthropometrics_jan18/scaling.gms +++ b/modules/15_food/anthropometrics_jan18/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/15_food/anthropometrics_jan18/sets.gms b/modules/15_food/anthropometrics_jan18/sets.gms index 315e8119a6..784ef1d6e0 100644 --- a/modules/15_food/anthropometrics_jan18/sets.gms +++ b/modules/15_food/anthropometrics_jan18/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/15_food/module.gms b/modules/15_food/module.gms index 19edc65f0a..b228f51668 100644 --- a/modules/15_food/module.gms +++ b/modules/15_food/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/16_demand/module.gms b/modules/16_demand/module.gms index 6d63496467..bc0980cd08 100644 --- a/modules/16_demand/module.gms +++ b/modules/16_demand/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/16_demand/sector_may15/declarations.gms b/modules/16_demand/sector_may15/declarations.gms index 8e98938144..01edc515ee 100644 --- a/modules/16_demand/sector_may15/declarations.gms +++ b/modules/16_demand/sector_may15/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/16_demand/sector_may15/equations.gms b/modules/16_demand/sector_may15/equations.gms index 6b3c35dc08..974203a3b4 100644 --- a/modules/16_demand/sector_may15/equations.gms +++ b/modules/16_demand/sector_may15/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/16_demand/sector_may15/input.gms b/modules/16_demand/sector_may15/input.gms index d658101a6d..16b7d251b5 100644 --- a/modules/16_demand/sector_may15/input.gms +++ b/modules/16_demand/sector_may15/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/16_demand/sector_may15/not_used.txt b/modules/16_demand/sector_may15/not_used.txt deleted file mode 100644 index da77c77f60..0000000000 --- a/modules/16_demand/sector_may15/not_used.txt +++ /dev/null @@ -1,8 +0,0 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de - -name,type,reason diff --git a/modules/16_demand/sector_may15/postsolve.gms b/modules/16_demand/sector_may15/postsolve.gms index 53b9dfe5c4..44a7fc6786 100644 --- a/modules/16_demand/sector_may15/postsolve.gms +++ b/modules/16_demand/sector_may15/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/16_demand/sector_may15/realization.gms b/modules/16_demand/sector_may15/realization.gms index e97497b169..9d1753df63 100644 --- a/modules/16_demand/sector_may15/realization.gms +++ b/modules/16_demand/sector_may15/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/16_demand/sector_may15/sets.gms b/modules/16_demand/sector_may15/sets.gms index a497331999..2fc3950776 100644 --- a/modules/16_demand/sector_may15/sets.gms +++ b/modules/16_demand/sector_may15/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/17_production/flexreg_apr16/declarations.gms b/modules/17_production/flexreg_apr16/declarations.gms index 9f40e9a569..235855f322 100644 --- a/modules/17_production/flexreg_apr16/declarations.gms +++ b/modules/17_production/flexreg_apr16/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/17_production/flexreg_apr16/equations.gms b/modules/17_production/flexreg_apr16/equations.gms index 996c7aa5a4..6e0b683900 100644 --- a/modules/17_production/flexreg_apr16/equations.gms +++ b/modules/17_production/flexreg_apr16/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/17_production/flexreg_apr16/input.gms b/modules/17_production/flexreg_apr16/input.gms index a5507800fa..e317e37d3c 100644 --- a/modules/17_production/flexreg_apr16/input.gms +++ b/modules/17_production/flexreg_apr16/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/17_production/flexreg_apr16/postsolve.gms b/modules/17_production/flexreg_apr16/postsolve.gms index 8f3c089175..0d8e22852c 100644 --- a/modules/17_production/flexreg_apr16/postsolve.gms +++ b/modules/17_production/flexreg_apr16/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/17_production/flexreg_apr16/presolve.gms b/modules/17_production/flexreg_apr16/presolve.gms index 11712ffeff..09413ece73 100644 --- a/modules/17_production/flexreg_apr16/presolve.gms +++ b/modules/17_production/flexreg_apr16/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/17_production/flexreg_apr16/realization.gms b/modules/17_production/flexreg_apr16/realization.gms index 961ff5a3d7..5cd048ea68 100644 --- a/modules/17_production/flexreg_apr16/realization.gms +++ b/modules/17_production/flexreg_apr16/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/17_production/module.gms b/modules/17_production/module.gms index 179a3b04d2..b48703a7cd 100644 --- a/modules/17_production/module.gms +++ b/modules/17_production/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/18_residues/flexreg_apr16/declarations.gms b/modules/18_residues/flexreg_apr16/declarations.gms index e1556dc5ce..426853f7bd 100644 --- a/modules/18_residues/flexreg_apr16/declarations.gms +++ b/modules/18_residues/flexreg_apr16/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/18_residues/flexreg_apr16/equations.gms b/modules/18_residues/flexreg_apr16/equations.gms index 557848a686..3db046f02d 100644 --- a/modules/18_residues/flexreg_apr16/equations.gms +++ b/modules/18_residues/flexreg_apr16/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/18_residues/flexreg_apr16/input.gms b/modules/18_residues/flexreg_apr16/input.gms index df62c4279b..07b4709ce8 100644 --- a/modules/18_residues/flexreg_apr16/input.gms +++ b/modules/18_residues/flexreg_apr16/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/18_residues/flexreg_apr16/not_used.txt b/modules/18_residues/flexreg_apr16/not_used.txt deleted file mode 100644 index da77c77f60..0000000000 --- a/modules/18_residues/flexreg_apr16/not_used.txt +++ /dev/null @@ -1,8 +0,0 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de - -name,type,reason diff --git a/modules/18_residues/flexreg_apr16/postsolve.gms b/modules/18_residues/flexreg_apr16/postsolve.gms index 3e177fa2dc..31c4585f65 100644 --- a/modules/18_residues/flexreg_apr16/postsolve.gms +++ b/modules/18_residues/flexreg_apr16/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/18_residues/flexreg_apr16/preloop.gms b/modules/18_residues/flexreg_apr16/preloop.gms index 4c216c22cf..dd1bb671f2 100644 --- a/modules/18_residues/flexreg_apr16/preloop.gms +++ b/modules/18_residues/flexreg_apr16/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/18_residues/flexreg_apr16/presolve.gms b/modules/18_residues/flexreg_apr16/presolve.gms index 8103da8449..fcc66887d6 100644 --- a/modules/18_residues/flexreg_apr16/presolve.gms +++ b/modules/18_residues/flexreg_apr16/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/18_residues/flexreg_apr16/realization.gms b/modules/18_residues/flexreg_apr16/realization.gms index 6643b9f9f2..da093cda1d 100644 --- a/modules/18_residues/flexreg_apr16/realization.gms +++ b/modules/18_residues/flexreg_apr16/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/18_residues/flexreg_apr16/scaling.gms b/modules/18_residues/flexreg_apr16/scaling.gms index 060e1ef147..2e8ecb4d44 100644 --- a/modules/18_residues/flexreg_apr16/scaling.gms +++ b/modules/18_residues/flexreg_apr16/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/18_residues/flexreg_apr16/sets.gms b/modules/18_residues/flexreg_apr16/sets.gms index a439f79040..428ccd5dbf 100644 --- a/modules/18_residues/flexreg_apr16/sets.gms +++ b/modules/18_residues/flexreg_apr16/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/18_residues/module.gms b/modules/18_residues/module.gms index b1b28f9553..3ef463f67b 100644 --- a/modules/18_residues/module.gms +++ b/modules/18_residues/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/18_residues/off/declarations.gms b/modules/18_residues/off/declarations.gms index 7d90a6c43f..f5e40bb190 100644 --- a/modules/18_residues/off/declarations.gms +++ b/modules/18_residues/off/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/18_residues/off/input.gms b/modules/18_residues/off/input.gms index 5ae878a278..4eef38e1a3 100644 --- a/modules/18_residues/off/input.gms +++ b/modules/18_residues/off/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/18_residues/off/not_used.txt b/modules/18_residues/off/not_used.txt index 5a945bf91b..90acf4b328 100644 --- a/modules/18_residues/off/not_used.txt +++ b/modules/18_residues/off/not_used.txt @@ -1,10 +1,3 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de - name,type,reason im_development_state,input,questionnaire fm_attributes,input,questionnaire diff --git a/modules/18_residues/off/postsolve.gms b/modules/18_residues/off/postsolve.gms index 2f87180103..57e8d66e89 100644 --- a/modules/18_residues/off/postsolve.gms +++ b/modules/18_residues/off/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/18_residues/off/preloop.gms b/modules/18_residues/off/preloop.gms index 1feb2b12ca..e08cc17960 100644 --- a/modules/18_residues/off/preloop.gms +++ b/modules/18_residues/off/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/18_residues/off/realization.gms b/modules/18_residues/off/realization.gms index ec7f9fde9d..54c2183ab3 100644 --- a/modules/18_residues/off/realization.gms +++ b/modules/18_residues/off/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/18_residues/off/sets.gms b/modules/18_residues/off/sets.gms index 69c1f2ceed..50fb41c7f1 100644 --- a/modules/18_residues/off/sets.gms +++ b/modules/18_residues/off/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/20_processing/module.gms b/modules/20_processing/module.gms index a84ce6231e..bb7062d8c4 100644 --- a/modules/20_processing/module.gms +++ b/modules/20_processing/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/20_processing/substitution_may21/declarations.gms b/modules/20_processing/substitution_may21/declarations.gms index bcb470b13a..8fffb4af2e 100644 --- a/modules/20_processing/substitution_may21/declarations.gms +++ b/modules/20_processing/substitution_may21/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/20_processing/substitution_may21/equations.gms b/modules/20_processing/substitution_may21/equations.gms index dbb507807e..49b2e5f359 100644 --- a/modules/20_processing/substitution_may21/equations.gms +++ b/modules/20_processing/substitution_may21/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/20_processing/substitution_may21/input.gms b/modules/20_processing/substitution_may21/input.gms index 073cb50ee8..a4d97fa3b9 100644 --- a/modules/20_processing/substitution_may21/input.gms +++ b/modules/20_processing/substitution_may21/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/20_processing/substitution_may21/postsolve.gms b/modules/20_processing/substitution_may21/postsolve.gms index f6179bac21..400f7a3639 100644 --- a/modules/20_processing/substitution_may21/postsolve.gms +++ b/modules/20_processing/substitution_may21/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/20_processing/substitution_may21/preloop.gms b/modules/20_processing/substitution_may21/preloop.gms index 17087c32a1..8d47b6cf62 100644 --- a/modules/20_processing/substitution_may21/preloop.gms +++ b/modules/20_processing/substitution_may21/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/20_processing/substitution_may21/presolve.gms b/modules/20_processing/substitution_may21/presolve.gms index fd11e486f0..28b39775d6 100644 --- a/modules/20_processing/substitution_may21/presolve.gms +++ b/modules/20_processing/substitution_may21/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/20_processing/substitution_may21/realization.gms b/modules/20_processing/substitution_may21/realization.gms index 6e38695357..eceb1a3056 100644 --- a/modules/20_processing/substitution_may21/realization.gms +++ b/modules/20_processing/substitution_may21/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/20_processing/substitution_may21/scaling.gms b/modules/20_processing/substitution_may21/scaling.gms index e0e81b8e8a..1fabb75910 100644 --- a/modules/20_processing/substitution_may21/scaling.gms +++ b/modules/20_processing/substitution_may21/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/20_processing/substitution_may21/sets.gms b/modules/20_processing/substitution_may21/sets.gms index 5fe33cc5ff..a4811db385 100644 --- a/modules/20_processing/substitution_may21/sets.gms +++ b/modules/20_processing/substitution_may21/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/exo/declarations.gms b/modules/21_trade/exo/declarations.gms index ac4acd247b..cc3443bdf8 100644 --- a/modules/21_trade/exo/declarations.gms +++ b/modules/21_trade/exo/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/exo/equations.gms b/modules/21_trade/exo/equations.gms index b090ee67cd..02477ae315 100644 --- a/modules/21_trade/exo/equations.gms +++ b/modules/21_trade/exo/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/exo/input.gms b/modules/21_trade/exo/input.gms index 2d6b39d586..536c1dc76b 100644 --- a/modules/21_trade/exo/input.gms +++ b/modules/21_trade/exo/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/exo/postsolve.gms b/modules/21_trade/exo/postsolve.gms index 9e3b1f966f..11d3766fc9 100644 --- a/modules/21_trade/exo/postsolve.gms +++ b/modules/21_trade/exo/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/exo/preloop.gms b/modules/21_trade/exo/preloop.gms index c42d9470bf..29b3f14108 100644 --- a/modules/21_trade/exo/preloop.gms +++ b/modules/21_trade/exo/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/exo/realization.gms b/modules/21_trade/exo/realization.gms index 6edb0a1f1b..30541f9319 100644 --- a/modules/21_trade/exo/realization.gms +++ b/modules/21_trade/exo/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/exo/scaling.gms b/modules/21_trade/exo/scaling.gms index 82d4161764..18ecf3f022 100644 --- a/modules/21_trade/exo/scaling.gms +++ b/modules/21_trade/exo/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/free_apr16/declarations.gms b/modules/21_trade/free_apr16/declarations.gms index c6badc5a33..3f06ea91d3 100644 --- a/modules/21_trade/free_apr16/declarations.gms +++ b/modules/21_trade/free_apr16/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/free_apr16/equations.gms b/modules/21_trade/free_apr16/equations.gms index 8d6b61dcd4..72b49f63bc 100644 --- a/modules/21_trade/free_apr16/equations.gms +++ b/modules/21_trade/free_apr16/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/free_apr16/input.gms b/modules/21_trade/free_apr16/input.gms index 7971cf08e8..9e695e7f41 100644 --- a/modules/21_trade/free_apr16/input.gms +++ b/modules/21_trade/free_apr16/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/free_apr16/postsolve.gms b/modules/21_trade/free_apr16/postsolve.gms index d31d28781c..601fd3823e 100644 --- a/modules/21_trade/free_apr16/postsolve.gms +++ b/modules/21_trade/free_apr16/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/free_apr16/preloop.gms b/modules/21_trade/free_apr16/preloop.gms index d5a558bb5e..a71c3b75c3 100644 --- a/modules/21_trade/free_apr16/preloop.gms +++ b/modules/21_trade/free_apr16/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/free_apr16/realization.gms b/modules/21_trade/free_apr16/realization.gms index ab85996f7f..6e3f83d5d9 100644 --- a/modules/21_trade/free_apr16/realization.gms +++ b/modules/21_trade/free_apr16/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/free_apr16/sets.gms b/modules/21_trade/free_apr16/sets.gms index a7b5fa7bd1..19db0f2d6f 100644 --- a/modules/21_trade/free_apr16/sets.gms +++ b/modules/21_trade/free_apr16/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/module.gms b/modules/21_trade/module.gms index 721d0eeb0f..95d390049b 100644 --- a/modules/21_trade/module.gms +++ b/modules/21_trade/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/off/declarations.gms b/modules/21_trade/off/declarations.gms index fd758124f7..0b1e72e5bf 100644 --- a/modules/21_trade/off/declarations.gms +++ b/modules/21_trade/off/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/off/equations.gms b/modules/21_trade/off/equations.gms index b5b3d41a3b..42c20f43c8 100644 --- a/modules/21_trade/off/equations.gms +++ b/modules/21_trade/off/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/off/input.gms b/modules/21_trade/off/input.gms index 2d6b39d586..536c1dc76b 100644 --- a/modules/21_trade/off/input.gms +++ b/modules/21_trade/off/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/off/postsolve.gms b/modules/21_trade/off/postsolve.gms index 0b62f2ecc3..a414883e5f 100644 --- a/modules/21_trade/off/postsolve.gms +++ b/modules/21_trade/off/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/off/preloop.gms b/modules/21_trade/off/preloop.gms index 92eaab8254..7e9c520fd8 100644 --- a/modules/21_trade/off/preloop.gms +++ b/modules/21_trade/off/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/off/realization.gms b/modules/21_trade/off/realization.gms index ad8a0c5736..3e5bed0943 100644 --- a/modules/21_trade/off/realization.gms +++ b/modules/21_trade/off/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/selfsuff_reduced/declarations.gms b/modules/21_trade/selfsuff_reduced/declarations.gms index 078723234e..480b010696 100644 --- a/modules/21_trade/selfsuff_reduced/declarations.gms +++ b/modules/21_trade/selfsuff_reduced/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/selfsuff_reduced/equations.gms b/modules/21_trade/selfsuff_reduced/equations.gms index acab24a577..3cfe741cc5 100644 --- a/modules/21_trade/selfsuff_reduced/equations.gms +++ b/modules/21_trade/selfsuff_reduced/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/selfsuff_reduced/input.gms b/modules/21_trade/selfsuff_reduced/input.gms index 0f2e079bed..1185f72439 100644 --- a/modules/21_trade/selfsuff_reduced/input.gms +++ b/modules/21_trade/selfsuff_reduced/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/selfsuff_reduced/postsolve.gms b/modules/21_trade/selfsuff_reduced/postsolve.gms index 3dc800f105..e9626ade70 100644 --- a/modules/21_trade/selfsuff_reduced/postsolve.gms +++ b/modules/21_trade/selfsuff_reduced/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/selfsuff_reduced/preloop.gms b/modules/21_trade/selfsuff_reduced/preloop.gms index 16f9e874ea..b336661fbd 100644 --- a/modules/21_trade/selfsuff_reduced/preloop.gms +++ b/modules/21_trade/selfsuff_reduced/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/selfsuff_reduced/realization.gms b/modules/21_trade/selfsuff_reduced/realization.gms index 625809b317..db2e26e34a 100644 --- a/modules/21_trade/selfsuff_reduced/realization.gms +++ b/modules/21_trade/selfsuff_reduced/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/selfsuff_reduced/scaling.gms b/modules/21_trade/selfsuff_reduced/scaling.gms index 3d8a2774cd..16f66cac53 100644 --- a/modules/21_trade/selfsuff_reduced/scaling.gms +++ b/modules/21_trade/selfsuff_reduced/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/21_trade/selfsuff_reduced/sets.gms b/modules/21_trade/selfsuff_reduced/sets.gms index 96cc351c07..c1a76fa8a3 100644 --- a/modules/21_trade/selfsuff_reduced/sets.gms +++ b/modules/21_trade/selfsuff_reduced/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/22_land_conservation/area_based_apr22/declarations.gms b/modules/22_land_conservation/area_based_apr22/declarations.gms index ab7b8260a3..68fbd9fafa 100644 --- a/modules/22_land_conservation/area_based_apr22/declarations.gms +++ b/modules/22_land_conservation/area_based_apr22/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/22_land_conservation/area_based_apr22/input.gms b/modules/22_land_conservation/area_based_apr22/input.gms index e60cdd1ca6..31c7066dd6 100644 --- a/modules/22_land_conservation/area_based_apr22/input.gms +++ b/modules/22_land_conservation/area_based_apr22/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/22_land_conservation/area_based_apr22/preloop.gms b/modules/22_land_conservation/area_based_apr22/preloop.gms index ae8c9434a9..965c36f7d2 100644 --- a/modules/22_land_conservation/area_based_apr22/preloop.gms +++ b/modules/22_land_conservation/area_based_apr22/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/22_land_conservation/area_based_apr22/presolve.gms b/modules/22_land_conservation/area_based_apr22/presolve.gms index 34a1264f39..542ab0ad87 100644 --- a/modules/22_land_conservation/area_based_apr22/presolve.gms +++ b/modules/22_land_conservation/area_based_apr22/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/22_land_conservation/area_based_apr22/realization.gms b/modules/22_land_conservation/area_based_apr22/realization.gms index 69d72b8f1e..493ad0414c 100644 --- a/modules/22_land_conservation/area_based_apr22/realization.gms +++ b/modules/22_land_conservation/area_based_apr22/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/22_land_conservation/area_based_apr22/sets.gms b/modules/22_land_conservation/area_based_apr22/sets.gms index 2ccd5be9f0..f197f72fbc 100644 --- a/modules/22_land_conservation/area_based_apr22/sets.gms +++ b/modules/22_land_conservation/area_based_apr22/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/22_land_conservation/module.gms b/modules/22_land_conservation/module.gms index a4cb9076a2..6b4cdf48b0 100644 --- a/modules/22_land_conservation/module.gms +++ b/modules/22_land_conservation/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/29_ageclass/feb21/declarations.gms b/modules/29_ageclass/feb21/declarations.gms index ed2d5d10eb..f1aef51a7f 100644 --- a/modules/29_ageclass/feb21/declarations.gms +++ b/modules/29_ageclass/feb21/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/29_ageclass/feb21/input.gms b/modules/29_ageclass/feb21/input.gms index ef340c6e29..cfabaa0fcf 100644 --- a/modules/29_ageclass/feb21/input.gms +++ b/modules/29_ageclass/feb21/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/29_ageclass/feb21/preloop.gms b/modules/29_ageclass/feb21/preloop.gms index 76900ff709..0d6b2c88f5 100644 --- a/modules/29_ageclass/feb21/preloop.gms +++ b/modules/29_ageclass/feb21/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/29_ageclass/feb21/realization.gms b/modules/29_ageclass/feb21/realization.gms index 0a8f6fab35..7fe7990889 100644 --- a/modules/29_ageclass/feb21/realization.gms +++ b/modules/29_ageclass/feb21/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/29_ageclass/feb21/sets.gms b/modules/29_ageclass/feb21/sets.gms index 7e57679e1f..2f1910db43 100644 --- a/modules/29_ageclass/feb21/sets.gms +++ b/modules/29_ageclass/feb21/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/29_ageclass/module.gms b/modules/29_ageclass/module.gms index 72b994682e..17a3499c44 100644 --- a/modules/29_ageclass/module.gms +++ b/modules/29_ageclass/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/endo_apr21/declarations.gms b/modules/30_crop/endo_apr21/declarations.gms index 41f032f9e0..628262432a 100644 --- a/modules/30_crop/endo_apr21/declarations.gms +++ b/modules/30_crop/endo_apr21/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/endo_apr21/equations.gms b/modules/30_crop/endo_apr21/equations.gms index a5381a2c28..d541c4aa22 100644 --- a/modules/30_crop/endo_apr21/equations.gms +++ b/modules/30_crop/endo_apr21/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/endo_apr21/input.gms b/modules/30_crop/endo_apr21/input.gms index 172e6ff01b..3ac1cb1711 100644 --- a/modules/30_crop/endo_apr21/input.gms +++ b/modules/30_crop/endo_apr21/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -11,7 +11,7 @@ $setglobal c30_bioen_type all $setglobal c30_bioen_water rainfed * options: rainfed, irrigated, all -$setglobal c30_marginal_land all_marginal +$setglobal c30_marginal_land q33_marginal * options: all_marginal, q33_marginal, no_marginal $setglobal c30_snv_target none diff --git a/modules/30_crop/endo_apr21/postsolve.gms b/modules/30_crop/endo_apr21/postsolve.gms index a7595a302f..33550027e2 100644 --- a/modules/30_crop/endo_apr21/postsolve.gms +++ b/modules/30_crop/endo_apr21/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/endo_apr21/preloop.gms b/modules/30_crop/endo_apr21/preloop.gms index ec73d21bfd..695f756062 100644 --- a/modules/30_crop/endo_apr21/preloop.gms +++ b/modules/30_crop/endo_apr21/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/endo_apr21/presolve.gms b/modules/30_crop/endo_apr21/presolve.gms index d92785bca8..bc696e585f 100644 --- a/modules/30_crop/endo_apr21/presolve.gms +++ b/modules/30_crop/endo_apr21/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/endo_apr21/realization.gms b/modules/30_crop/endo_apr21/realization.gms index 19b027c236..fd9be43c26 100644 --- a/modules/30_crop/endo_apr21/realization.gms +++ b/modules/30_crop/endo_apr21/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/endo_apr21/sets.gms b/modules/30_crop/endo_apr21/sets.gms index 0798f471f1..e32d366b49 100644 --- a/modules/30_crop/endo_apr21/sets.gms +++ b/modules/30_crop/endo_apr21/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/module.gms b/modules/30_crop/module.gms index 39bf4f7194..73818d856a 100644 --- a/modules/30_crop/module.gms +++ b/modules/30_crop/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/penalty_apr22/declarations.gms b/modules/30_crop/penalty_apr22/declarations.gms index 29532a7550..9f5120b9ca 100644 --- a/modules/30_crop/penalty_apr22/declarations.gms +++ b/modules/30_crop/penalty_apr22/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/penalty_apr22/equations.gms b/modules/30_crop/penalty_apr22/equations.gms index e9ea577623..fd0dcbe02f 100644 --- a/modules/30_crop/penalty_apr22/equations.gms +++ b/modules/30_crop/penalty_apr22/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/penalty_apr22/input.gms b/modules/30_crop/penalty_apr22/input.gms index df454e5314..e900cecf75 100644 --- a/modules/30_crop/penalty_apr22/input.gms +++ b/modules/30_crop/penalty_apr22/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/penalty_apr22/postsolve.gms b/modules/30_crop/penalty_apr22/postsolve.gms index f20f51a30e..1f3170e857 100644 --- a/modules/30_crop/penalty_apr22/postsolve.gms +++ b/modules/30_crop/penalty_apr22/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/penalty_apr22/preloop.gms b/modules/30_crop/penalty_apr22/preloop.gms index ee0543fd4a..ee7f996e18 100644 --- a/modules/30_crop/penalty_apr22/preloop.gms +++ b/modules/30_crop/penalty_apr22/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/penalty_apr22/presolve.gms b/modules/30_crop/penalty_apr22/presolve.gms index 5b79db5559..16e9d24a77 100644 --- a/modules/30_crop/penalty_apr22/presolve.gms +++ b/modules/30_crop/penalty_apr22/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/penalty_apr22/realization.gms b/modules/30_crop/penalty_apr22/realization.gms index 973f02a399..a30f945b3f 100644 --- a/modules/30_crop/penalty_apr22/realization.gms +++ b/modules/30_crop/penalty_apr22/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/penalty_apr22/sets.gms b/modules/30_crop/penalty_apr22/sets.gms index 49e76c0d6a..fbc8b37adc 100644 --- a/modules/30_crop/penalty_apr22/sets.gms +++ b/modules/30_crop/penalty_apr22/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/rotation_apr22/declarations.gms b/modules/30_crop/rotation_apr22/declarations.gms index 722bd81163..4fd7cb47e2 100644 --- a/modules/30_crop/rotation_apr22/declarations.gms +++ b/modules/30_crop/rotation_apr22/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/rotation_apr22/equations.gms b/modules/30_crop/rotation_apr22/equations.gms index 4f29803587..51fdf2115a 100644 --- a/modules/30_crop/rotation_apr22/equations.gms +++ b/modules/30_crop/rotation_apr22/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/rotation_apr22/input.gms b/modules/30_crop/rotation_apr22/input.gms index 02db361041..f626fa5074 100644 --- a/modules/30_crop/rotation_apr22/input.gms +++ b/modules/30_crop/rotation_apr22/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/rotation_apr22/postsolve.gms b/modules/30_crop/rotation_apr22/postsolve.gms index 5da0aff9db..f0dddfe6f9 100644 --- a/modules/30_crop/rotation_apr22/postsolve.gms +++ b/modules/30_crop/rotation_apr22/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/rotation_apr22/preloop.gms b/modules/30_crop/rotation_apr22/preloop.gms index 11f0f80929..feaa2aeed3 100644 --- a/modules/30_crop/rotation_apr22/preloop.gms +++ b/modules/30_crop/rotation_apr22/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/rotation_apr22/presolve.gms b/modules/30_crop/rotation_apr22/presolve.gms index b4b10137f6..717c62599f 100644 --- a/modules/30_crop/rotation_apr22/presolve.gms +++ b/modules/30_crop/rotation_apr22/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/rotation_apr22/realization.gms b/modules/30_crop/rotation_apr22/realization.gms index 8b91f973c8..c44c0f6d12 100644 --- a/modules/30_crop/rotation_apr22/realization.gms +++ b/modules/30_crop/rotation_apr22/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/30_crop/rotation_apr22/sets.gms b/modules/30_crop/rotation_apr22/sets.gms index 692cd83fe7..d519f0f135 100644 --- a/modules/30_crop/rotation_apr22/sets.gms +++ b/modules/30_crop/rotation_apr22/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/31_past/endo_jun13/declarations.gms b/modules/31_past/endo_jun13/declarations.gms index af5d5b8edb..71a71a7e36 100644 --- a/modules/31_past/endo_jun13/declarations.gms +++ b/modules/31_past/endo_jun13/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/31_past/endo_jun13/equations.gms b/modules/31_past/endo_jun13/equations.gms index 6b6e3ab256..b49c90cbc4 100644 --- a/modules/31_past/endo_jun13/equations.gms +++ b/modules/31_past/endo_jun13/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/31_past/endo_jun13/input.gms b/modules/31_past/endo_jun13/input.gms index 932ee3d1b6..a7389a7f47 100644 --- a/modules/31_past/endo_jun13/input.gms +++ b/modules/31_past/endo_jun13/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/31_past/endo_jun13/not_used.txt b/modules/31_past/endo_jun13/not_used.txt index c9f57e05c6..c31fd9593e 100644 --- a/modules/31_past/endo_jun13/not_used.txt +++ b/modules/31_past/endo_jun13/not_used.txt @@ -1,10 +1,3 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de - name,type,reason pcm_land, input, not needed vm_tau,input,questionnaire diff --git a/modules/31_past/endo_jun13/postsolve.gms b/modules/31_past/endo_jun13/postsolve.gms index 003afac326..0e9e7046ff 100644 --- a/modules/31_past/endo_jun13/postsolve.gms +++ b/modules/31_past/endo_jun13/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/31_past/endo_jun13/presolve.gms b/modules/31_past/endo_jun13/presolve.gms index 32dc96950d..ac1ca86a72 100644 --- a/modules/31_past/endo_jun13/presolve.gms +++ b/modules/31_past/endo_jun13/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/31_past/endo_jun13/realization.gms b/modules/31_past/endo_jun13/realization.gms index 21a303e9cf..541cef90a5 100644 --- a/modules/31_past/endo_jun13/realization.gms +++ b/modules/31_past/endo_jun13/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/31_past/grasslands_apr22/declarations.gms b/modules/31_past/grasslands_apr22/declarations.gms index b34bb4dc54..db0a85cc4d 100644 --- a/modules/31_past/grasslands_apr22/declarations.gms +++ b/modules/31_past/grasslands_apr22/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/31_past/grasslands_apr22/equations.gms b/modules/31_past/grasslands_apr22/equations.gms index 25bbc29b25..87cd73a08a 100644 --- a/modules/31_past/grasslands_apr22/equations.gms +++ b/modules/31_past/grasslands_apr22/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/31_past/grasslands_apr22/input.gms b/modules/31_past/grasslands_apr22/input.gms index 83e3b30edb..03a32fcd1c 100644 --- a/modules/31_past/grasslands_apr22/input.gms +++ b/modules/31_past/grasslands_apr22/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/31_past/grasslands_apr22/not_used.txt b/modules/31_past/grasslands_apr22/not_used.txt index ca62c748a6..d1f943c5f1 100644 --- a/modules/31_past/grasslands_apr22/not_used.txt +++ b/modules/31_past/grasslands_apr22/not_used.txt @@ -1,10 +1,3 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de - name,type,reason pcm_land, input, not needed vm_yld,variable, not needed diff --git a/modules/31_past/grasslands_apr22/postsolve.gms b/modules/31_past/grasslands_apr22/postsolve.gms index ed852398bc..1e49507775 100644 --- a/modules/31_past/grasslands_apr22/postsolve.gms +++ b/modules/31_past/grasslands_apr22/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/31_past/grasslands_apr22/preloop.gms b/modules/31_past/grasslands_apr22/preloop.gms index e7325a2458..823800da10 100644 --- a/modules/31_past/grasslands_apr22/preloop.gms +++ b/modules/31_past/grasslands_apr22/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/31_past/grasslands_apr22/presolve.gms b/modules/31_past/grasslands_apr22/presolve.gms index 695a5e8f3d..c0fe50de66 100644 --- a/modules/31_past/grasslands_apr22/presolve.gms +++ b/modules/31_past/grasslands_apr22/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/31_past/grasslands_apr22/realization.gms b/modules/31_past/grasslands_apr22/realization.gms index 49550d6e49..595ecb1085 100644 --- a/modules/31_past/grasslands_apr22/realization.gms +++ b/modules/31_past/grasslands_apr22/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -20,7 +20,9 @@ *' calculated in [50_nr_soil_budget] and control the balance between intensive and *' extensive grass biomass production. -*' @limitations We currently do not accout for specific differences within intensive +*' @limitations At the moment this realization only runs with a single climate scenario +*' (SPP1-RCP2p6 from MRI_ESM-0), which is used in all (except constant climate) settings. +*' We currently do not accout for specific differences within intensive *' pasture management systems and related degradation of grasslands for both *' rangelands or managed pastures. Grass production costs and conversion costs between *' grassland types are set 1 USD05MER per unit due to lack of data. diff --git a/modules/31_past/grasslands_apr22/sets.gms b/modules/31_past/grasslands_apr22/sets.gms index f1899e7e5e..a157221583 100644 --- a/modules/31_past/grasslands_apr22/sets.gms +++ b/modules/31_past/grasslands_apr22/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/31_past/module.gms b/modules/31_past/module.gms index a0cff736c8..7d2f5fca6f 100644 --- a/modules/31_past/module.gms +++ b/modules/31_past/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/31_past/static/not_used.txt b/modules/31_past/static/not_used.txt index c0321b800a..f5859048db 100644 --- a/modules/31_past/static/not_used.txt +++ b/modules/31_past/static/not_used.txt @@ -1,10 +1,3 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de - name,type,reason vm_prod, input, not needed vm_yld, input, not needed diff --git a/modules/31_past/static/presolve.gms b/modules/31_past/static/presolve.gms index fedff745b2..aae09b9dcb 100644 --- a/modules/31_past/static/presolve.gms +++ b/modules/31_past/static/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/31_past/static/realization.gms b/modules/31_past/static/realization.gms index 5abb7fb86b..d68c45ba51 100644 --- a/modules/31_past/static/realization.gms +++ b/modules/31_past/static/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/32_forestry/dynamic_feb21/declarations.gms b/modules/32_forestry/dynamic_feb21/declarations.gms index e4b9bd4fac..ab53f9a802 100644 --- a/modules/32_forestry/dynamic_feb21/declarations.gms +++ b/modules/32_forestry/dynamic_feb21/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/32_forestry/dynamic_feb21/equations.gms b/modules/32_forestry/dynamic_feb21/equations.gms index 211a5ab0b9..9eb5d1353a 100644 --- a/modules/32_forestry/dynamic_feb21/equations.gms +++ b/modules/32_forestry/dynamic_feb21/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/32_forestry/dynamic_feb21/input.gms b/modules/32_forestry/dynamic_feb21/input.gms index eae0ec0281..9501611b0c 100644 --- a/modules/32_forestry/dynamic_feb21/input.gms +++ b/modules/32_forestry/dynamic_feb21/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/32_forestry/dynamic_feb21/postsolve.gms b/modules/32_forestry/dynamic_feb21/postsolve.gms index 7c02938f69..c8d03d0a2e 100644 --- a/modules/32_forestry/dynamic_feb21/postsolve.gms +++ b/modules/32_forestry/dynamic_feb21/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/32_forestry/dynamic_feb21/preloop.gms b/modules/32_forestry/dynamic_feb21/preloop.gms index ca85f37693..193293fac1 100644 --- a/modules/32_forestry/dynamic_feb21/preloop.gms +++ b/modules/32_forestry/dynamic_feb21/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/32_forestry/dynamic_feb21/presolve.gms b/modules/32_forestry/dynamic_feb21/presolve.gms index 98b4c1fa14..5e6e49eaee 100644 --- a/modules/32_forestry/dynamic_feb21/presolve.gms +++ b/modules/32_forestry/dynamic_feb21/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/32_forestry/dynamic_feb21/realization.gms b/modules/32_forestry/dynamic_feb21/realization.gms index 49cd1cfa9b..9d61742870 100644 --- a/modules/32_forestry/dynamic_feb21/realization.gms +++ b/modules/32_forestry/dynamic_feb21/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/32_forestry/dynamic_feb21/scaling.gms b/modules/32_forestry/dynamic_feb21/scaling.gms index 4583858706..ddc68df6ae 100644 --- a/modules/32_forestry/dynamic_feb21/scaling.gms +++ b/modules/32_forestry/dynamic_feb21/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -9,4 +9,4 @@ v32_cost_establishment.scale(i) = 10e3; v32_cost_recur.scale(i) = 10e4; vm_cost_fore.scale(i) = 10e4; v32_cost_hvarea.scale(i)$(s32_hvarea = 1 OR s32_hvarea = 2) = 10e3; -vm_cdr_aff.scale(j,ac,aff_effect) = 10e-4; \ No newline at end of file +vm_cdr_aff.scale(j,ac,aff_effect) = 10e-4; diff --git a/modules/32_forestry/dynamic_feb21/sets.gms b/modules/32_forestry/dynamic_feb21/sets.gms index 61e883921a..5b4b725355 100644 --- a/modules/32_forestry/dynamic_feb21/sets.gms +++ b/modules/32_forestry/dynamic_feb21/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/32_forestry/module.gms b/modules/32_forestry/module.gms index 3ecb5b0c1e..f929157732 100644 --- a/modules/32_forestry/module.gms +++ b/modules/32_forestry/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/34_urban/exo_nov21/declarations.gms b/modules/34_urban/exo_nov21/declarations.gms index f604082bf1..c5eeb916cd 100644 --- a/modules/34_urban/exo_nov21/declarations.gms +++ b/modules/34_urban/exo_nov21/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/34_urban/exo_nov21/equations.gms b/modules/34_urban/exo_nov21/equations.gms index a582f37c1e..439b589307 100644 --- a/modules/34_urban/exo_nov21/equations.gms +++ b/modules/34_urban/exo_nov21/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2020 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/34_urban/exo_nov21/input.gms b/modules/34_urban/exo_nov21/input.gms index 14557ef5e8..f813421563 100644 --- a/modules/34_urban/exo_nov21/input.gms +++ b/modules/34_urban/exo_nov21/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/34_urban/exo_nov21/postsolve.gms b/modules/34_urban/exo_nov21/postsolve.gms index 7d53c4a381..adcb13eb6d 100644 --- a/modules/34_urban/exo_nov21/postsolve.gms +++ b/modules/34_urban/exo_nov21/postsolve.gms @@ -1,3 +1,9 @@ +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) +*** | authors, and contributors see CITATION.cff file. This file is part +*** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of +*** | AGPL-3.0, you are granted additional permissions described in the +*** | MAgPIE License Exception, version 1.0 (see LICENSE file). +*** | Contact: magpie@pik-potsdam.de *#################### R SECTION START (OUTPUT DEFINITIONS) ##################### ov_cost_urban(t,j,"marginal") = vm_cost_urban.m(j); diff --git a/modules/34_urban/exo_nov21/preloop.gms b/modules/34_urban/exo_nov21/preloop.gms index 962cabf4fc..2b4d7a33d4 100644 --- a/modules/34_urban/exo_nov21/preloop.gms +++ b/modules/34_urban/exo_nov21/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/34_urban/exo_nov21/presolve.gms b/modules/34_urban/exo_nov21/presolve.gms index 83b18a4dcb..7778517cba 100644 --- a/modules/34_urban/exo_nov21/presolve.gms +++ b/modules/34_urban/exo_nov21/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/34_urban/exo_nov21/realization.gms b/modules/34_urban/exo_nov21/realization.gms index 6aa9db2dd4..e3ebf563c1 100644 --- a/modules/34_urban/exo_nov21/realization.gms +++ b/modules/34_urban/exo_nov21/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/34_urban/exo_nov21/sets.gms b/modules/34_urban/exo_nov21/sets.gms index 8b1a2ff322..9deca440e6 100644 --- a/modules/34_urban/exo_nov21/sets.gms +++ b/modules/34_urban/exo_nov21/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/34_urban/module.gms b/modules/34_urban/module.gms index d696cf34f5..87717d90ba 100644 --- a/modules/34_urban/module.gms +++ b/modules/34_urban/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/34_urban/static/declarations.gms b/modules/34_urban/static/declarations.gms index bcedfa39e1..b10705525c 100644 --- a/modules/34_urban/static/declarations.gms +++ b/modules/34_urban/static/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/34_urban/static/not_used.txt b/modules/34_urban/static/not_used.txt index 931a2fa26c..34cfdad4f1 100644 --- a/modules/34_urban/static/not_used.txt +++ b/modules/34_urban/static/not_used.txt @@ -1,9 +1,2 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de - name,type,reason sm_fix_SSP2, input, not needed diff --git a/modules/34_urban/static/postsolve.gms b/modules/34_urban/static/postsolve.gms index 7df7c8f0ea..e6e6b4fa09 100644 --- a/modules/34_urban/static/postsolve.gms +++ b/modules/34_urban/static/postsolve.gms @@ -1,3 +1,9 @@ +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) +*** | authors, and contributors see CITATION.cff file. This file is part +*** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of +*** | AGPL-3.0, you are granted additional permissions described in the +*** | MAgPIE License Exception, version 1.0 (see LICENSE file). +*** | Contact: magpie@pik-potsdam.de *#################### R SECTION START (OUTPUT DEFINITIONS) ##################### ov_cost_urban(t,j,"marginal") = vm_cost_urban.m(j); diff --git a/modules/34_urban/static/presolve.gms b/modules/34_urban/static/presolve.gms index d65067fbed..5f63a3abff 100644 --- a/modules/34_urban/static/presolve.gms +++ b/modules/34_urban/static/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/34_urban/static/realization.gms b/modules/34_urban/static/realization.gms index aaac349281..a4cb3a288e 100644 --- a/modules/34_urban/static/realization.gms +++ b/modules/34_urban/static/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/35_natveg/dynamic_feb21/declarations.gms b/modules/35_natveg/dynamic_feb21/declarations.gms index ccf01cd0d4..da0c2f0ae2 100644 --- a/modules/35_natveg/dynamic_feb21/declarations.gms +++ b/modules/35_natveg/dynamic_feb21/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/35_natveg/dynamic_feb21/equations.gms b/modules/35_natveg/dynamic_feb21/equations.gms index 668b24bd9f..2165cd902f 100644 --- a/modules/35_natveg/dynamic_feb21/equations.gms +++ b/modules/35_natveg/dynamic_feb21/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/35_natveg/dynamic_feb21/input.gms b/modules/35_natveg/dynamic_feb21/input.gms index 49f6b5311c..ada994a1f7 100644 --- a/modules/35_natveg/dynamic_feb21/input.gms +++ b/modules/35_natveg/dynamic_feb21/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/35_natveg/dynamic_feb21/postsolve.gms b/modules/35_natveg/dynamic_feb21/postsolve.gms index b7897ed5da..085cb4c533 100644 --- a/modules/35_natveg/dynamic_feb21/postsolve.gms +++ b/modules/35_natveg/dynamic_feb21/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/35_natveg/dynamic_feb21/preloop.gms b/modules/35_natveg/dynamic_feb21/preloop.gms index a6bb36f790..ca43d396b5 100644 --- a/modules/35_natveg/dynamic_feb21/preloop.gms +++ b/modules/35_natveg/dynamic_feb21/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/35_natveg/dynamic_feb21/presolve.gms b/modules/35_natveg/dynamic_feb21/presolve.gms index bb7a405c05..f3755373da 100644 --- a/modules/35_natveg/dynamic_feb21/presolve.gms +++ b/modules/35_natveg/dynamic_feb21/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/35_natveg/dynamic_feb21/realization.gms b/modules/35_natveg/dynamic_feb21/realization.gms index 5cabc3dec4..df9c626401 100644 --- a/modules/35_natveg/dynamic_feb21/realization.gms +++ b/modules/35_natveg/dynamic_feb21/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/35_natveg/dynamic_feb21/scaling.gms b/modules/35_natveg/dynamic_feb21/scaling.gms index b3f402344a..449a174513 100644 --- a/modules/35_natveg/dynamic_feb21/scaling.gms +++ b/modules/35_natveg/dynamic_feb21/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/35_natveg/dynamic_feb21/sets.gms b/modules/35_natveg/dynamic_feb21/sets.gms index d8276dcc04..16fe071951 100644 --- a/modules/35_natveg/dynamic_feb21/sets.gms +++ b/modules/35_natveg/dynamic_feb21/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/35_natveg/module.gms b/modules/35_natveg/module.gms index 42557fe1ba..84d794878d 100644 --- a/modules/35_natveg/module.gms +++ b/modules/35_natveg/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/36_employment/exo_may22/declarations.gms b/modules/36_employment/exo_may22/declarations.gms index 244c2632a3..044705a828 100644 --- a/modules/36_employment/exo_may22/declarations.gms +++ b/modules/36_employment/exo_may22/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/36_employment/exo_may22/equations.gms b/modules/36_employment/exo_may22/equations.gms index 3d12fe9a52..b1f0ac5db4 100644 --- a/modules/36_employment/exo_may22/equations.gms +++ b/modules/36_employment/exo_may22/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -25,4 +25,4 @@ q36_employment(i2) .. v36_employment(i2) (1 / sum(ct,f36_weekly_hours(ct,i2)*s36_weeks_in_year*pm_hourly_costs(ct,i2,"scenario"))); q36_employment_maccs(i2) .. v36_employment_maccs(i2) - =e= (vm_maccs_costs(i2,"labor")) * (1 / sum(ct,f36_weekly_hours(ct,i2)*s36_weeks_in_year*pm_hourly_costs(ct,i2,"scenario"))); \ No newline at end of file + =e= (vm_maccs_costs(i2,"labor")) * (1 / sum(ct,f36_weekly_hours(ct,i2)*s36_weeks_in_year*pm_hourly_costs(ct,i2,"scenario"))); diff --git a/modules/36_employment/exo_may22/input.gms b/modules/36_employment/exo_may22/input.gms index 58d998db51..1aa948f8bc 100644 --- a/modules/36_employment/exo_may22/input.gms +++ b/modules/36_employment/exo_may22/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/36_employment/exo_may22/postsolve.gms b/modules/36_employment/exo_may22/postsolve.gms index 6a0a4645c0..c577467cd0 100644 --- a/modules/36_employment/exo_may22/postsolve.gms +++ b/modules/36_employment/exo_may22/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/36_employment/exo_may22/preloop.gms b/modules/36_employment/exo_may22/preloop.gms index d346a7697f..f2fba081bc 100644 --- a/modules/36_employment/exo_may22/preloop.gms +++ b/modules/36_employment/exo_may22/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/36_employment/exo_may22/presolve.gms b/modules/36_employment/exo_may22/presolve.gms index 9ed1c7f94d..310c2b8b49 100644 --- a/modules/36_employment/exo_may22/presolve.gms +++ b/modules/36_employment/exo_may22/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/36_employment/exo_may22/realization.gms b/modules/36_employment/exo_may22/realization.gms index 39c8ba0df3..a2928b7558 100644 --- a/modules/36_employment/exo_may22/realization.gms +++ b/modules/36_employment/exo_may22/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/36_employment/exo_may22/sets.gms b/modules/36_employment/exo_may22/sets.gms index 71a1244476..8e165f7fc9 100644 --- a/modules/36_employment/exo_may22/sets.gms +++ b/modules/36_employment/exo_may22/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/36_employment/module.gms b/modules/36_employment/module.gms index 6146194c86..c89453c476 100644 --- a/modules/36_employment/module.gms +++ b/modules/36_employment/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/37_labor_prod/exo/declarations.gms b/modules/37_labor_prod/exo/declarations.gms index 108cada268..4a0f559c26 100644 --- a/modules/37_labor_prod/exo/declarations.gms +++ b/modules/37_labor_prod/exo/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/37_labor_prod/exo/input.gms b/modules/37_labor_prod/exo/input.gms index 4ada020252..a48acce9da 100644 --- a/modules/37_labor_prod/exo/input.gms +++ b/modules/37_labor_prod/exo/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/37_labor_prod/exo/preloop.gms b/modules/37_labor_prod/exo/preloop.gms index 4e44feaa3a..031926df7d 100644 --- a/modules/37_labor_prod/exo/preloop.gms +++ b/modules/37_labor_prod/exo/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/37_labor_prod/exo/realization.gms b/modules/37_labor_prod/exo/realization.gms index b671870aef..b9df9ff215 100644 --- a/modules/37_labor_prod/exo/realization.gms +++ b/modules/37_labor_prod/exo/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/37_labor_prod/exo/sets.gms b/modules/37_labor_prod/exo/sets.gms index 4b35d1e879..0d5c17cf86 100644 --- a/modules/37_labor_prod/exo/sets.gms +++ b/modules/37_labor_prod/exo/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -17,4 +17,4 @@ sets uncertainty37 ESM uncertainty / enslower,ensmean,ensupper / -; \ No newline at end of file +; diff --git a/modules/37_labor_prod/module.gms b/modules/37_labor_prod/module.gms index af6bcc4f93..2786ac1d91 100644 --- a/modules/37_labor_prod/module.gms +++ b/modules/37_labor_prod/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/37_labor_prod/off/declarations.gms b/modules/37_labor_prod/off/declarations.gms index 108cada268..4a0f559c26 100644 --- a/modules/37_labor_prod/off/declarations.gms +++ b/modules/37_labor_prod/off/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/37_labor_prod/off/not_used.txt b/modules/37_labor_prod/off/not_used.txt index 031fa4d76a..4e00cebf8c 100644 --- a/modules/37_labor_prod/off/not_used.txt +++ b/modules/37_labor_prod/off/not_used.txt @@ -1,9 +1,2 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de - name,type,reason sm_fix_cc,input,questionnaire diff --git a/modules/37_labor_prod/off/preloop.gms b/modules/37_labor_prod/off/preloop.gms index d8e53fc197..b214fe4fc9 100644 --- a/modules/37_labor_prod/off/preloop.gms +++ b/modules/37_labor_prod/off/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/37_labor_prod/off/realization.gms b/modules/37_labor_prod/off/realization.gms index 53baef732f..0fc96fbd74 100644 --- a/modules/37_labor_prod/off/realization.gms +++ b/modules/37_labor_prod/off/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/38_factor_costs/module.gms b/modules/38_factor_costs/module.gms index b9fe948557..5cd8dde675 100644 --- a/modules/38_factor_costs/module.gms +++ b/modules/38_factor_costs/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/38_factor_costs/per_ton_fao_may22/declarations.gms b/modules/38_factor_costs/per_ton_fao_may22/declarations.gms index 4bb446b07d..2591939de5 100644 --- a/modules/38_factor_costs/per_ton_fao_may22/declarations.gms +++ b/modules/38_factor_costs/per_ton_fao_may22/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -11,18 +11,18 @@ q38_cost_prod_crop_capital(i) Regional capital costs for crop production (mio ; positive variables -vm_cost_prod_crop(i,req) Regional factor costs of capital and labor for crop production (mio. USD05MER per yr) +vm_cost_prod_crop(i,factors) Regional factor costs of capital and labor for crop production (mio. USD05MER per yr) ; parameter -pm_cost_share_crops(t,i,req) Capital and labor shares of the regional factor costs for crop production (1) -p38_share_calibration(i) Summation factor used to calibrate calculated capital shares with historical values (1) -i38_fac_req(t_all,i,kcr) Factor requirements (USD05MER per tDM) +pm_cost_share_crops(t,i,factors) Capital and labor shares of the regional factor costs for crop production (1) +p38_share_calibration(i) Summation factor used to calibrate calculated capital shares with historical values (1) +i38_fac_req(t_all,i,kcr) Factor requirements (USD05MER per tDM) ; *#################### R SECTION START (OUTPUT DECLARATIONS) #################### parameters - ov_cost_prod_crop(t,i,req,type) Regional factor costs of capital and labor for crop production (mio. USD05MER per yr) + ov_cost_prod_crop(t,i,factors,type) Regional factor costs of capital and labor for crop production (mio. USD05MER per yr) oq38_cost_prod_crop_labor(t,i,type) Regional labor costs for crop production (mio. USD05MER per yr) oq38_cost_prod_crop_capital(t,i,type) Regional capital costs for crop production (mio. USD05MER per yr) ; diff --git a/modules/38_factor_costs/per_ton_fao_may22/equations.gms b/modules/38_factor_costs/per_ton_fao_may22/equations.gms index b3c5ec673a..b4f7976e08 100644 --- a/modules/38_factor_costs/per_ton_fao_may22/equations.gms +++ b/modules/38_factor_costs/per_ton_fao_may22/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/38_factor_costs/per_ton_fao_may22/input.gms b/modules/38_factor_costs/per_ton_fao_may22/input.gms index a13cbc27dd..1543ddf463 100644 --- a/modules/38_factor_costs/per_ton_fao_may22/input.gms +++ b/modules/38_factor_costs/per_ton_fao_may22/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/38_factor_costs/per_ton_fao_may22/not_used.txt b/modules/38_factor_costs/per_ton_fao_may22/not_used.txt index a76ea293ff..dcab778dc9 100644 --- a/modules/38_factor_costs/per_ton_fao_may22/not_used.txt +++ b/modules/38_factor_costs/per_ton_fao_may22/not_used.txt @@ -1,10 +1,3 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de - name,type,reason pm_interest,input,questionnaire vm_prod,input,questionnaire diff --git a/modules/38_factor_costs/per_ton_fao_may22/postsolve.gms b/modules/38_factor_costs/per_ton_fao_may22/postsolve.gms index fee35f5175..ae1e1f023d 100644 --- a/modules/38_factor_costs/per_ton_fao_may22/postsolve.gms +++ b/modules/38_factor_costs/per_ton_fao_may22/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -8,16 +8,16 @@ *#################### R SECTION START (OUTPUT DEFINITIONS) ##################### - ov_cost_prod_crop(t,i,req,"marginal") = vm_cost_prod_crop.m(i,req); + ov_cost_prod_crop(t,i,factors,"marginal") = vm_cost_prod_crop.m(i,factors); oq38_cost_prod_crop_labor(t,i,"marginal") = q38_cost_prod_crop_labor.m(i); oq38_cost_prod_crop_capital(t,i,"marginal") = q38_cost_prod_crop_capital.m(i); - ov_cost_prod_crop(t,i,req,"level") = vm_cost_prod_crop.l(i,req); + ov_cost_prod_crop(t,i,factors,"level") = vm_cost_prod_crop.l(i,factors); oq38_cost_prod_crop_labor(t,i,"level") = q38_cost_prod_crop_labor.l(i); oq38_cost_prod_crop_capital(t,i,"level") = q38_cost_prod_crop_capital.l(i); - ov_cost_prod_crop(t,i,req,"upper") = vm_cost_prod_crop.up(i,req); + ov_cost_prod_crop(t,i,factors,"upper") = vm_cost_prod_crop.up(i,factors); oq38_cost_prod_crop_labor(t,i,"upper") = q38_cost_prod_crop_labor.up(i); oq38_cost_prod_crop_capital(t,i,"upper") = q38_cost_prod_crop_capital.up(i); - ov_cost_prod_crop(t,i,req,"lower") = vm_cost_prod_crop.lo(i,req); + ov_cost_prod_crop(t,i,factors,"lower") = vm_cost_prod_crop.lo(i,factors); oq38_cost_prod_crop_labor(t,i,"lower") = q38_cost_prod_crop_labor.lo(i); oq38_cost_prod_crop_capital(t,i,"lower") = q38_cost_prod_crop_capital.lo(i); *##################### R SECTION END (OUTPUT DEFINITIONS) ###################### diff --git a/modules/38_factor_costs/per_ton_fao_may22/presolve.gms b/modules/38_factor_costs/per_ton_fao_may22/presolve.gms index d54ff904f5..85c03b760a 100644 --- a/modules/38_factor_costs/per_ton_fao_may22/presolve.gms +++ b/modules/38_factor_costs/per_ton_fao_may22/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/38_factor_costs/per_ton_fao_may22/realization.gms b/modules/38_factor_costs/per_ton_fao_may22/realization.gms index 507d0cbe25..49308b5391 100644 --- a/modules/38_factor_costs/per_ton_fao_may22/realization.gms +++ b/modules/38_factor_costs/per_ton_fao_may22/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/38_factor_costs/per_ton_fao_may22/scaling.gms b/modules/38_factor_costs/per_ton_fao_may22/scaling.gms index 8ed2aaa8b8..816b1bc91c 100644 --- a/modules/38_factor_costs/per_ton_fao_may22/scaling.gms +++ b/modules/38_factor_costs/per_ton_fao_may22/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -6,4 +6,4 @@ *** | Contact: magpie@pik-potsdam.de -vm_cost_prod_crop.scale(i,req) = 10e5; +vm_cost_prod_crop.scale(i,factors) = 10e5; diff --git a/modules/38_factor_costs/per_ton_fao_may22/sets.gms b/modules/38_factor_costs/per_ton_fao_may22/sets.gms index 2f4b8cb165..731434e76e 100644 --- a/modules/38_factor_costs/per_ton_fao_may22/sets.gms +++ b/modules/38_factor_costs/per_ton_fao_may22/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -6,7 +6,7 @@ *** | Contact: magpie@pik-potsdam.de sets -req input requirements +factors factors included in factor requirements / labor, capital / reg regression parameters for capital calculation diff --git a/modules/38_factor_costs/sticky_feb18/declarations.gms b/modules/38_factor_costs/sticky_feb18/declarations.gms index 9d7c275f29..8abe30a913 100644 --- a/modules/38_factor_costs/sticky_feb18/declarations.gms +++ b/modules/38_factor_costs/sticky_feb18/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -13,7 +13,7 @@ equations ; positive variables - vm_cost_prod_crop(i,req) Regional factor costs of capital and labor for crop production (mio USD05MER per yr) + vm_cost_prod_crop(i,factors) Regional factor costs of capital and labor for crop production (mio USD05MER per yr) v38_investment_immobile(j,kcr) Investment costs in immobile farm capital (mio USD05MER per yr) v38_investment_mobile(j) Investment costs in mobile farm capital (mio USD05MER per yr) ; @@ -24,7 +24,7 @@ parameters p38_capital_immobile(t,j,kcr) Preexisting immobile capital stocks before investment (mio USD05MER) p38_capital_mobile(t,j) Preexisting mobile capital stocks before investment (mio USD05MER) - pm_cost_share_crops(t,i,req) Capital and labor shares of the regional factor costs for crop production (1) + pm_cost_share_crops(t,i,factors) Capital and labor shares of the regional factor costs for crop production (1) p38_share_calibration(i) Summation factor used to calibrate calculated capital shares with historical values (1) p38_croparea_start(j,w,kcr) Agricultural land initialization area (mio. ha) @@ -35,7 +35,7 @@ parameters *#################### R SECTION START (OUTPUT DECLARATIONS) #################### parameters - ov_cost_prod_crop(t,i,req,type) Regional factor costs of capital and labor for crop production (mio USD05MER per yr) + ov_cost_prod_crop(t,i,factors,type) Regional factor costs of capital and labor for crop production (mio USD05MER per yr) ov38_investment_immobile(t,j,kcr,type) Investment costs in immobile farm capital (mio USD05MER per yr) ov38_investment_mobile(t,j,type) Investment costs in mobile farm capital (mio USD05MER per yr) oq38_cost_prod_labor(t,i,type) Regional labor input costs for crop production (mio USD05MER) diff --git a/modules/38_factor_costs/sticky_feb18/equations.gms b/modules/38_factor_costs/sticky_feb18/equations.gms index f1017b3d53..984853c91b 100644 --- a/modules/38_factor_costs/sticky_feb18/equations.gms +++ b/modules/38_factor_costs/sticky_feb18/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/38_factor_costs/sticky_feb18/input.gms b/modules/38_factor_costs/sticky_feb18/input.gms index cfb1ead6d5..c41bf4c432 100644 --- a/modules/38_factor_costs/sticky_feb18/input.gms +++ b/modules/38_factor_costs/sticky_feb18/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/38_factor_costs/sticky_feb18/not_used.txt b/modules/38_factor_costs/sticky_feb18/not_used.txt deleted file mode 100644 index a40b473c2f..0000000000 --- a/modules/38_factor_costs/sticky_feb18/not_used.txt +++ /dev/null @@ -1,7 +0,0 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de -name,type,reason diff --git a/modules/38_factor_costs/sticky_feb18/postsolve.gms b/modules/38_factor_costs/sticky_feb18/postsolve.gms index f1a8b4197d..ba04135135 100644 --- a/modules/38_factor_costs/sticky_feb18/postsolve.gms +++ b/modules/38_factor_costs/sticky_feb18/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -11,28 +11,28 @@ p38_capital_mobile(t+1,j) = p38_capital_mobile(t,j) + v38_investment_mobile.l(j) *#################### R SECTION START (OUTPUT DEFINITIONS) ##################### - ov_cost_prod_crop(t,i,req,"marginal") = vm_cost_prod_crop.m(i,req); + ov_cost_prod_crop(t,i,factors,"marginal") = vm_cost_prod_crop.m(i,factors); ov38_investment_immobile(t,j,kcr,"marginal") = v38_investment_immobile.m(j,kcr); ov38_investment_mobile(t,j,"marginal") = v38_investment_mobile.m(j); oq38_cost_prod_labor(t,i,"marginal") = q38_cost_prod_labor.m(i); oq38_cost_prod_capital(t,i,"marginal") = q38_cost_prod_capital.m(i); oq38_investment_immobile(t,j,kcr,"marginal") = q38_investment_immobile.m(j,kcr); oq38_investment_mobile(t,j,"marginal") = q38_investment_mobile.m(j); - ov_cost_prod_crop(t,i,req,"level") = vm_cost_prod_crop.l(i,req); + ov_cost_prod_crop(t,i,factors,"level") = vm_cost_prod_crop.l(i,factors); ov38_investment_immobile(t,j,kcr,"level") = v38_investment_immobile.l(j,kcr); ov38_investment_mobile(t,j,"level") = v38_investment_mobile.l(j); oq38_cost_prod_labor(t,i,"level") = q38_cost_prod_labor.l(i); oq38_cost_prod_capital(t,i,"level") = q38_cost_prod_capital.l(i); oq38_investment_immobile(t,j,kcr,"level") = q38_investment_immobile.l(j,kcr); oq38_investment_mobile(t,j,"level") = q38_investment_mobile.l(j); - ov_cost_prod_crop(t,i,req,"upper") = vm_cost_prod_crop.up(i,req); + ov_cost_prod_crop(t,i,factors,"upper") = vm_cost_prod_crop.up(i,factors); ov38_investment_immobile(t,j,kcr,"upper") = v38_investment_immobile.up(j,kcr); ov38_investment_mobile(t,j,"upper") = v38_investment_mobile.up(j); oq38_cost_prod_labor(t,i,"upper") = q38_cost_prod_labor.up(i); oq38_cost_prod_capital(t,i,"upper") = q38_cost_prod_capital.up(i); oq38_investment_immobile(t,j,kcr,"upper") = q38_investment_immobile.up(j,kcr); oq38_investment_mobile(t,j,"upper") = q38_investment_mobile.up(j); - ov_cost_prod_crop(t,i,req,"lower") = vm_cost_prod_crop.lo(i,req); + ov_cost_prod_crop(t,i,factors,"lower") = vm_cost_prod_crop.lo(i,factors); ov38_investment_immobile(t,j,kcr,"lower") = v38_investment_immobile.lo(j,kcr); ov38_investment_mobile(t,j,"lower") = v38_investment_mobile.lo(j); oq38_cost_prod_labor(t,i,"lower") = q38_cost_prod_labor.lo(i); diff --git a/modules/38_factor_costs/sticky_feb18/presolve.gms b/modules/38_factor_costs/sticky_feb18/presolve.gms index 100730021f..1117c7b2f1 100644 --- a/modules/38_factor_costs/sticky_feb18/presolve.gms +++ b/modules/38_factor_costs/sticky_feb18/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/38_factor_costs/sticky_feb18/realization.gms b/modules/38_factor_costs/sticky_feb18/realization.gms index 6c5dc56e93..8fea9e6875 100644 --- a/modules/38_factor_costs/sticky_feb18/realization.gms +++ b/modules/38_factor_costs/sticky_feb18/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/38_factor_costs/sticky_feb18/scaling.gms b/modules/38_factor_costs/sticky_feb18/scaling.gms index 2be79b425d..6fd3d67bca 100644 --- a/modules/38_factor_costs/sticky_feb18/scaling.gms +++ b/modules/38_factor_costs/sticky_feb18/scaling.gms @@ -1,9 +1,9 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the *** | MAgPIE License Exception, version 1.0 (see LICENSE file). *** | Contact: magpie@pik-potsdam.de -vm_cost_prod_crop.scale(i,req) = 10e5; +vm_cost_prod_crop.scale(i,factors) = 10e5; v38_investment_immobile.scale(j,kcr) = 10e3; diff --git a/modules/38_factor_costs/sticky_feb18/sets.gms b/modules/38_factor_costs/sticky_feb18/sets.gms index 9662ce50a5..d274450fc2 100644 --- a/modules/38_factor_costs/sticky_feb18/sets.gms +++ b/modules/38_factor_costs/sticky_feb18/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -12,7 +12,7 @@ sets reg regression parameters for dynamic sticky /slope, intercept/ - req input requirements +factors factors included in factor requirements / labor, capital / ; diff --git a/modules/38_factor_costs/sticky_labor/declarations.gms b/modules/38_factor_costs/sticky_labor/declarations.gms index 43b7e0c816..d794163031 100644 --- a/modules/38_factor_costs/sticky_labor/declarations.gms +++ b/modules/38_factor_costs/sticky_labor/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -11,10 +11,11 @@ equations q38_investment_immobile(j,kcr) Cellular immobile investments into farm capital (mio USD05MER) q38_investment_mobile(j) Cellular mobile investments into farm capital (mio USD05MER) q38_ces_prodfun(j,kcr) CES production function for one unit of output (1) + q38_labor_capital_ratio(i) Ratio between labor and capital needed for one unit of output (1) ; positive variables - vm_cost_prod_crop(i,req) Regional factor costs of capital and labor for crop production (mio USD05MER per yr) + vm_cost_prod_crop(i,factors) Regional factor costs of capital and labor for crop production (mio USD05MER per yr) v38_investment_immobile(j,kcr) Investment costs in immobile farm capital (mio USD05MER per yr) v38_investment_mobile(j) Investment costs in mobile farm capital (mio USD05MER per yr) v38_laborhours_need(j,kcr) Labor required per unit of output (hours per ton DM) @@ -27,17 +28,18 @@ parameters p38_capital_immobile(t,j,kcr) Preexisting immobile capital stocks before investment (mio USD05MER) p38_capital_mobile(t,j) Preexisting mobile capital stocks before investment (mio USD05MER) - pm_cost_share_crops(t,i,req) Capital and labor shares of the regional factor costs for crop production (1) + pm_cost_share_crops(t,i,factors) Capital and labor shares of the regional factor costs for crop production (1) p38_share_calibration(i) Summation factor used to calibrate calculated capital shares with historical values (1) + p38_min_labor_share(t,i) Minimum labor share out of labor plus capital needed (1) p38_croparea_start(j,w,kcr) Agricultural land initialization area (mio. ha) - i38_ces_shr(j,kcr) Share parameter for CES function (1) - i38_ces_scale(j,kcr) Scaling factor for total factor productivity (1) + i38_ces_shr(j,kcr) Share parameter for CES function (1) + i38_ces_scale(j,kcr) Scaling factor for total factor productivity (1) - p38_intr_depr(t,i) Factor from interest and depreciation rate (1) + p38_intr_depr(t,i) Factor from interest and depreciation rate (1) - i38_fac_req(t_all,i,kcr) Factor requirements (USD05MER per tDM) + i38_fac_req(t_all,i,kcr) Factor requirements (USD05MER per tDM) ; scalars @@ -46,7 +48,7 @@ scalars *#################### R SECTION START (OUTPUT DECLARATIONS) #################### parameters - ov_cost_prod_crop(t,i,req,type) Regional factor costs of capital and labor for crop production (mio USD05MER per yr) + ov_cost_prod_crop(t,i,factors,type) Regional factor costs of capital and labor for crop production (mio USD05MER per yr) ov38_investment_immobile(t,j,kcr,type) Investment costs in immobile farm capital (mio USD05MER per yr) ov38_investment_mobile(t,j,type) Investment costs in mobile farm capital (mio USD05MER per yr) ov38_laborhours_need(t,j,kcr,type) Labor required per unit of output (hours per ton DM) @@ -56,5 +58,6 @@ parameters oq38_investment_immobile(t,j,kcr,type) Cellular immobile investments into farm capital (mio USD05MER) oq38_investment_mobile(t,j,type) Cellular mobile investments into farm capital (mio USD05MER) oq38_ces_prodfun(t,j,kcr,type) CES production function for one unit of output (1) + oq38_labor_capital_ratio(t,i,type) Ratio between labor and capital needed for one unit of output (1) ; *##################### R SECTION END (OUTPUT DECLARATIONS) ##################### diff --git a/modules/38_factor_costs/sticky_labor/equations.gms b/modules/38_factor_costs/sticky_labor/equations.gms index 26e1864172..2a7dc75fba 100644 --- a/modules/38_factor_costs/sticky_labor/equations.gms +++ b/modules/38_factor_costs/sticky_labor/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -21,6 +21,14 @@ (i38_ces_shr(j2,kcr)*sum(mobil38, v38_capital_need(j2,kcr,mobil38))**(-s38_ces_elast_par) + (1 - i38_ces_shr(j2,kcr))*(sum(ct, pm_labor_prod(ct,j2) * sum(cell(i2,j2), pm_productivity_gain_from_wages(ct,i2))) * v38_laborhours_need(j2,kcr))**(-s38_ces_elast_par))**(-1/s38_ces_elast_par) =e= 1 ; + +*' As low labor shares can lead to low agricultural employment, which is not necessarily a desired output, a +*' minimum share of labor need can be set. + +q38_labor_capital_ratio(i2) .. + sum(ct, p38_min_labor_share(ct,i2)) =l= vm_cost_prod_crop(i2,"labor") * + (vm_cost_prod_crop(i2,"labor") + sum((mobil38, kcr, cell(i2,j2)), vm_prod(j2,kcr) * v38_capital_need(j2,kcr,mobil38)) * + sum(ct, pm_interest(ct,i2) + s38_depreciation_rate))**(-1); *' Labor costs: The labor costs are calculated by multiplying regional aggregated production with labor requirements *' (in hours) per output unit and wages from [36_employment]. diff --git a/modules/38_factor_costs/sticky_labor/input.gms b/modules/38_factor_costs/sticky_labor/input.gms index fb5befd2bf..54fd04582a 100644 --- a/modules/38_factor_costs/sticky_labor/input.gms +++ b/modules/38_factor_costs/sticky_labor/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -14,7 +14,10 @@ s38_depreciation_rate depreciation rate (share of costs) / 0.05 / * Share of immobile capital. s38_immobile immobile capital (share) / 1 / s38_ces_elast_subst Elasticity of substitution in CES function (1) / 0.3 / -s38_fix_capital_need Year until which capital requirements are fixed / 2020 / +s38_startyear_labor_substitution Year until which labor and capital requirements are fixed to historic values (year) / 2020 / +s38_target_labor_share Target labor share out of labor plus capital needed (1) / 0 / +s38_targetyear_labor_share Year for which the target labor share should be set (year) / 2050 / +s38_target_fulfillment Share by which a region moves from its baseline labor share towards the target value (1) / 0.5 / ; parameter f38_fac_req(kcr) Factor requirement costs in 2005 (USD05MER per tDM) diff --git a/modules/38_factor_costs/sticky_labor/not_used.txt b/modules/38_factor_costs/sticky_labor/not_used.txt index e10fdd9ad7..f9b97b10a0 100644 --- a/modules/38_factor_costs/sticky_labor/not_used.txt +++ b/modules/38_factor_costs/sticky_labor/not_used.txt @@ -1,8 +1,2 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de name,type,reason vm_prod_reg,input,not used diff --git a/modules/38_factor_costs/sticky_labor/postsolve.gms b/modules/38_factor_costs/sticky_labor/postsolve.gms index b421b25da7..ee28f724ab 100644 --- a/modules/38_factor_costs/sticky_labor/postsolve.gms +++ b/modules/38_factor_costs/sticky_labor/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -11,7 +11,7 @@ p38_capital_mobile(t+1,j) = p38_capital_mobile(t,j) + v38_investment_mobile.l(j) *#################### R SECTION START (OUTPUT DEFINITIONS) ##################### - ov_cost_prod_crop(t,i,req,"marginal") = vm_cost_prod_crop.m(i,req); + ov_cost_prod_crop(t,i,factors,"marginal") = vm_cost_prod_crop.m(i,factors); ov38_investment_immobile(t,j,kcr,"marginal") = v38_investment_immobile.m(j,kcr); ov38_investment_mobile(t,j,"marginal") = v38_investment_mobile.m(j); ov38_laborhours_need(t,j,kcr,"marginal") = v38_laborhours_need.m(j,kcr); @@ -21,7 +21,8 @@ p38_capital_mobile(t+1,j) = p38_capital_mobile(t,j) + v38_investment_mobile.l(j) oq38_investment_immobile(t,j,kcr,"marginal") = q38_investment_immobile.m(j,kcr); oq38_investment_mobile(t,j,"marginal") = q38_investment_mobile.m(j); oq38_ces_prodfun(t,j,kcr,"marginal") = q38_ces_prodfun.m(j,kcr); - ov_cost_prod_crop(t,i,req,"level") = vm_cost_prod_crop.l(i,req); + oq38_labor_capital_ratio(t,i,"marginal") = q38_labor_capital_ratio.m(i); + ov_cost_prod_crop(t,i,factors,"level") = vm_cost_prod_crop.l(i,factors); ov38_investment_immobile(t,j,kcr,"level") = v38_investment_immobile.l(j,kcr); ov38_investment_mobile(t,j,"level") = v38_investment_mobile.l(j); ov38_laborhours_need(t,j,kcr,"level") = v38_laborhours_need.l(j,kcr); @@ -31,7 +32,8 @@ p38_capital_mobile(t+1,j) = p38_capital_mobile(t,j) + v38_investment_mobile.l(j) oq38_investment_immobile(t,j,kcr,"level") = q38_investment_immobile.l(j,kcr); oq38_investment_mobile(t,j,"level") = q38_investment_mobile.l(j); oq38_ces_prodfun(t,j,kcr,"level") = q38_ces_prodfun.l(j,kcr); - ov_cost_prod_crop(t,i,req,"upper") = vm_cost_prod_crop.up(i,req); + oq38_labor_capital_ratio(t,i,"level") = q38_labor_capital_ratio.l(i); + ov_cost_prod_crop(t,i,factors,"upper") = vm_cost_prod_crop.up(i,factors); ov38_investment_immobile(t,j,kcr,"upper") = v38_investment_immobile.up(j,kcr); ov38_investment_mobile(t,j,"upper") = v38_investment_mobile.up(j); ov38_laborhours_need(t,j,kcr,"upper") = v38_laborhours_need.up(j,kcr); @@ -41,7 +43,8 @@ p38_capital_mobile(t+1,j) = p38_capital_mobile(t,j) + v38_investment_mobile.l(j) oq38_investment_immobile(t,j,kcr,"upper") = q38_investment_immobile.up(j,kcr); oq38_investment_mobile(t,j,"upper") = q38_investment_mobile.up(j); oq38_ces_prodfun(t,j,kcr,"upper") = q38_ces_prodfun.up(j,kcr); - ov_cost_prod_crop(t,i,req,"lower") = vm_cost_prod_crop.lo(i,req); + oq38_labor_capital_ratio(t,i,"upper") = q38_labor_capital_ratio.up(i); + ov_cost_prod_crop(t,i,factors,"lower") = vm_cost_prod_crop.lo(i,factors); ov38_investment_immobile(t,j,kcr,"lower") = v38_investment_immobile.lo(j,kcr); ov38_investment_mobile(t,j,"lower") = v38_investment_mobile.lo(j); ov38_laborhours_need(t,j,kcr,"lower") = v38_laborhours_need.lo(j,kcr); @@ -51,4 +54,5 @@ p38_capital_mobile(t+1,j) = p38_capital_mobile(t,j) + v38_investment_mobile.l(j) oq38_investment_immobile(t,j,kcr,"lower") = q38_investment_immobile.lo(j,kcr); oq38_investment_mobile(t,j,"lower") = q38_investment_mobile.lo(j); oq38_ces_prodfun(t,j,kcr,"lower") = q38_ces_prodfun.lo(j,kcr); + oq38_labor_capital_ratio(t,i,"lower") = q38_labor_capital_ratio.lo(i); *##################### R SECTION END (OUTPUT DEFINITIONS) ###################### diff --git a/modules/38_factor_costs/sticky_labor/preloop.gms b/modules/38_factor_costs/sticky_labor/preloop.gms index 8068b9b489..1d421235dd 100644 --- a/modules/38_factor_costs/sticky_labor/preloop.gms +++ b/modules/38_factor_costs/sticky_labor/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -9,3 +9,11 @@ s38_ces_elast_par = (1/s38_ces_elast_subst) - 1 ; p38_intr_depr(t,i) = (1-s38_depreciation_rate) * pm_interest(t,i)/(1+pm_interest(t,i)) + s38_depreciation_rate; + +* calculate labor/capital cost shares from regression +p38_share_calibration(i) = f38_historical_share("y2010",i)-(f38_reg_parameters("slope")*log10(sum(i_to_iso(i,iso),im_gdp_pc_ppp_iso("y2010",iso)))+f38_reg_parameters("intercept")); + +pm_cost_share_crops(t,i,"capital")$(m_year(t)<2010) = f38_historical_share(t,i); +pm_cost_share_crops(t,i,"capital")$(m_year(t)>=2010) = f38_reg_parameters("slope")*log10(sum(i_to_iso(i,iso),im_gdp_pc_ppp_iso(t,iso)))+f38_reg_parameters("intercept")+p38_share_calibration(i); + +pm_cost_share_crops(t,i,"labor") = 1 - pm_cost_share_crops(t,i,"capital"); diff --git a/modules/38_factor_costs/sticky_labor/presolve.gms b/modules/38_factor_costs/sticky_labor/presolve.gms index 3a7d5323c1..37fa27715d 100644 --- a/modules/38_factor_costs/sticky_labor/presolve.gms +++ b/modules/38_factor_costs/sticky_labor/presolve.gms @@ -1,21 +1,10 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the *** | MAgPIE License Exception, version 1.0 (see LICENSE file). *** | Contact: magpie@pik-potsdam.de -p38_share_calibration(i) = f38_historical_share("y2010",i)-(f38_reg_parameters("slope")*log10(sum(i_to_iso(i,iso),im_gdp_pc_ppp_iso("y2010",iso)))+f38_reg_parameters("intercept")); - -if (m_year(t)<2010, -pm_cost_share_crops(t,i,"capital") = f38_historical_share(t,i); -pm_cost_share_crops(t,i,"labor") = 1 - f38_historical_share(t,i); - -elseif (m_year(t)>=2010), -pm_cost_share_crops(t,i,"capital") = f38_reg_parameters("slope")*log10(sum(i_to_iso(i,iso),im_gdp_pc_ppp_iso(t,iso)))+f38_reg_parameters("intercept")+p38_share_calibration(i); -pm_cost_share_crops(t,i,"labor") = 1 - pm_cost_share_crops(t,i,"capital"); -); - * choosing between regional (+time dependent) or global (from 2005) factor requirements $if "%c38_fac_req%" == "glo" i38_fac_req(t,i,kcr) = f38_fac_req(kcr); $if "%c38_fac_req%" == "reg" i38_fac_req(t,i,kcr) = f38_fac_req_fao_reg(t,i,kcr); @@ -40,7 +29,7 @@ v38_laborhours_need.l(j,kcr) = sum(cell(i,j),p38_labor_need(t,i,kcr)) / sum(cell v38_laborhours_need.up(j,kcr) = 10 * (sum(cell(i,j),p38_labor_need(t,i,kcr)) / sum(cell(i,j), pm_hourly_costs(t,i,"baseline"))); * set bounds for captial requirements -if (m_year(t) <= s38_fix_capital_need, +if (m_year(t) <= s38_startyear_labor_substitution, v38_capital_need.fx(j,kcr,mobil38) = sum(cell(i,j),p38_capital_need(t,i,kcr,mobil38)); else v38_capital_need.lo(j,kcr,mobil38) = 0.1*sum(cell(i,j),p38_capital_need(t,i,kcr,mobil38)); @@ -52,6 +41,25 @@ else i38_ces_shr(j,kcr) = sum(cell(i,j), (p38_intr_depr(t,i) * sum(mobil38, v38_capital_need.l(j,kcr,mobil38))**(1 + s38_ces_elast_par)) / (p38_intr_depr(t,i) * sum(mobil38, v38_capital_need.l(j,kcr,mobil38))**(1 + s38_ces_elast_par) + pm_hourly_costs(t,i,"baseline") * v38_laborhours_need.l(j,kcr)**(1 + s38_ces_elast_par))); i38_ces_scale(j,kcr) = sum(cell(i,j), 1/([i38_ces_shr(j,kcr) * sum(mobil38, v38_capital_need.l(j,kcr,mobil38))**(-s38_ces_elast_par) + (1 - i38_ces_shr(j,kcr)) * v38_laborhours_need.l(j,kcr)**(-s38_ces_elast_par)]**(-1/s38_ces_elast_par))); +* minimum labor share based on target and adjustment factor +if (m_year(t) < s38_startyear_labor_substitution, + p38_min_labor_share(t,i) = 0; +elseif m_year(t) <= s38_targetyear_labor_share, + p38_min_labor_share(t,i) = max(pm_cost_share_crops(t,i,"labor"), pm_cost_share_crops(t,i,"labor") + + ((m_year(t)-s38_startyear_labor_substitution)/(s38_targetyear_labor_share-s38_startyear_labor_substitution) * + (s38_target_fulfillment * (s38_target_labor_share - sum(t2$(m_year(t2) = s38_targetyear_labor_share), pm_cost_share_crops(t2,i,"labor")))))); +else + p38_min_labor_share(t,i)$(sum(t2$(m_year(t2) = s38_targetyear_labor_share), + pm_cost_share_crops(t2,i,"labor")) <= s38_target_labor_share) = sum(t2$(m_year(t2) = s38_targetyear_labor_share), p38_min_labor_share(t2,i)); + p38_min_labor_share(t,i)$(sum(t2$(m_year(t2) = s38_targetyear_labor_share), + pm_cost_share_crops(t2,i,"labor")) > s38_target_labor_share) = max(pm_cost_share_crops(t,i,"labor"), s38_target_labor_share); +); + +* overwrite with 0 in case target labor share is 0 (i.e. off) +if (s38_target_labor_share = 0, + p38_min_labor_share(t,i) = 0; +); + *** Variable labor costs END if (ord(t) = 1, diff --git a/modules/38_factor_costs/sticky_labor/realization.gms b/modules/38_factor_costs/sticky_labor/realization.gms index a87d8c5a73..05e065b68b 100644 --- a/modules/38_factor_costs/sticky_labor/realization.gms +++ b/modules/38_factor_costs/sticky_labor/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/38_factor_costs/sticky_labor/scaling.gms b/modules/38_factor_costs/sticky_labor/scaling.gms index ea364038fe..b34a21e49c 100644 --- a/modules/38_factor_costs/sticky_labor/scaling.gms +++ b/modules/38_factor_costs/sticky_labor/scaling.gms @@ -1,8 +1,8 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the *** | MAgPIE License Exception, version 1.0 (see LICENSE file). *** | Contact: magpie@pik-potsdam.de -vm_cost_prod_crop.scale(i,req) = 10e4; +vm_cost_prod_crop.scale(i,factors) = 10e4; diff --git a/modules/38_factor_costs/sticky_labor/sets.gms b/modules/38_factor_costs/sticky_labor/sets.gms index 9662ce50a5..d274450fc2 100644 --- a/modules/38_factor_costs/sticky_labor/sets.gms +++ b/modules/38_factor_costs/sticky_labor/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -12,7 +12,7 @@ sets reg regression parameters for dynamic sticky /slope, intercept/ - req input requirements +factors factors included in factor requirements / labor, capital / ; diff --git a/modules/39_landconversion/calib/declarations.gms b/modules/39_landconversion/calib/declarations.gms index 7f2d0f5e11..26075121fc 100644 --- a/modules/39_landconversion/calib/declarations.gms +++ b/modules/39_landconversion/calib/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/39_landconversion/calib/equations.gms b/modules/39_landconversion/calib/equations.gms index 23b6c2b1eb..f6f66b9d0b 100644 --- a/modules/39_landconversion/calib/equations.gms +++ b/modules/39_landconversion/calib/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/39_landconversion/calib/input.gms b/modules/39_landconversion/calib/input.gms index 1d627940d1..8d68698d3a 100644 --- a/modules/39_landconversion/calib/input.gms +++ b/modules/39_landconversion/calib/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/39_landconversion/calib/postsolve.gms b/modules/39_landconversion/calib/postsolve.gms index 2e8efa7363..47206b80d8 100644 --- a/modules/39_landconversion/calib/postsolve.gms +++ b/modules/39_landconversion/calib/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/39_landconversion/calib/preloop.gms b/modules/39_landconversion/calib/preloop.gms index d7016343e6..7b48d515e3 100644 --- a/modules/39_landconversion/calib/preloop.gms +++ b/modules/39_landconversion/calib/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/39_landconversion/calib/presolve.gms b/modules/39_landconversion/calib/presolve.gms index 42cf981b5f..16548299ba 100644 --- a/modules/39_landconversion/calib/presolve.gms +++ b/modules/39_landconversion/calib/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/39_landconversion/calib/realization.gms b/modules/39_landconversion/calib/realization.gms index a77ba47b46..0737ed88b5 100644 --- a/modules/39_landconversion/calib/realization.gms +++ b/modules/39_landconversion/calib/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/39_landconversion/calib/scaling.gms b/modules/39_landconversion/calib/scaling.gms index 30fe8d8b3f..a254c35219 100644 --- a/modules/39_landconversion/calib/scaling.gms +++ b/modules/39_landconversion/calib/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/39_landconversion/calib/sets.gms b/modules/39_landconversion/calib/sets.gms index a754de9d6e..2f67c6cc82 100644 --- a/modules/39_landconversion/calib/sets.gms +++ b/modules/39_landconversion/calib/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/39_landconversion/module.gms b/modules/39_landconversion/module.gms index 300507e31f..6b65df4e3c 100644 --- a/modules/39_landconversion/module.gms +++ b/modules/39_landconversion/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/40_transport/gtap_nov12/declarations.gms b/modules/40_transport/gtap_nov12/declarations.gms index 7a02ed6ac9..20b597fb2e 100644 --- a/modules/40_transport/gtap_nov12/declarations.gms +++ b/modules/40_transport/gtap_nov12/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/40_transport/gtap_nov12/equations.gms b/modules/40_transport/gtap_nov12/equations.gms index aa1cea9167..89e9ef78d5 100644 --- a/modules/40_transport/gtap_nov12/equations.gms +++ b/modules/40_transport/gtap_nov12/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/40_transport/gtap_nov12/input.gms b/modules/40_transport/gtap_nov12/input.gms index 7966ada195..cc65a9766f 100644 --- a/modules/40_transport/gtap_nov12/input.gms +++ b/modules/40_transport/gtap_nov12/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/40_transport/gtap_nov12/postsolve.gms b/modules/40_transport/gtap_nov12/postsolve.gms index 6d17da2ecb..2d47c2b005 100644 --- a/modules/40_transport/gtap_nov12/postsolve.gms +++ b/modules/40_transport/gtap_nov12/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/40_transport/gtap_nov12/realization.gms b/modules/40_transport/gtap_nov12/realization.gms index 693828b303..2e40c801df 100644 --- a/modules/40_transport/gtap_nov12/realization.gms +++ b/modules/40_transport/gtap_nov12/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/40_transport/module.gms b/modules/40_transport/module.gms index 3e6d0c57e6..bb19feeea6 100644 --- a/modules/40_transport/module.gms +++ b/modules/40_transport/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/40_transport/off/declarations.gms b/modules/40_transport/off/declarations.gms index 953f0fe0cb..6e8c1bcfe7 100644 --- a/modules/40_transport/off/declarations.gms +++ b/modules/40_transport/off/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/40_transport/off/not_used.txt b/modules/40_transport/off/not_used.txt index fde9a91e1a..850fb5a2ef 100644 --- a/modules/40_transport/off/not_used.txt +++ b/modules/40_transport/off/not_used.txt @@ -1,9 +1,2 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de - name,type,reason vm_prod, input, not needed diff --git a/modules/40_transport/off/postsolve.gms b/modules/40_transport/off/postsolve.gms index edf6b6557d..64dd886560 100644 --- a/modules/40_transport/off/postsolve.gms +++ b/modules/40_transport/off/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/40_transport/off/presolve.gms b/modules/40_transport/off/presolve.gms index 5457325784..d3f0887f7f 100644 --- a/modules/40_transport/off/presolve.gms +++ b/modules/40_transport/off/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/40_transport/off/realization.gms b/modules/40_transport/off/realization.gms index 1e5cb5ff0d..2cfdc62d49 100644 --- a/modules/40_transport/off/realization.gms +++ b/modules/40_transport/off/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/41_area_equipped_for_irrigation/endo_apr13/declarations.gms b/modules/41_area_equipped_for_irrigation/endo_apr13/declarations.gms index 92d0af2a5a..42d1d51c11 100644 --- a/modules/41_area_equipped_for_irrigation/endo_apr13/declarations.gms +++ b/modules/41_area_equipped_for_irrigation/endo_apr13/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/41_area_equipped_for_irrigation/endo_apr13/equations.gms b/modules/41_area_equipped_for_irrigation/endo_apr13/equations.gms index 65e9cb7141..0bba669451 100644 --- a/modules/41_area_equipped_for_irrigation/endo_apr13/equations.gms +++ b/modules/41_area_equipped_for_irrigation/endo_apr13/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/41_area_equipped_for_irrigation/endo_apr13/input.gms b/modules/41_area_equipped_for_irrigation/endo_apr13/input.gms index 3c0f0634f2..24beccec4b 100644 --- a/modules/41_area_equipped_for_irrigation/endo_apr13/input.gms +++ b/modules/41_area_equipped_for_irrigation/endo_apr13/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/41_area_equipped_for_irrigation/endo_apr13/postsolve.gms b/modules/41_area_equipped_for_irrigation/endo_apr13/postsolve.gms index 12e975039c..7bf8c056d4 100644 --- a/modules/41_area_equipped_for_irrigation/endo_apr13/postsolve.gms +++ b/modules/41_area_equipped_for_irrigation/endo_apr13/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/41_area_equipped_for_irrigation/endo_apr13/preloop.gms b/modules/41_area_equipped_for_irrigation/endo_apr13/preloop.gms index d19d293a78..5ffaf199fa 100644 --- a/modules/41_area_equipped_for_irrigation/endo_apr13/preloop.gms +++ b/modules/41_area_equipped_for_irrigation/endo_apr13/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/41_area_equipped_for_irrigation/endo_apr13/presolve.gms b/modules/41_area_equipped_for_irrigation/endo_apr13/presolve.gms index bd9eeea199..c2f630a0da 100644 --- a/modules/41_area_equipped_for_irrigation/endo_apr13/presolve.gms +++ b/modules/41_area_equipped_for_irrigation/endo_apr13/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/41_area_equipped_for_irrigation/endo_apr13/realization.gms b/modules/41_area_equipped_for_irrigation/endo_apr13/realization.gms index e5f4a41cfc..407a80fb45 100644 --- a/modules/41_area_equipped_for_irrigation/endo_apr13/realization.gms +++ b/modules/41_area_equipped_for_irrigation/endo_apr13/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/41_area_equipped_for_irrigation/endo_apr13/scaling.gms b/modules/41_area_equipped_for_irrigation/endo_apr13/scaling.gms index 0a663a5047..f5cc0886de 100644 --- a/modules/41_area_equipped_for_irrigation/endo_apr13/scaling.gms +++ b/modules/41_area_equipped_for_irrigation/endo_apr13/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/41_area_equipped_for_irrigation/endo_apr13/sets.gms b/modules/41_area_equipped_for_irrigation/endo_apr13/sets.gms index 81769ae6b3..92dee76fbe 100644 --- a/modules/41_area_equipped_for_irrigation/endo_apr13/sets.gms +++ b/modules/41_area_equipped_for_irrigation/endo_apr13/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/41_area_equipped_for_irrigation/module.gms b/modules/41_area_equipped_for_irrigation/module.gms index 1b81e46cf2..4502d6d89d 100644 --- a/modules/41_area_equipped_for_irrigation/module.gms +++ b/modules/41_area_equipped_for_irrigation/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/41_area_equipped_for_irrigation/static/declarations.gms b/modules/41_area_equipped_for_irrigation/static/declarations.gms index 43f4d361c3..dd88de4a3d 100644 --- a/modules/41_area_equipped_for_irrigation/static/declarations.gms +++ b/modules/41_area_equipped_for_irrigation/static/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/41_area_equipped_for_irrigation/static/equations.gms b/modules/41_area_equipped_for_irrigation/static/equations.gms index 8f31d4284e..3bc9aed860 100644 --- a/modules/41_area_equipped_for_irrigation/static/equations.gms +++ b/modules/41_area_equipped_for_irrigation/static/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/41_area_equipped_for_irrigation/static/input.gms b/modules/41_area_equipped_for_irrigation/static/input.gms index b03b0a08f1..d5519ef955 100644 --- a/modules/41_area_equipped_for_irrigation/static/input.gms +++ b/modules/41_area_equipped_for_irrigation/static/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/41_area_equipped_for_irrigation/static/not_used.txt b/modules/41_area_equipped_for_irrigation/static/not_used.txt index 7fb72245a5..2411592d7e 100644 --- a/modules/41_area_equipped_for_irrigation/static/not_used.txt +++ b/modules/41_area_equipped_for_irrigation/static/not_used.txt @@ -1,8 +1,2 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de name,type,reason pm_interest, input, not needed diff --git a/modules/41_area_equipped_for_irrigation/static/postsolve.gms b/modules/41_area_equipped_for_irrigation/static/postsolve.gms index fa0d6b3217..58f0f97ed1 100644 --- a/modules/41_area_equipped_for_irrigation/static/postsolve.gms +++ b/modules/41_area_equipped_for_irrigation/static/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/41_area_equipped_for_irrigation/static/presolve.gms b/modules/41_area_equipped_for_irrigation/static/presolve.gms index 15ac02a2ad..708110003e 100644 --- a/modules/41_area_equipped_for_irrigation/static/presolve.gms +++ b/modules/41_area_equipped_for_irrigation/static/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/41_area_equipped_for_irrigation/static/realization.gms b/modules/41_area_equipped_for_irrigation/static/realization.gms index b0a7bee8d8..be0da557fa 100644 --- a/modules/41_area_equipped_for_irrigation/static/realization.gms +++ b/modules/41_area_equipped_for_irrigation/static/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/41_area_equipped_for_irrigation/static/sets.gms b/modules/41_area_equipped_for_irrigation/static/sets.gms index 81769ae6b3..92dee76fbe 100644 --- a/modules/41_area_equipped_for_irrigation/static/sets.gms +++ b/modules/41_area_equipped_for_irrigation/static/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/42_water_demand/agr_sector_aug13/declarations.gms b/modules/42_water_demand/agr_sector_aug13/declarations.gms index e3fa713660..4f9a87a59a 100644 --- a/modules/42_water_demand/agr_sector_aug13/declarations.gms +++ b/modules/42_water_demand/agr_sector_aug13/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/42_water_demand/agr_sector_aug13/equations.gms b/modules/42_water_demand/agr_sector_aug13/equations.gms index 16c96762d1..1e550b0762 100644 --- a/modules/42_water_demand/agr_sector_aug13/equations.gms +++ b/modules/42_water_demand/agr_sector_aug13/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/42_water_demand/agr_sector_aug13/input.gms b/modules/42_water_demand/agr_sector_aug13/input.gms index c38b6ffeb2..a544d369e3 100644 --- a/modules/42_water_demand/agr_sector_aug13/input.gms +++ b/modules/42_water_demand/agr_sector_aug13/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/42_water_demand/agr_sector_aug13/postsolve.gms b/modules/42_water_demand/agr_sector_aug13/postsolve.gms index 4a4dc96caf..42c6bfda3c 100644 --- a/modules/42_water_demand/agr_sector_aug13/postsolve.gms +++ b/modules/42_water_demand/agr_sector_aug13/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/42_water_demand/agr_sector_aug13/preloop.gms b/modules/42_water_demand/agr_sector_aug13/preloop.gms index ad24990ea5..351a33dac8 100644 --- a/modules/42_water_demand/agr_sector_aug13/preloop.gms +++ b/modules/42_water_demand/agr_sector_aug13/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/42_water_demand/agr_sector_aug13/presolve.gms b/modules/42_water_demand/agr_sector_aug13/presolve.gms index 05264e25d1..5fd61d5886 100644 --- a/modules/42_water_demand/agr_sector_aug13/presolve.gms +++ b/modules/42_water_demand/agr_sector_aug13/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/42_water_demand/agr_sector_aug13/realization.gms b/modules/42_water_demand/agr_sector_aug13/realization.gms index df6e6db79c..1d5738592d 100644 --- a/modules/42_water_demand/agr_sector_aug13/realization.gms +++ b/modules/42_water_demand/agr_sector_aug13/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/42_water_demand/agr_sector_aug13/scaling.gms b/modules/42_water_demand/agr_sector_aug13/scaling.gms index f37c4e19aa..f5c65a720f 100644 --- a/modules/42_water_demand/agr_sector_aug13/scaling.gms +++ b/modules/42_water_demand/agr_sector_aug13/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/42_water_demand/agr_sector_aug13/sets.gms b/modules/42_water_demand/agr_sector_aug13/sets.gms index f4879eb2a3..9c8dd1c560 100644 --- a/modules/42_water_demand/agr_sector_aug13/sets.gms +++ b/modules/42_water_demand/agr_sector_aug13/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/42_water_demand/all_sectors_aug13/declarations.gms b/modules/42_water_demand/all_sectors_aug13/declarations.gms index f042052c88..b216341e7a 100644 --- a/modules/42_water_demand/all_sectors_aug13/declarations.gms +++ b/modules/42_water_demand/all_sectors_aug13/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/42_water_demand/all_sectors_aug13/equations.gms b/modules/42_water_demand/all_sectors_aug13/equations.gms index 7c8e803977..db1b37706b 100644 --- a/modules/42_water_demand/all_sectors_aug13/equations.gms +++ b/modules/42_water_demand/all_sectors_aug13/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/42_water_demand/all_sectors_aug13/input.gms b/modules/42_water_demand/all_sectors_aug13/input.gms index 2ad115db37..157486000d 100644 --- a/modules/42_water_demand/all_sectors_aug13/input.gms +++ b/modules/42_water_demand/all_sectors_aug13/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/42_water_demand/all_sectors_aug13/postsolve.gms b/modules/42_water_demand/all_sectors_aug13/postsolve.gms index 4a4dc96caf..42c6bfda3c 100644 --- a/modules/42_water_demand/all_sectors_aug13/postsolve.gms +++ b/modules/42_water_demand/all_sectors_aug13/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/42_water_demand/all_sectors_aug13/preloop.gms b/modules/42_water_demand/all_sectors_aug13/preloop.gms index ad24990ea5..351a33dac8 100644 --- a/modules/42_water_demand/all_sectors_aug13/preloop.gms +++ b/modules/42_water_demand/all_sectors_aug13/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/42_water_demand/all_sectors_aug13/presolve.gms b/modules/42_water_demand/all_sectors_aug13/presolve.gms index 8b9fc6a69a..8e4cbbb970 100644 --- a/modules/42_water_demand/all_sectors_aug13/presolve.gms +++ b/modules/42_water_demand/all_sectors_aug13/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/42_water_demand/all_sectors_aug13/realization.gms b/modules/42_water_demand/all_sectors_aug13/realization.gms index f40110939c..fd9e9718f6 100644 --- a/modules/42_water_demand/all_sectors_aug13/realization.gms +++ b/modules/42_water_demand/all_sectors_aug13/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/42_water_demand/all_sectors_aug13/scaling.gms b/modules/42_water_demand/all_sectors_aug13/scaling.gms index f37c4e19aa..f5c65a720f 100644 --- a/modules/42_water_demand/all_sectors_aug13/scaling.gms +++ b/modules/42_water_demand/all_sectors_aug13/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/42_water_demand/all_sectors_aug13/sets.gms b/modules/42_water_demand/all_sectors_aug13/sets.gms index 118459b959..9eaf2efaf7 100644 --- a/modules/42_water_demand/all_sectors_aug13/sets.gms +++ b/modules/42_water_demand/all_sectors_aug13/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/42_water_demand/module.gms b/modules/42_water_demand/module.gms index a6c3fbee97..238092d5a0 100644 --- a/modules/42_water_demand/module.gms +++ b/modules/42_water_demand/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/43_water_availability/module.gms b/modules/43_water_availability/module.gms index 14d1efe6b6..f33bba60bb 100644 --- a/modules/43_water_availability/module.gms +++ b/modules/43_water_availability/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/43_water_availability/total_water_aug13/declarations.gms b/modules/43_water_availability/total_water_aug13/declarations.gms index 71494a2669..c140d072c4 100644 --- a/modules/43_water_availability/total_water_aug13/declarations.gms +++ b/modules/43_water_availability/total_water_aug13/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/43_water_availability/total_water_aug13/equations.gms b/modules/43_water_availability/total_water_aug13/equations.gms index 16a89d92f4..dc56b624fc 100644 --- a/modules/43_water_availability/total_water_aug13/equations.gms +++ b/modules/43_water_availability/total_water_aug13/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/43_water_availability/total_water_aug13/input.gms b/modules/43_water_availability/total_water_aug13/input.gms index 6cb208b469..16b50adc7a 100644 --- a/modules/43_water_availability/total_water_aug13/input.gms +++ b/modules/43_water_availability/total_water_aug13/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/43_water_availability/total_water_aug13/postsolve.gms b/modules/43_water_availability/total_water_aug13/postsolve.gms index e227f3e241..3927b10ee6 100644 --- a/modules/43_water_availability/total_water_aug13/postsolve.gms +++ b/modules/43_water_availability/total_water_aug13/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/43_water_availability/total_water_aug13/preloop.gms b/modules/43_water_availability/total_water_aug13/preloop.gms index a5e18c8abe..7c1ba7c13a 100644 --- a/modules/43_water_availability/total_water_aug13/preloop.gms +++ b/modules/43_water_availability/total_water_aug13/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/43_water_availability/total_water_aug13/presolve.gms b/modules/43_water_availability/total_water_aug13/presolve.gms index 297ee6677b..1846615b43 100644 --- a/modules/43_water_availability/total_water_aug13/presolve.gms +++ b/modules/43_water_availability/total_water_aug13/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/43_water_availability/total_water_aug13/realization.gms b/modules/43_water_availability/total_water_aug13/realization.gms index 5d63802680..061015af19 100644 --- a/modules/43_water_availability/total_water_aug13/realization.gms +++ b/modules/43_water_availability/total_water_aug13/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/43_water_availability/total_water_aug13/scaling.gms b/modules/43_water_availability/total_water_aug13/scaling.gms index b273d31fea..f960d34b8b 100644 --- a/modules/43_water_availability/total_water_aug13/scaling.gms +++ b/modules/43_water_availability/total_water_aug13/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/44_biodiversity/bii_target/declarations.gms b/modules/44_biodiversity/bii_target/declarations.gms index 0a98f8b982..1f15b8fc2b 100644 --- a/modules/44_biodiversity/bii_target/declarations.gms +++ b/modules/44_biodiversity/bii_target/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/44_biodiversity/bii_target/equations.gms b/modules/44_biodiversity/bii_target/equations.gms index 9406d11225..d9d392efa4 100644 --- a/modules/44_biodiversity/bii_target/equations.gms +++ b/modules/44_biodiversity/bii_target/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/44_biodiversity/bii_target/input.gms b/modules/44_biodiversity/bii_target/input.gms index b655e097d7..78fbb199cc 100644 --- a/modules/44_biodiversity/bii_target/input.gms +++ b/modules/44_biodiversity/bii_target/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/44_biodiversity/bii_target/postsolve.gms b/modules/44_biodiversity/bii_target/postsolve.gms index b0734ac3e1..a68128b501 100644 --- a/modules/44_biodiversity/bii_target/postsolve.gms +++ b/modules/44_biodiversity/bii_target/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/44_biodiversity/bii_target/preloop.gms b/modules/44_biodiversity/bii_target/preloop.gms index 87ad9709d8..6ccfbda4c9 100644 --- a/modules/44_biodiversity/bii_target/preloop.gms +++ b/modules/44_biodiversity/bii_target/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/44_biodiversity/bii_target/presolve.gms b/modules/44_biodiversity/bii_target/presolve.gms index 7a0c7707de..71c10fdf76 100644 --- a/modules/44_biodiversity/bii_target/presolve.gms +++ b/modules/44_biodiversity/bii_target/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/44_biodiversity/bii_target/realization.gms b/modules/44_biodiversity/bii_target/realization.gms index 0631f4520c..f8fdc2a6b9 100644 --- a/modules/44_biodiversity/bii_target/realization.gms +++ b/modules/44_biodiversity/bii_target/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/44_biodiversity/bii_target/sets.gms b/modules/44_biodiversity/bii_target/sets.gms index fb2fe7f613..0a3287906c 100644 --- a/modules/44_biodiversity/bii_target/sets.gms +++ b/modules/44_biodiversity/bii_target/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/44_biodiversity/bv_btc_mar21/declarations.gms b/modules/44_biodiversity/bv_btc_mar21/declarations.gms index 07a661cf1a..46c5fc6b78 100644 --- a/modules/44_biodiversity/bv_btc_mar21/declarations.gms +++ b/modules/44_biodiversity/bv_btc_mar21/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/44_biodiversity/bv_btc_mar21/equations.gms b/modules/44_biodiversity/bv_btc_mar21/equations.gms index ecf807f938..6eb968c57f 100644 --- a/modules/44_biodiversity/bv_btc_mar21/equations.gms +++ b/modules/44_biodiversity/bv_btc_mar21/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/44_biodiversity/bv_btc_mar21/input.gms b/modules/44_biodiversity/bv_btc_mar21/input.gms index 407e6112da..5050ef11fb 100644 --- a/modules/44_biodiversity/bv_btc_mar21/input.gms +++ b/modules/44_biodiversity/bv_btc_mar21/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/44_biodiversity/bv_btc_mar21/not_used.txt b/modules/44_biodiversity/bv_btc_mar21/not_used.txt index 4519c2e051..bf287154ed 100644 --- a/modules/44_biodiversity/bv_btc_mar21/not_used.txt +++ b/modules/44_biodiversity/bv_btc_mar21/not_used.txt @@ -1,9 +1,2 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de - name,type,reason pcm_land, input, not used diff --git a/modules/44_biodiversity/bv_btc_mar21/postsolve.gms b/modules/44_biodiversity/bv_btc_mar21/postsolve.gms index 754d95857f..14998a7d29 100644 --- a/modules/44_biodiversity/bv_btc_mar21/postsolve.gms +++ b/modules/44_biodiversity/bv_btc_mar21/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/44_biodiversity/bv_btc_mar21/preloop.gms b/modules/44_biodiversity/bv_btc_mar21/preloop.gms index 32cabd1be8..e8fdf5e457 100644 --- a/modules/44_biodiversity/bv_btc_mar21/preloop.gms +++ b/modules/44_biodiversity/bv_btc_mar21/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/44_biodiversity/bv_btc_mar21/realization.gms b/modules/44_biodiversity/bv_btc_mar21/realization.gms index 32dbbad208..248d406d22 100644 --- a/modules/44_biodiversity/bv_btc_mar21/realization.gms +++ b/modules/44_biodiversity/bv_btc_mar21/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/44_biodiversity/bv_btc_mar21/sets.gms b/modules/44_biodiversity/bv_btc_mar21/sets.gms index 9431aa7e3c..0dff75259f 100644 --- a/modules/44_biodiversity/bv_btc_mar21/sets.gms +++ b/modules/44_biodiversity/bv_btc_mar21/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/44_biodiversity/module.gms b/modules/44_biodiversity/module.gms index 7190257e38..6157302f8f 100644 --- a/modules/44_biodiversity/module.gms +++ b/modules/44_biodiversity/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/45_climate/module.gms b/modules/45_climate/module.gms index 5341e19ce7..0d0bb9c05b 100644 --- a/modules/45_climate/module.gms +++ b/modules/45_climate/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/45_climate/static/input.gms b/modules/45_climate/static/input.gms index 97f49aabba..a1a85118c7 100644 --- a/modules/45_climate/static/input.gms +++ b/modules/45_climate/static/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/45_climate/static/realization.gms b/modules/45_climate/static/realization.gms index c08dfa4144..1c907ad5a4 100644 --- a/modules/45_climate/static/realization.gms +++ b/modules/45_climate/static/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/45_climate/static/sets.gms b/modules/45_climate/static/sets.gms index 7295606a42..ee4d675190 100644 --- a/modules/45_climate/static/sets.gms +++ b/modules/45_climate/static/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/50_nr_soil_budget/macceff_aug22/declarations.gms b/modules/50_nr_soil_budget/macceff_aug22/declarations.gms index d9ba47239c..5c286459b3 100644 --- a/modules/50_nr_soil_budget/macceff_aug22/declarations.gms +++ b/modules/50_nr_soil_budget/macceff_aug22/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/50_nr_soil_budget/macceff_aug22/equations.gms b/modules/50_nr_soil_budget/macceff_aug22/equations.gms index ca7ffcf68f..6d1d9b8390 100644 --- a/modules/50_nr_soil_budget/macceff_aug22/equations.gms +++ b/modules/50_nr_soil_budget/macceff_aug22/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/50_nr_soil_budget/macceff_aug22/input.gms b/modules/50_nr_soil_budget/macceff_aug22/input.gms index e80f38c33e..230217674b 100644 --- a/modules/50_nr_soil_budget/macceff_aug22/input.gms +++ b/modules/50_nr_soil_budget/macceff_aug22/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/50_nr_soil_budget/macceff_aug22/postsolve.gms b/modules/50_nr_soil_budget/macceff_aug22/postsolve.gms index 0de48fec48..f11eb63d29 100644 --- a/modules/50_nr_soil_budget/macceff_aug22/postsolve.gms +++ b/modules/50_nr_soil_budget/macceff_aug22/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/50_nr_soil_budget/macceff_aug22/preloop.gms b/modules/50_nr_soil_budget/macceff_aug22/preloop.gms index 9ae0186e01..9c3d803f3a 100644 --- a/modules/50_nr_soil_budget/macceff_aug22/preloop.gms +++ b/modules/50_nr_soil_budget/macceff_aug22/preloop.gms @@ -1,5 +1,4 @@ - -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -7,6 +6,7 @@ *** | Contact: magpie@pik-potsdam.de + * Country switches to determine countries for which chosen Neff scenario * shall be applied. * In the default case, the scenarios affects all countries when activated. diff --git a/modules/50_nr_soil_budget/macceff_aug22/presolve.gms b/modules/50_nr_soil_budget/macceff_aug22/presolve.gms index dee0324624..a1ad161ade 100644 --- a/modules/50_nr_soil_budget/macceff_aug22/presolve.gms +++ b/modules/50_nr_soil_budget/macceff_aug22/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/50_nr_soil_budget/macceff_aug22/realization.gms b/modules/50_nr_soil_budget/macceff_aug22/realization.gms index fb48f411c4..7b1c3b437c 100644 --- a/modules/50_nr_soil_budget/macceff_aug22/realization.gms +++ b/modules/50_nr_soil_budget/macceff_aug22/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/50_nr_soil_budget/macceff_aug22/scaling.gms b/modules/50_nr_soil_budget/macceff_aug22/scaling.gms index bf3e6b7ab8..129f94b5ca 100644 --- a/modules/50_nr_soil_budget/macceff_aug22/scaling.gms +++ b/modules/50_nr_soil_budget/macceff_aug22/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/50_nr_soil_budget/macceff_aug22/sets.gms b/modules/50_nr_soil_budget/macceff_aug22/sets.gms index 23f2b7a7bb..bb7b657950 100644 --- a/modules/50_nr_soil_budget/macceff_aug22/sets.gms +++ b/modules/50_nr_soil_budget/macceff_aug22/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/50_nr_soil_budget/module.gms b/modules/50_nr_soil_budget/module.gms index 4abf256c38..ef0244db1e 100644 --- a/modules/50_nr_soil_budget/module.gms +++ b/modules/50_nr_soil_budget/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/51_nitrogen/module.gms b/modules/51_nitrogen/module.gms index 8780659389..e28a27bf21 100644 --- a/modules/51_nitrogen/module.gms +++ b/modules/51_nitrogen/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/51_nitrogen/off/declarations.gms b/modules/51_nitrogen/off/declarations.gms index bd71e8d992..e94c667137 100644 --- a/modules/51_nitrogen/off/declarations.gms +++ b/modules/51_nitrogen/off/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/51_nitrogen/off/not_used.txt b/modules/51_nitrogen/off/not_used.txt index a3d196859a..9b2518c015 100644 --- a/modules/51_nitrogen/off/not_used.txt +++ b/modules/51_nitrogen/off/not_used.txt @@ -1,9 +1,3 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de name,type,reason vm_manure, input, new flexreg structure vm_manure_confinement, input, new flexreg structure diff --git a/modules/51_nitrogen/off/postsolve.gms b/modules/51_nitrogen/off/postsolve.gms index ea979bed48..e2007c1fae 100644 --- a/modules/51_nitrogen/off/postsolve.gms +++ b/modules/51_nitrogen/off/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/51_nitrogen/off/preloop.gms b/modules/51_nitrogen/off/preloop.gms index ade9c749f0..389dbe3dc7 100644 --- a/modules/51_nitrogen/off/preloop.gms +++ b/modules/51_nitrogen/off/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/51_nitrogen/off/realization.gms b/modules/51_nitrogen/off/realization.gms index d23d7558bd..bbaf6813e7 100644 --- a/modules/51_nitrogen/off/realization.gms +++ b/modules/51_nitrogen/off/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/51_nitrogen/rescaled_jan21/declarations.gms b/modules/51_nitrogen/rescaled_jan21/declarations.gms index 20a8ad2eb8..1d5d84ad5b 100644 --- a/modules/51_nitrogen/rescaled_jan21/declarations.gms +++ b/modules/51_nitrogen/rescaled_jan21/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/51_nitrogen/rescaled_jan21/equations.gms b/modules/51_nitrogen/rescaled_jan21/equations.gms index d8bcc4b532..b41734f2a8 100644 --- a/modules/51_nitrogen/rescaled_jan21/equations.gms +++ b/modules/51_nitrogen/rescaled_jan21/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/51_nitrogen/rescaled_jan21/input.gms b/modules/51_nitrogen/rescaled_jan21/input.gms index af50fa496c..58b8db2948 100644 --- a/modules/51_nitrogen/rescaled_jan21/input.gms +++ b/modules/51_nitrogen/rescaled_jan21/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/51_nitrogen/rescaled_jan21/postsolve.gms b/modules/51_nitrogen/rescaled_jan21/postsolve.gms index ac28136098..2e5d8580cd 100644 --- a/modules/51_nitrogen/rescaled_jan21/postsolve.gms +++ b/modules/51_nitrogen/rescaled_jan21/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/51_nitrogen/rescaled_jan21/preloop.gms b/modules/51_nitrogen/rescaled_jan21/preloop.gms index 5f1c9c3322..dea9187223 100644 --- a/modules/51_nitrogen/rescaled_jan21/preloop.gms +++ b/modules/51_nitrogen/rescaled_jan21/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/51_nitrogen/rescaled_jan21/presolve.gms b/modules/51_nitrogen/rescaled_jan21/presolve.gms index 1ac5900158..32ae7f50de 100644 --- a/modules/51_nitrogen/rescaled_jan21/presolve.gms +++ b/modules/51_nitrogen/rescaled_jan21/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/51_nitrogen/rescaled_jan21/realization.gms b/modules/51_nitrogen/rescaled_jan21/realization.gms index 13e46859cc..a743c59f8a 100644 --- a/modules/51_nitrogen/rescaled_jan21/realization.gms +++ b/modules/51_nitrogen/rescaled_jan21/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/51_nitrogen/rescaled_jan21/sets.gms b/modules/51_nitrogen/rescaled_jan21/sets.gms index a44e81cc1d..e955856969 100644 --- a/modules/51_nitrogen/rescaled_jan21/sets.gms +++ b/modules/51_nitrogen/rescaled_jan21/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/52_carbon/module.gms b/modules/52_carbon/module.gms index 2e6ff2fd80..d71c31381e 100644 --- a/modules/52_carbon/module.gms +++ b/modules/52_carbon/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/52_carbon/normal_dec17/declarations.gms b/modules/52_carbon/normal_dec17/declarations.gms index db3d2b916a..694eafa440 100644 --- a/modules/52_carbon/normal_dec17/declarations.gms +++ b/modules/52_carbon/normal_dec17/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/52_carbon/normal_dec17/equations.gms b/modules/52_carbon/normal_dec17/equations.gms index 34a09b68e8..d867e36990 100644 --- a/modules/52_carbon/normal_dec17/equations.gms +++ b/modules/52_carbon/normal_dec17/equations.gms @@ -1,5 +1,4 @@ - -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -7,6 +6,7 @@ *** | Contact: magpie@pik-potsdam.de + *' @equations *** Emissions diff --git a/modules/52_carbon/normal_dec17/input.gms b/modules/52_carbon/normal_dec17/input.gms index 5ba6af7007..93016aeee8 100644 --- a/modules/52_carbon/normal_dec17/input.gms +++ b/modules/52_carbon/normal_dec17/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/52_carbon/normal_dec17/postsolve.gms b/modules/52_carbon/normal_dec17/postsolve.gms index f5d1c2d687..9b07173132 100644 --- a/modules/52_carbon/normal_dec17/postsolve.gms +++ b/modules/52_carbon/normal_dec17/postsolve.gms @@ -1,3 +1,9 @@ +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) +*** | authors, and contributors see CITATION.cff file. This file is part +*** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of +*** | AGPL-3.0, you are granted additional permissions described in the +*** | MAgPIE License Exception, version 1.0 (see LICENSE file). +*** | Contact: magpie@pik-potsdam.de *#################### R SECTION START (OUTPUT DEFINITIONS) ##################### oq52_emis_co2_actual(t,i,emis_oneoff,"marginal") = q52_emis_co2_actual.m(i,emis_oneoff); diff --git a/modules/52_carbon/normal_dec17/realization.gms b/modules/52_carbon/normal_dec17/realization.gms index 4b68eb0317..4b487eab98 100644 --- a/modules/52_carbon/normal_dec17/realization.gms +++ b/modules/52_carbon/normal_dec17/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/52_carbon/normal_dec17/sets.gms b/modules/52_carbon/normal_dec17/sets.gms index 3d9a139e79..fadf859676 100644 --- a/modules/52_carbon/normal_dec17/sets.gms +++ b/modules/52_carbon/normal_dec17/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/52_carbon/normal_dec17/start.gms b/modules/52_carbon/normal_dec17/start.gms index 9f42a4486a..fc7e67e3ff 100644 --- a/modules/52_carbon/normal_dec17/start.gms +++ b/modules/52_carbon/normal_dec17/start.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/53_methane/ipcc2006_aug22/declarations.gms b/modules/53_methane/ipcc2006_aug22/declarations.gms index 312ac5b190..aa665a4d45 100644 --- a/modules/53_methane/ipcc2006_aug22/declarations.gms +++ b/modules/53_methane/ipcc2006_aug22/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/53_methane/ipcc2006_aug22/equations.gms b/modules/53_methane/ipcc2006_aug22/equations.gms index 504b5933a7..703fd8d953 100644 --- a/modules/53_methane/ipcc2006_aug22/equations.gms +++ b/modules/53_methane/ipcc2006_aug22/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/53_methane/ipcc2006_aug22/input.gms b/modules/53_methane/ipcc2006_aug22/input.gms index 7b6bab805f..a2f9fcd702 100644 --- a/modules/53_methane/ipcc2006_aug22/input.gms +++ b/modules/53_methane/ipcc2006_aug22/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/53_methane/ipcc2006_aug22/postsolve.gms b/modules/53_methane/ipcc2006_aug22/postsolve.gms index e68194fd9d..7264e40320 100644 --- a/modules/53_methane/ipcc2006_aug22/postsolve.gms +++ b/modules/53_methane/ipcc2006_aug22/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/53_methane/ipcc2006_aug22/preloop.gms b/modules/53_methane/ipcc2006_aug22/preloop.gms index 6f5f86420c..63ccb84eab 100644 --- a/modules/53_methane/ipcc2006_aug22/preloop.gms +++ b/modules/53_methane/ipcc2006_aug22/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/53_methane/ipcc2006_aug22/realization.gms b/modules/53_methane/ipcc2006_aug22/realization.gms index 7d54609e01..c22f060cd3 100644 --- a/modules/53_methane/ipcc2006_aug22/realization.gms +++ b/modules/53_methane/ipcc2006_aug22/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/53_methane/ipcc2006_aug22/sets.gms b/modules/53_methane/ipcc2006_aug22/sets.gms index c078b4f1ab..fe9c2c498e 100644 --- a/modules/53_methane/ipcc2006_aug22/sets.gms +++ b/modules/53_methane/ipcc2006_aug22/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/53_methane/module.gms b/modules/53_methane/module.gms index cfe96161d2..0585be099f 100644 --- a/modules/53_methane/module.gms +++ b/modules/53_methane/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/53_methane/off/not_used.txt b/modules/53_methane/off/not_used.txt index 170578b49f..2c44ab6c1a 100644 --- a/modules/53_methane/off/not_used.txt +++ b/modules/53_methane/off/not_used.txt @@ -1,10 +1,3 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de - name,type,reason vm_area,input,not needed vm_dem_feed,input,not needed diff --git a/modules/53_methane/off/preloop.gms b/modules/53_methane/off/preloop.gms index b95435ad09..db700d40c7 100644 --- a/modules/53_methane/off/preloop.gms +++ b/modules/53_methane/off/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/53_methane/off/realization.gms b/modules/53_methane/off/realization.gms index adbaae6225..1ef8234cc1 100644 --- a/modules/53_methane/off/realization.gms +++ b/modules/53_methane/off/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/53_methane/off/sets.gms b/modules/53_methane/off/sets.gms index b35da9a953..552b65bfe3 100644 --- a/modules/53_methane/off/sets.gms +++ b/modules/53_methane/off/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/54_phosphorus/module.gms b/modules/54_phosphorus/module.gms index c0d60cad22..e5beef2fe6 100644 --- a/modules/54_phosphorus/module.gms +++ b/modules/54_phosphorus/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/54_phosphorus/off/declarations.gms b/modules/54_phosphorus/off/declarations.gms index b9f968eddd..7ade854edf 100644 --- a/modules/54_phosphorus/off/declarations.gms +++ b/modules/54_phosphorus/off/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/54_phosphorus/off/not_used.txt b/modules/54_phosphorus/off/not_used.txt deleted file mode 100644 index da77c77f60..0000000000 --- a/modules/54_phosphorus/off/not_used.txt +++ /dev/null @@ -1,8 +0,0 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de - -name,type,reason diff --git a/modules/54_phosphorus/off/postsolve.gms b/modules/54_phosphorus/off/postsolve.gms index bd836c8e2b..d64ac8bae2 100644 --- a/modules/54_phosphorus/off/postsolve.gms +++ b/modules/54_phosphorus/off/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/54_phosphorus/off/preloop.gms b/modules/54_phosphorus/off/preloop.gms index 61a4252d85..6111470c5f 100644 --- a/modules/54_phosphorus/off/preloop.gms +++ b/modules/54_phosphorus/off/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/54_phosphorus/off/realization.gms b/modules/54_phosphorus/off/realization.gms index a3297de220..7a736bf2fe 100644 --- a/modules/54_phosphorus/off/realization.gms +++ b/modules/54_phosphorus/off/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/55_awms/ipcc2006_aug16/declarations.gms b/modules/55_awms/ipcc2006_aug16/declarations.gms index 5ed6103ed8..3a1a2b97ca 100644 --- a/modules/55_awms/ipcc2006_aug16/declarations.gms +++ b/modules/55_awms/ipcc2006_aug16/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/55_awms/ipcc2006_aug16/equations.gms b/modules/55_awms/ipcc2006_aug16/equations.gms index 89f6e5397e..55088d134c 100644 --- a/modules/55_awms/ipcc2006_aug16/equations.gms +++ b/modules/55_awms/ipcc2006_aug16/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/55_awms/ipcc2006_aug16/input.gms b/modules/55_awms/ipcc2006_aug16/input.gms index 7fc3348731..fb9a427456 100644 --- a/modules/55_awms/ipcc2006_aug16/input.gms +++ b/modules/55_awms/ipcc2006_aug16/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/55_awms/ipcc2006_aug16/nl_fix.gms b/modules/55_awms/ipcc2006_aug16/nl_fix.gms index e06a29124a..e9dfdad391 100644 --- a/modules/55_awms/ipcc2006_aug16/nl_fix.gms +++ b/modules/55_awms/ipcc2006_aug16/nl_fix.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/55_awms/ipcc2006_aug16/nl_relax.gms b/modules/55_awms/ipcc2006_aug16/nl_relax.gms index e06a29124a..e9dfdad391 100644 --- a/modules/55_awms/ipcc2006_aug16/nl_relax.gms +++ b/modules/55_awms/ipcc2006_aug16/nl_relax.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/55_awms/ipcc2006_aug16/nl_release.gms b/modules/55_awms/ipcc2006_aug16/nl_release.gms index e06a29124a..e9dfdad391 100644 --- a/modules/55_awms/ipcc2006_aug16/nl_release.gms +++ b/modules/55_awms/ipcc2006_aug16/nl_release.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/55_awms/ipcc2006_aug16/postsolve.gms b/modules/55_awms/ipcc2006_aug16/postsolve.gms index 099bab4aa6..5342c7c7f0 100644 --- a/modules/55_awms/ipcc2006_aug16/postsolve.gms +++ b/modules/55_awms/ipcc2006_aug16/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/55_awms/ipcc2006_aug16/preloop.gms b/modules/55_awms/ipcc2006_aug16/preloop.gms index dcdf0269c9..f27c059366 100644 --- a/modules/55_awms/ipcc2006_aug16/preloop.gms +++ b/modules/55_awms/ipcc2006_aug16/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/55_awms/ipcc2006_aug16/presolve.gms b/modules/55_awms/ipcc2006_aug16/presolve.gms index c6e8e143f7..15ad3db493 100644 --- a/modules/55_awms/ipcc2006_aug16/presolve.gms +++ b/modules/55_awms/ipcc2006_aug16/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/55_awms/ipcc2006_aug16/realization.gms b/modules/55_awms/ipcc2006_aug16/realization.gms index 01479af633..522f9ec9c0 100644 --- a/modules/55_awms/ipcc2006_aug16/realization.gms +++ b/modules/55_awms/ipcc2006_aug16/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/55_awms/ipcc2006_aug16/sets.gms b/modules/55_awms/ipcc2006_aug16/sets.gms index 925d887434..8c0b893185 100644 --- a/modules/55_awms/ipcc2006_aug16/sets.gms +++ b/modules/55_awms/ipcc2006_aug16/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/55_awms/module.gms b/modules/55_awms/module.gms index 389692d08a..80c6e557d8 100644 --- a/modules/55_awms/module.gms +++ b/modules/55_awms/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/55_awms/off/declarations.gms b/modules/55_awms/off/declarations.gms index f37c1718f2..a947d4c989 100644 --- a/modules/55_awms/off/declarations.gms +++ b/modules/55_awms/off/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/55_awms/off/not_used.txt b/modules/55_awms/off/not_used.txt index 1f7429bbfb..080419a5db 100644 --- a/modules/55_awms/off/not_used.txt +++ b/modules/55_awms/off/not_used.txt @@ -1,10 +1,3 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de - name,type,reason vm_dem_feed,input,not needed fm_attributes, input, not needed diff --git a/modules/55_awms/off/postsolve.gms b/modules/55_awms/off/postsolve.gms index 873ceb14c3..454626e090 100644 --- a/modules/55_awms/off/postsolve.gms +++ b/modules/55_awms/off/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/55_awms/off/preloop.gms b/modules/55_awms/off/preloop.gms index 328869876a..80c1b17ea1 100644 --- a/modules/55_awms/off/preloop.gms +++ b/modules/55_awms/off/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/55_awms/off/realization.gms b/modules/55_awms/off/realization.gms index 315690f2f8..79c5b3df07 100644 --- a/modules/55_awms/off/realization.gms +++ b/modules/55_awms/off/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/55_awms/off/sets.gms b/modules/55_awms/off/sets.gms index 947672a48e..34d501b376 100644 --- a/modules/55_awms/off/sets.gms +++ b/modules/55_awms/off/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/56_ghg_policy/module.gms b/modules/56_ghg_policy/module.gms index 5db2eed119..e10c49e771 100644 --- a/modules/56_ghg_policy/module.gms +++ b/modules/56_ghg_policy/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/56_ghg_policy/price_aug22/declarations.gms b/modules/56_ghg_policy/price_aug22/declarations.gms index 07ccf047fe..657316472b 100644 --- a/modules/56_ghg_policy/price_aug22/declarations.gms +++ b/modules/56_ghg_policy/price_aug22/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/56_ghg_policy/price_aug22/equations.gms b/modules/56_ghg_policy/price_aug22/equations.gms index c030cf0e8e..eb2108bbcb 100644 --- a/modules/56_ghg_policy/price_aug22/equations.gms +++ b/modules/56_ghg_policy/price_aug22/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/56_ghg_policy/price_aug22/input.gms b/modules/56_ghg_policy/price_aug22/input.gms index 02ad4c5f9a..85a821f325 100644 --- a/modules/56_ghg_policy/price_aug22/input.gms +++ b/modules/56_ghg_policy/price_aug22/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -36,7 +36,7 @@ sets ; scalars - s56_limit_ch4_n2o_price upper limit for CH4 and N2O GHG prices (USD05MER per tC) / 1000 / + s56_limit_ch4_n2o_price upper limit for CH4 and N2O GHG prices (USD05MER per tC) / 4000 / s56_cprice_red_factor reduction factor for CO2 price (-) / 1 / s56_ghgprice_start start year for ghg price phase-in (year) / 2025 / s56_ghgprice_phase_in Switch for phasing-in GHG price over a 20 year period (1=on 0=off) / 0 / diff --git a/modules/56_ghg_policy/price_aug22/postsolve.gms b/modules/56_ghg_policy/price_aug22/postsolve.gms index 3171b07f62..767a3d4d9f 100644 --- a/modules/56_ghg_policy/price_aug22/postsolve.gms +++ b/modules/56_ghg_policy/price_aug22/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/56_ghg_policy/price_aug22/preloop.gms b/modules/56_ghg_policy/price_aug22/preloop.gms index 323d21fe88..fbdac44080 100644 --- a/modules/56_ghg_policy/price_aug22/preloop.gms +++ b/modules/56_ghg_policy/price_aug22/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/56_ghg_policy/price_aug22/realization.gms b/modules/56_ghg_policy/price_aug22/realization.gms index ee5908c5c2..2be5b23630 100644 --- a/modules/56_ghg_policy/price_aug22/realization.gms +++ b/modules/56_ghg_policy/price_aug22/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/56_ghg_policy/price_aug22/scaling.gms b/modules/56_ghg_policy/price_aug22/scaling.gms index 90ce5ca5cc..5fa1e8603c 100644 --- a/modules/56_ghg_policy/price_aug22/scaling.gms +++ b/modules/56_ghg_policy/price_aug22/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/56_ghg_policy/price_aug22/sets.gms b/modules/56_ghg_policy/price_aug22/sets.gms index b067eb9279..b0be133571 100644 --- a/modules/56_ghg_policy/price_aug22/sets.gms +++ b/modules/56_ghg_policy/price_aug22/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/57_maccs/module.gms b/modules/57_maccs/module.gms index f9b67b4d61..d1fe16963f 100644 --- a/modules/57_maccs/module.gms +++ b/modules/57_maccs/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/57_maccs/on_aug22/declarations.gms b/modules/57_maccs/on_aug22/declarations.gms index 2177ef177a..a40dae0e16 100644 --- a/modules/57_maccs/on_aug22/declarations.gms +++ b/modules/57_maccs/on_aug22/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -22,13 +22,13 @@ equations ; positive variables - vm_maccs_costs(i,req) Costs of technical mitigation of GHG emissions (mio. USD95MER per yr) + vm_maccs_costs(i,factors) Costs of technical mitigation of GHG emissions (mio. USD95MER per yr) ; *#################### R SECTION START (OUTPUT DECLARATIONS) #################### parameters - ov_maccs_costs(t,i,req,type) Costs of technical mitigation of GHG emissions (mio. USD95MER per yr) - oq57_labor_costs(t,i,type) Calculation of labor costs of technical mitigation (mio. USD95MER per yr) - oq57_capital_costs(t,i,type) Calculation of capital costs of technical mitigation (mio. USD95MER per yr) + ov_maccs_costs(t,i,factors,type) Costs of technical mitigation of GHG emissions (mio. USD95MER per yr) + oq57_labor_costs(t,i,type) Calculation of labor costs of technical mitigation (mio. USD95MER per yr) + oq57_capital_costs(t,i,type) Calculation of capital costs of technical mitigation (mio. USD95MER per yr) ; *##################### R SECTION END (OUTPUT DECLARATIONS) ##################### diff --git a/modules/57_maccs/on_aug22/equations.gms b/modules/57_maccs/on_aug22/equations.gms index 285fd33751..9c46f722b4 100644 --- a/modules/57_maccs/on_aug22/equations.gms +++ b/modules/57_maccs/on_aug22/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -49,4 +49,4 @@ q57_capital_costs(i2) .. + sum(emis_source_inorg_fert_n2o, (vm_emissions_reg(i2,emis_source_inorg_fert_n2o,"n2o_n_direct") / s57_implicit_emis_factor) * sum(ct,im_maccs_mitigation(ct,i2,emis_source_inorg_fert_n2o,"n2o_n_direct")) * s57_implicit_fert_cost)) - * sum(ct, pm_cost_share_crops(ct ,i2,"capital")); \ No newline at end of file + * sum(ct, pm_cost_share_crops(ct ,i2,"capital")); diff --git a/modules/57_maccs/on_aug22/input.gms b/modules/57_maccs/on_aug22/input.gms index 216a15d763..6ae9794d03 100644 --- a/modules/57_maccs/on_aug22/input.gms +++ b/modules/57_maccs/on_aug22/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/57_maccs/on_aug22/not_used.txt b/modules/57_maccs/on_aug22/not_used.txt deleted file mode 100644 index 4327f1b371..0000000000 --- a/modules/57_maccs/on_aug22/not_used.txt +++ /dev/null @@ -1 +0,0 @@ -name,type,reason diff --git a/modules/57_maccs/on_aug22/postsolve.gms b/modules/57_maccs/on_aug22/postsolve.gms index 1ed1872dd4..4eaab26f49 100644 --- a/modules/57_maccs/on_aug22/postsolve.gms +++ b/modules/57_maccs/on_aug22/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -8,16 +8,16 @@ *#################### R SECTION START (OUTPUT DEFINITIONS) ##################### - ov_maccs_costs(t,i,req,"marginal") = vm_maccs_costs.m(i,req); - oq57_labor_costs(t,i,"marginal") = q57_labor_costs.m(i); - oq57_capital_costs(t,i,"marginal") = q57_capital_costs.m(i); - ov_maccs_costs(t,i,req,"level") = vm_maccs_costs.l(i,req); - oq57_labor_costs(t,i,"level") = q57_labor_costs.l(i); - oq57_capital_costs(t,i,"level") = q57_capital_costs.l(i); - ov_maccs_costs(t,i,req,"upper") = vm_maccs_costs.up(i,req); - oq57_labor_costs(t,i,"upper") = q57_labor_costs.up(i); - oq57_capital_costs(t,i,"upper") = q57_capital_costs.up(i); - ov_maccs_costs(t,i,req,"lower") = vm_maccs_costs.lo(i,req); - oq57_labor_costs(t,i,"lower") = q57_labor_costs.lo(i); - oq57_capital_costs(t,i,"lower") = q57_capital_costs.lo(i); + ov_maccs_costs(t,i,factors,"marginal") = vm_maccs_costs.m(i,factors); + oq57_labor_costs(t,i,"marginal") = q57_labor_costs.m(i); + oq57_capital_costs(t,i,"marginal") = q57_capital_costs.m(i); + ov_maccs_costs(t,i,factors,"level") = vm_maccs_costs.l(i,factors); + oq57_labor_costs(t,i,"level") = q57_labor_costs.l(i); + oq57_capital_costs(t,i,"level") = q57_capital_costs.l(i); + ov_maccs_costs(t,i,factors,"upper") = vm_maccs_costs.up(i,factors); + oq57_labor_costs(t,i,"upper") = q57_labor_costs.up(i); + oq57_capital_costs(t,i,"upper") = q57_capital_costs.up(i); + ov_maccs_costs(t,i,factors,"lower") = vm_maccs_costs.lo(i,factors); + oq57_labor_costs(t,i,"lower") = q57_labor_costs.lo(i); + oq57_capital_costs(t,i,"lower") = q57_capital_costs.lo(i); *##################### R SECTION END (OUTPUT DEFINITIONS) ###################### diff --git a/modules/57_maccs/on_aug22/preloop.gms b/modules/57_maccs/on_aug22/preloop.gms index 27d96d5a4e..50a8c77e03 100644 --- a/modules/57_maccs/on_aug22/preloop.gms +++ b/modules/57_maccs/on_aug22/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/57_maccs/on_aug22/realization.gms b/modules/57_maccs/on_aug22/realization.gms index 2aa0de5401..a361edf7d4 100644 --- a/modules/57_maccs/on_aug22/realization.gms +++ b/modules/57_maccs/on_aug22/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/57_maccs/on_aug22/scaling.gms b/modules/57_maccs/on_aug22/scaling.gms index ac08c07077..c9e888b5fa 100644 --- a/modules/57_maccs/on_aug22/scaling.gms +++ b/modules/57_maccs/on_aug22/scaling.gms @@ -1,8 +1,8 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the *** | MAgPIE License Exception, version 1.0 (see LICENSE file). *** | Contact: magpie@pik-potsdam.de -vm_maccs_costs.scale(i,req) = 10e4; +vm_maccs_costs.scale(i,factors) = 10e4; diff --git a/modules/57_maccs/on_aug22/sets.gms b/modules/57_maccs/on_aug22/sets.gms index a7aac8d11b..cc6abdef66 100644 --- a/modules/57_maccs/on_aug22/sets.gms +++ b/modules/57_maccs/on_aug22/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/58_peatland/module.gms b/modules/58_peatland/module.gms index d29bbd5871..66a828b7bf 100644 --- a/modules/58_peatland/module.gms +++ b/modules/58_peatland/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/58_peatland/off/declarations.gms b/modules/58_peatland/off/declarations.gms index 53dc9a3a8a..9cc206142c 100644 --- a/modules/58_peatland/off/declarations.gms +++ b/modules/58_peatland/off/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/58_peatland/off/not_used.txt b/modules/58_peatland/off/not_used.txt index 79733353c7..33f27da3b8 100644 --- a/modules/58_peatland/off/not_used.txt +++ b/modules/58_peatland/off/not_used.txt @@ -1,10 +1,3 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de - name, type, reason vm_land, input, not used pcm_land, input, not used diff --git a/modules/58_peatland/off/postsolve.gms b/modules/58_peatland/off/postsolve.gms index 801397d71a..c2a26ae51b 100644 --- a/modules/58_peatland/off/postsolve.gms +++ b/modules/58_peatland/off/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/58_peatland/off/preloop.gms b/modules/58_peatland/off/preloop.gms index dbac78cb8a..fe21ad4a22 100644 --- a/modules/58_peatland/off/preloop.gms +++ b/modules/58_peatland/off/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/58_peatland/off/realization.gms b/modules/58_peatland/off/realization.gms index a4783dd561..699b51bb76 100644 --- a/modules/58_peatland/off/realization.gms +++ b/modules/58_peatland/off/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/58_peatland/on/declarations.gms b/modules/58_peatland/on/declarations.gms index 50c060d0ec..227bc71ab0 100644 --- a/modules/58_peatland/on/declarations.gms +++ b/modules/58_peatland/on/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/58_peatland/on/equations.gms b/modules/58_peatland/on/equations.gms index ba13f31a1f..80ca746877 100644 --- a/modules/58_peatland/on/equations.gms +++ b/modules/58_peatland/on/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/58_peatland/on/input.gms b/modules/58_peatland/on/input.gms index 2ae4863fe6..2a9a73cc03 100644 --- a/modules/58_peatland/on/input.gms +++ b/modules/58_peatland/on/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/58_peatland/on/postsolve.gms b/modules/58_peatland/on/postsolve.gms index 55dedda964..605da26886 100644 --- a/modules/58_peatland/on/postsolve.gms +++ b/modules/58_peatland/on/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/58_peatland/on/preloop.gms b/modules/58_peatland/on/preloop.gms index 5383d6728c..3bc9c91487 100644 --- a/modules/58_peatland/on/preloop.gms +++ b/modules/58_peatland/on/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/58_peatland/on/presolve.gms b/modules/58_peatland/on/presolve.gms index fc4294ddb3..12ddea0b38 100644 --- a/modules/58_peatland/on/presolve.gms +++ b/modules/58_peatland/on/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/58_peatland/on/realization.gms b/modules/58_peatland/on/realization.gms index 19a07438b3..41418aa77b 100644 --- a/modules/58_peatland/on/realization.gms +++ b/modules/58_peatland/on/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/58_peatland/on/scaling.gms b/modules/58_peatland/on/scaling.gms index 27f35f7ff0..0d3b287285 100644 --- a/modules/58_peatland/on/scaling.gms +++ b/modules/58_peatland/on/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/58_peatland/on/sets.gms b/modules/58_peatland/on/sets.gms index 18e22004b4..48ee134bb1 100644 --- a/modules/58_peatland/on/sets.gms +++ b/modules/58_peatland/on/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/cellpool_aug16/declarations.gms b/modules/59_som/cellpool_aug16/declarations.gms index 1247902c95..c180cc9531 100644 --- a/modules/59_som/cellpool_aug16/declarations.gms +++ b/modules/59_som/cellpool_aug16/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/cellpool_aug16/equations.gms b/modules/59_som/cellpool_aug16/equations.gms index d1da6b39ce..92a37b8ca8 100644 --- a/modules/59_som/cellpool_aug16/equations.gms +++ b/modules/59_som/cellpool_aug16/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/cellpool_aug16/input.gms b/modules/59_som/cellpool_aug16/input.gms index 1bdc046ed8..ea13862d3a 100644 --- a/modules/59_som/cellpool_aug16/input.gms +++ b/modules/59_som/cellpool_aug16/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/cellpool_aug16/postsolve.gms b/modules/59_som/cellpool_aug16/postsolve.gms index 38fee08f82..e565a89ec1 100644 --- a/modules/59_som/cellpool_aug16/postsolve.gms +++ b/modules/59_som/cellpool_aug16/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/cellpool_aug16/preloop.gms b/modules/59_som/cellpool_aug16/preloop.gms index 419440ff81..e6f826141e 100644 --- a/modules/59_som/cellpool_aug16/preloop.gms +++ b/modules/59_som/cellpool_aug16/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/cellpool_aug16/presolve.gms b/modules/59_som/cellpool_aug16/presolve.gms index 9be93d69a7..3354ddb84c 100644 --- a/modules/59_som/cellpool_aug16/presolve.gms +++ b/modules/59_som/cellpool_aug16/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/cellpool_aug16/realization.gms b/modules/59_som/cellpool_aug16/realization.gms index 7f313bd06b..c038b2360a 100644 --- a/modules/59_som/cellpool_aug16/realization.gms +++ b/modules/59_som/cellpool_aug16/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/cellpool_aug16/scaling.gms b/modules/59_som/cellpool_aug16/scaling.gms index b19d730a31..ac412019a1 100644 --- a/modules/59_som/cellpool_aug16/scaling.gms +++ b/modules/59_som/cellpool_aug16/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/cellpool_aug16/sets.gms b/modules/59_som/cellpool_aug16/sets.gms index ab737c4e98..c93b0f755d 100644 --- a/modules/59_som/cellpool_aug16/sets.gms +++ b/modules/59_som/cellpool_aug16/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/cellpool_jan23/declarations.gms b/modules/59_som/cellpool_jan23/declarations.gms index 1247902c95..c180cc9531 100644 --- a/modules/59_som/cellpool_jan23/declarations.gms +++ b/modules/59_som/cellpool_jan23/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/cellpool_jan23/equations.gms b/modules/59_som/cellpool_jan23/equations.gms index d1da6b39ce..92a37b8ca8 100644 --- a/modules/59_som/cellpool_jan23/equations.gms +++ b/modules/59_som/cellpool_jan23/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/cellpool_jan23/input.gms b/modules/59_som/cellpool_jan23/input.gms index 1bdc046ed8..cb8e7509ba 100644 --- a/modules/59_som/cellpool_jan23/input.gms +++ b/modules/59_som/cellpool_jan23/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -9,21 +9,21 @@ scalars s59_nitrogen_uptake Maximum plant available nitrogen from soil organic matter loss (tN per ha) / 0.2 / ; -table f59_cratio_landuse(climate59,kcr) Ratio of soil carbon relative to potential natural vegetation soil carbon for different landuse (1) +table f59_cratio_landuse(i,climate59_2019,kcr) Ratio of soil carbon relative to potential natural vegetation soil carbon for different landuse (1) $ondelim -$include "./modules/59_som/cellpool_aug16/input/f59_ch5_F_LU.csv" +$include "./modules/59_som/cellpool_jan23/input/f59_ch5_F_LU_2019reg.cs3" $offdelim ; table f59_cratio_tillage(climate59,tillage59) Ratio of soil carbon relative to potential natural vegetation soil carbon for different soil management (1) $ondelim -$include "./modules/59_som/cellpool_aug16/input/f59_ch5_F_MG.csv" +$include "./modules/59_som/cellpool_jan23/input/f59_ch5_F_MG.csv" $offdelim ; table f59_cratio_inputs(climate59,inputs59) Ratio of soil carbon relative to potential natural vegetation soil carbon for different input intensity (1) $ondelim -$include "./modules/59_som/cellpool_aug16/input/f59_ch5_F_I.csv" +$include "./modules/59_som/cellpool_jan23/input/f59_ch5_F_I.csv" $offdelim ; @@ -33,18 +33,11 @@ $setglobal c59_irrigation_scenario on table f59_cratio_irrigation(climate59,w,kcr) Ratio of soil carbon relative to potential natural vegetation soil carbon for different irrigation schemes (1) $ondelim -$include "./modules/59_som/cellpool_aug16/input/f59_ch5_F_IRR.cs3" +$include "./modules/59_som/cellpool_jan23/input/f59_ch5_F_IRR.cs3" $offdelim ; $if "%c59_irrigation_scenario%" == "off" f59_cratio_irrigation(climate59,w,kcr) = 1; - -* table f59_som_initialisation_pools(t_all,j,pools59) Initialisation pools for soil organic carbon (mio. tC) -* $ondelim -* $include "./modules/59_som/cellpool_aug16/input/f59_som_initialisation_pools.cs3" -* $offdelim -* ; - $setglobal c59_som_scenario cc * options: cc (climate change) * nocc (no climate change) diff --git a/modules/59_som/cellpool_jan23/input/files b/modules/59_som/cellpool_jan23/input/files index 7693829b74..76fd6cae23 100644 --- a/modules/59_som/cellpool_jan23/input/files +++ b/modules/59_som/cellpool_jan23/input/files @@ -1,6 +1,5 @@ * list of files that are required here f59_ch5_F_I.csv -f59_ch5_F_LU.csv f59_ch5_F_MG.csv +f59_ch5_F_LU_2019reg.cs3 f59_ch5_F_IRR.cs3 -f59_som_initialisation_pools.cs3 diff --git a/modules/59_som/cellpool_jan23/postsolve.gms b/modules/59_som/cellpool_jan23/postsolve.gms index 38fee08f82..e565a89ec1 100644 --- a/modules/59_som/cellpool_jan23/postsolve.gms +++ b/modules/59_som/cellpool_jan23/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/cellpool_jan23/preloop.gms b/modules/59_som/cellpool_jan23/preloop.gms index 419440ff81..0440e1940e 100644 --- a/modules/59_som/cellpool_jan23/preloop.gms +++ b/modules/59_som/cellpool_jan23/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -13,7 +13,7 @@ i59_subsoilc_density(t_all,j) = fm_carbon_density(t_all,j,"secdforest","soilc") p59_som_pool(j,"crop") = sum((climate59,kcr),sum(clcl_climate59(clcl,climate59), - pm_climate_class(j,clcl)) * f59_cratio_landuse(climate59,kcr) + pm_climate_class(j,clcl)) * sum(cell(i,j), f59_cratio_landuse(i,climate59,kcr)) * f59_topsoilc_density("y1995",j) * sum(w, fm_croparea("y1995",j,w,kcr))); p59_som_pool(j,noncropland59) = @@ -57,7 +57,7 @@ i59_input_share(i,"medium_input")=1; i59_cratio(j,kcr,w) = sum((cell(i,j),tillage59,inputs59,climate59), sum(clcl_climate59(clcl,climate59),pm_climate_class(j,clcl)) - * f59_cratio_landuse(climate59,kcr) + * f59_cratio_landuse(i,climate59,kcr) * i59_tillage_share(i,tillage59) * f59_cratio_tillage(climate59,tillage59) * i59_input_share(i,inputs59) @@ -68,9 +68,9 @@ i59_cratio(j,kcr,w) = sum((cell(i,j),tillage59,inputs59,climate59), *' and reduced tillage. Assumed to have no irrigation, so irrigation multiplier *' is 1. -i59_cratio_fallow(j) = sum(climate59, +i59_cratio_fallow(j) = sum((cell(i,j),climate59), sum(clcl_climate59(clcl,climate59),pm_climate_class(j,clcl)) - * f59_cratio_landuse(climate59,"maiz") + * f59_cratio_landuse(i,climate59,"maiz") * f59_cratio_tillage(climate59,"reduced_tillage") * f59_cratio_inputs(climate59,"low_input")); *' @stop diff --git a/modules/59_som/cellpool_jan23/presolve.gms b/modules/59_som/cellpool_jan23/presolve.gms index 9be93d69a7..3354ddb84c 100644 --- a/modules/59_som/cellpool_jan23/presolve.gms +++ b/modules/59_som/cellpool_jan23/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/cellpool_jan23/realization.gms b/modules/59_som/cellpool_jan23/realization.gms index 7f313bd06b..d3cc9b2078 100644 --- a/modules/59_som/cellpool_jan23/realization.gms +++ b/modules/59_som/cellpool_jan23/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -6,8 +6,8 @@ *** | Contact: magpie@pik-potsdam.de *' @description -*' The cellpool_aug16 realization is built on the IPCC 2006 Guidelines for -*' National Greenhouse Gas Inventories (@ipcc_2006_2006.). It calculates the loss of +*' The cellpool_aug23 realization is built on revised IPCC 2019 Guidelines for +*' National Greenhouse Gas Inventories (@calvo_buendia_ipcc_2019). It calculates the loss of *' soil carbon due to cropping activities and management based on stock change factors, *' compared to potential natural vegetation. *' This approach also accounts for the temporal dimension of soil organic carbon change, @@ -26,12 +26,12 @@ *####################### R SECTION START (PHASES) ############################## -$Ifi "%phase%" == "sets" $include "./modules/59_som/cellpool_aug16/sets.gms" -$Ifi "%phase%" == "declarations" $include "./modules/59_som/cellpool_aug16/declarations.gms" -$Ifi "%phase%" == "input" $include "./modules/59_som/cellpool_aug16/input.gms" -$Ifi "%phase%" == "equations" $include "./modules/59_som/cellpool_aug16/equations.gms" -$Ifi "%phase%" == "scaling" $include "./modules/59_som/cellpool_aug16/scaling.gms" -$Ifi "%phase%" == "preloop" $include "./modules/59_som/cellpool_aug16/preloop.gms" -$Ifi "%phase%" == "presolve" $include "./modules/59_som/cellpool_aug16/presolve.gms" -$Ifi "%phase%" == "postsolve" $include "./modules/59_som/cellpool_aug16/postsolve.gms" +$Ifi "%phase%" == "sets" $include "./modules/59_som/cellpool_jan23/sets.gms" +$Ifi "%phase%" == "declarations" $include "./modules/59_som/cellpool_jan23/declarations.gms" +$Ifi "%phase%" == "input" $include "./modules/59_som/cellpool_jan23/input.gms" +$Ifi "%phase%" == "equations" $include "./modules/59_som/cellpool_jan23/equations.gms" +$Ifi "%phase%" == "scaling" $include "./modules/59_som/cellpool_jan23/scaling.gms" +$Ifi "%phase%" == "preloop" $include "./modules/59_som/cellpool_jan23/preloop.gms" +$Ifi "%phase%" == "presolve" $include "./modules/59_som/cellpool_jan23/presolve.gms" +$Ifi "%phase%" == "postsolve" $include "./modules/59_som/cellpool_jan23/postsolve.gms" *######################## R SECTION END (PHASES) ############################### diff --git a/modules/59_som/cellpool_jan23/scaling.gms b/modules/59_som/cellpool_jan23/scaling.gms index b19d730a31..ac412019a1 100644 --- a/modules/59_som/cellpool_jan23/scaling.gms +++ b/modules/59_som/cellpool_jan23/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/cellpool_jan23/sets.gms b/modules/59_som/cellpool_jan23/sets.gms index ab737c4e98..51d31fb065 100644 --- a/modules/59_som/cellpool_jan23/sets.gms +++ b/modules/59_som/cellpool_jan23/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -16,9 +16,14 @@ tillage59 Tillage categories of IPCC inputs59 Input management categories of IPCC /low_input,medium_input,high_input_nomanure,high_input_manure/ -climate59 Climate classes of IPCC 2006 +climate59_2019 Climate classes of IPCC 2019 +/temperate_dry,temperate_moist,tropical_dry,tropical_moist,boreal_dry,boreal_moist/ + +climate59(climate59_2019) Climate classes of IPCC 2006 /temperate_dry,temperate_moist,tropical_dry,tropical_moist/ +*** Csa, Dwa should be dry (maybe others as well) + clcl_climate59(clcl,climate59) Climate classification types / Af .(tropical_moist) "equatorial fully humid" @@ -32,9 +37,9 @@ clcl_climate59(clcl,climate59) Climate classification types Cfa .(temperate_moist) "warm temperate fully humid hot summer" Cfb .(temperate_moist) "warm temperate fully humid warm summer" Cfc .(temperate_moist) "warm temperate fully humid cool summer" - Csa .(temperate_moist) "warm temperate summer dry hot summer" - Csb .(temperate_moist) "warm temperate summer dry warm summer" - Csc .(temperate_moist) "warm temperate summer dry cool summer" + Csa .(temperate_moist) "warm temperate winter dry hot summer" + Csb .(temperate_moist) "warm temperate winter dry warm summer" + Csc .(temperate_moist) "warm temperate winter dry cool summer" Cwa .(temperate_moist) "warm temperate winter dry hot summer" Cwb .(temperate_moist) "warm temperate winter dry warm summer" Cwc .(temperate_moist) "warm temperate winter dry cool summer" @@ -42,10 +47,10 @@ clcl_climate59(clcl,climate59) Climate classification types Dfb .(temperate_moist) "snow fully humid warm summer" Dfc .(temperate_moist) "snow fully humid cool summer" Dfd .(temperate_moist) "snow fully humid extremely continental" - Dsa .(temperate_moist) "snow summer dry hot summer" - Dsb .(temperate_moist) "snow summer dry warm summer" - Dsc .(temperate_moist) "snow summer dry cool summer" - Dsd .(temperate_dry) "snow summer dry extremely continental" + Dsa .(temperate_moist) "snow winter dry hot summer" + Dsb .(temperate_moist) "snow winter dry warm summer" + Dsc .(temperate_moist) "snow winter dry cool summer" + Dsd .(temperate_dry) "snow winder dry extremely continental" Dwa .(temperate_moist) "snow winter dry hot summer" Dwb .(temperate_moist) "snow winter dry warm summer" Dwc .(temperate_moist) "snow winter dry cool summer" diff --git a/modules/59_som/module.gms b/modules/59_som/module.gms index 1baa1bfead..b6536003f0 100644 --- a/modules/59_som/module.gms +++ b/modules/59_som/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -18,5 +18,6 @@ *###################### R SECTION START (MODULETYPES) ########################## $Ifi "%som%" == "cellpool_aug16" $include "./modules/59_som/cellpool_aug16/realization.gms" +$Ifi "%som%" == "cellpool_jan23" $include "./modules/59_som/cellpool_jan23/realization.gms" $Ifi "%som%" == "static_jan19" $include "./modules/59_som/static_jan19/realization.gms" *###################### R SECTION END (MODULETYPES) ############################ diff --git a/modules/59_som/static_jan19/declarations.gms b/modules/59_som/static_jan19/declarations.gms index 39277ab60e..3a38a3905b 100644 --- a/modules/59_som/static_jan19/declarations.gms +++ b/modules/59_som/static_jan19/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/static_jan19/equations.gms b/modules/59_som/static_jan19/equations.gms index 69637ebae5..444849f403 100644 --- a/modules/59_som/static_jan19/equations.gms +++ b/modules/59_som/static_jan19/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/static_jan19/input.gms b/modules/59_som/static_jan19/input.gms index 80bc891d42..72e5432048 100644 --- a/modules/59_som/static_jan19/input.gms +++ b/modules/59_som/static_jan19/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/static_jan19/not_used.txt b/modules/59_som/static_jan19/not_used.txt index a4536d3780..9bd4f91711 100644 --- a/modules/59_som/static_jan19/not_used.txt +++ b/modules/59_som/static_jan19/not_used.txt @@ -1,9 +1,3 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de name,type,reason pm_land_start,input,questionnaire fm_croparea,input,questionnaire diff --git a/modules/59_som/static_jan19/postsolve.gms b/modules/59_som/static_jan19/postsolve.gms index 6da3c6367e..76ed279b36 100644 --- a/modules/59_som/static_jan19/postsolve.gms +++ b/modules/59_som/static_jan19/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/static_jan19/preloop.gms b/modules/59_som/static_jan19/preloop.gms index c1550965b6..ef41e2547a 100644 --- a/modules/59_som/static_jan19/preloop.gms +++ b/modules/59_som/static_jan19/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/static_jan19/presolve.gms b/modules/59_som/static_jan19/presolve.gms index 927011a4e2..a66215a217 100644 --- a/modules/59_som/static_jan19/presolve.gms +++ b/modules/59_som/static_jan19/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/static_jan19/realization.gms b/modules/59_som/static_jan19/realization.gms index 373d0df367..0bbc00e730 100644 --- a/modules/59_som/static_jan19/realization.gms +++ b/modules/59_som/static_jan19/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/59_som/static_jan19/sets.gms b/modules/59_som/static_jan19/sets.gms index b7463f3a51..53e267cc15 100644 --- a/modules/59_som/static_jan19/sets.gms +++ b/modules/59_som/static_jan19/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/60_bioenergy/1stgen_priced_dec18/declarations.gms b/modules/60_bioenergy/1stgen_priced_dec18/declarations.gms index 8eae4bd6fa..7b49585657 100644 --- a/modules/60_bioenergy/1stgen_priced_dec18/declarations.gms +++ b/modules/60_bioenergy/1stgen_priced_dec18/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/60_bioenergy/1stgen_priced_dec18/equations.gms b/modules/60_bioenergy/1stgen_priced_dec18/equations.gms index 58b3f300f3..6d2b697dd0 100644 --- a/modules/60_bioenergy/1stgen_priced_dec18/equations.gms +++ b/modules/60_bioenergy/1stgen_priced_dec18/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/60_bioenergy/1stgen_priced_dec18/input.gms b/modules/60_bioenergy/1stgen_priced_dec18/input.gms index 744730ee59..472c4327e1 100644 --- a/modules/60_bioenergy/1stgen_priced_dec18/input.gms +++ b/modules/60_bioenergy/1stgen_priced_dec18/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/60_bioenergy/1stgen_priced_dec18/not_used.txt b/modules/60_bioenergy/1stgen_priced_dec18/not_used.txt deleted file mode 100644 index da77c77f60..0000000000 --- a/modules/60_bioenergy/1stgen_priced_dec18/not_used.txt +++ /dev/null @@ -1,8 +0,0 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de - -name,type,reason diff --git a/modules/60_bioenergy/1stgen_priced_dec18/postsolve.gms b/modules/60_bioenergy/1stgen_priced_dec18/postsolve.gms index dd3382afc4..168269211e 100644 --- a/modules/60_bioenergy/1stgen_priced_dec18/postsolve.gms +++ b/modules/60_bioenergy/1stgen_priced_dec18/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/60_bioenergy/1stgen_priced_dec18/preloop.gms b/modules/60_bioenergy/1stgen_priced_dec18/preloop.gms index 258ddc5500..c23528d17e 100644 --- a/modules/60_bioenergy/1stgen_priced_dec18/preloop.gms +++ b/modules/60_bioenergy/1stgen_priced_dec18/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/60_bioenergy/1stgen_priced_dec18/presolve.gms b/modules/60_bioenergy/1stgen_priced_dec18/presolve.gms index 9b9c30ffef..abf8f02708 100644 --- a/modules/60_bioenergy/1stgen_priced_dec18/presolve.gms +++ b/modules/60_bioenergy/1stgen_priced_dec18/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/60_bioenergy/1stgen_priced_dec18/realization.gms b/modules/60_bioenergy/1stgen_priced_dec18/realization.gms index fa21de9983..e5472ca3f9 100644 --- a/modules/60_bioenergy/1stgen_priced_dec18/realization.gms +++ b/modules/60_bioenergy/1stgen_priced_dec18/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/60_bioenergy/1stgen_priced_dec18/scaling.gms b/modules/60_bioenergy/1stgen_priced_dec18/scaling.gms index 54a3eba536..f6d1c67185 100644 --- a/modules/60_bioenergy/1stgen_priced_dec18/scaling.gms +++ b/modules/60_bioenergy/1stgen_priced_dec18/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/60_bioenergy/1stgen_priced_dec18/sets.gms b/modules/60_bioenergy/1stgen_priced_dec18/sets.gms index 17e59e18b3..e314b1648a 100644 --- a/modules/60_bioenergy/1stgen_priced_dec18/sets.gms +++ b/modules/60_bioenergy/1stgen_priced_dec18/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/60_bioenergy/module.gms b/modules/60_bioenergy/module.gms index 258bfe9f44..fc56e8aca3 100644 --- a/modules/60_bioenergy/module.gms +++ b/modules/60_bioenergy/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/62_material/exo_flexreg_apr16/declarations.gms b/modules/62_material/exo_flexreg_apr16/declarations.gms index d0f50eea5c..6816c238d5 100644 --- a/modules/62_material/exo_flexreg_apr16/declarations.gms +++ b/modules/62_material/exo_flexreg_apr16/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/62_material/exo_flexreg_apr16/equations.gms b/modules/62_material/exo_flexreg_apr16/equations.gms index 53c18a1139..fd8eedbc0c 100644 --- a/modules/62_material/exo_flexreg_apr16/equations.gms +++ b/modules/62_material/exo_flexreg_apr16/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -15,7 +15,7 @@ *' depending on a scaling factor. This scaling factor is calculated as the *' ratio beween the food demand from last timestep and the food demand from *' the last historical time step. If an exogenous target for bioplastic production -*' is set, material demand (substrate) for bioplastic production is included. +*' is set, increasing material demand (substrate) for bioplastic production is included. *' For historic years it is assumed that this demand is already part of the *' general material demand, therefore the double-counted demand is subtracted. diff --git a/modules/62_material/exo_flexreg_apr16/input.gms b/modules/62_material/exo_flexreg_apr16/input.gms index 36e92df725..20601829a0 100644 --- a/modules/62_material/exo_flexreg_apr16/input.gms +++ b/modules/62_material/exo_flexreg_apr16/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/62_material/exo_flexreg_apr16/postsolve.gms b/modules/62_material/exo_flexreg_apr16/postsolve.gms index 68be8d8259..03e82e08a6 100644 --- a/modules/62_material/exo_flexreg_apr16/postsolve.gms +++ b/modules/62_material/exo_flexreg_apr16/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/62_material/exo_flexreg_apr16/preloop.gms b/modules/62_material/exo_flexreg_apr16/preloop.gms index 8e0f53e746..ff401144e4 100644 --- a/modules/62_material/exo_flexreg_apr16/preloop.gms +++ b/modules/62_material/exo_flexreg_apr16/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -9,15 +9,18 @@ p62_dem_food_lastcalibyear(i) = 1; p62_dem_bioplastic(t,i) = 0; -* Bioplastic demand is based on historic values up to 2020, and a logistic function with given -* midpoint and maximum for future years. Global bioplastic demand is distributed to regions -* proportional to population due to lack of better data. +* Bioplastic demand is based on historic values up to 2020, and either kept constant for +* future years, or following a logistic function with given midpoint and maximum if a +* bioplastic production target is exogenously set. +* Global bioplastic demand is distributed to regions proportional to population due to lack of better data. + +p62_dem_bioplastic(t,i) = f62_hist_dem_bioplastic(t) * (im_pop(t,i) / sum(i2, im_pop(t,i2))); +p62_dem_bioplastic(t,i)$(m_year(t)>2020) = f62_hist_dem_bioplastic("y2020") * (im_pop("y2020",i) / sum(i2, im_pop("y2020",i2))); if (s62_max_dem_bioplastic <> 0, - p62_dem_bioplastic(t,i) = f62_hist_dem_bioplastic(t) * (im_pop(t,i) / sum(i2, im_pop(t,i2))); s62_growth_rate_bioplastic = log((s62_max_dem_bioplastic/f62_hist_dem_bioplastic("y2020")) - 1)/(s62_midpoint_dem_bioplastic-2020); p62_dem_bioplastic(t,i)$(m_year(t)>2020) = s62_max_dem_bioplastic / (1 + exp(-s62_growth_rate_bioplastic*(m_year(t)-s62_midpoint_dem_bioplastic))) * (im_pop(t,i) / sum(i2, im_pop(t,i2))); ); * translate bioplastic demand to biomass demand using conversion factors between bioplastic and the different biomass sources -p62_bioplastic_substrate(t,i,kall) = p62_dem_bioplastic(t,i) * f62_biomass2bioplastic_conversion_ratio(kall); \ No newline at end of file +p62_bioplastic_substrate(t,i,kall) = p62_dem_bioplastic(t,i) * f62_biomass2bioplastic_conversion_ratio(kall); diff --git a/modules/62_material/exo_flexreg_apr16/presolve.gms b/modules/62_material/exo_flexreg_apr16/presolve.gms index f7553f0844..c2650488de 100644 --- a/modules/62_material/exo_flexreg_apr16/presolve.gms +++ b/modules/62_material/exo_flexreg_apr16/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/62_material/exo_flexreg_apr16/realization.gms b/modules/62_material/exo_flexreg_apr16/realization.gms index 58c8840e03..d0da0888e6 100644 --- a/modules/62_material/exo_flexreg_apr16/realization.gms +++ b/modules/62_material/exo_flexreg_apr16/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -12,9 +12,9 @@ *' material module based on historical data. The assumption that material demand *' grows proportional to food demand is a simplification that can be justified *' by the minor importance of non-bioenergy material usage of agricultural products. -*' In addition, biomass demand for bioplastic production can be included, with -*' future bioplastic production following a logistic curve with exogenously defined -*' target production. +*' In addition, biomass demand for bioplastic production is included, with +*' future bioplastic production kept constant or following a logistic curve +*' if a bioplastic production target is exogenously set. *####################### R SECTION START (PHASES) ############################## $Ifi "%phase%" == "sets" $include "./modules/62_material/exo_flexreg_apr16/sets.gms" diff --git a/modules/62_material/exo_flexreg_apr16/sets.gms b/modules/62_material/exo_flexreg_apr16/sets.gms index 0f91956469..5d42bc9a09 100644 --- a/modules/62_material/exo_flexreg_apr16/sets.gms +++ b/modules/62_material/exo_flexreg_apr16/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/62_material/module.gms b/modules/62_material/module.gms index c155dd722e..25436f5400 100644 --- a/modules/62_material/module.gms +++ b/modules/62_material/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -15,8 +15,8 @@ *' category, the use for bioenergy (oils and ethanol) has been excluded *' and is accounted for in the demand for bioenergy. Material demand in this *' context can be considered as a subset of "other utils" category of FAO. -*' In addition, future material demand for bioplastic production can be included -*' by setting a target bioplastic demand. +*' In addition, increasing material demand for bioplastic production can be +*' included by setting a target bioplastic demand. *' @authors Benjamin Bodirsky, Debbora Leip diff --git a/modules/70_livestock/fbask_jan16/declarations.gms b/modules/70_livestock/fbask_jan16/declarations.gms index e025f70550..71dc155495 100644 --- a/modules/70_livestock/fbask_jan16/declarations.gms +++ b/modules/70_livestock/fbask_jan16/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -8,7 +8,7 @@ positive variables vm_dem_feed(i,kap,kall) Regional feed demand including byproducts (mio. tDM per yr) - vm_cost_prod_livst(i,req) Livestock factor costs (mio. USD05MER per yr) + vm_cost_prod_livst(i,factors) Livestock factor costs (mio. USD05MER per yr) vm_cost_prod_fish(i) Fish factor costs (mio. USD05MER per yr) ; @@ -30,7 +30,7 @@ parameters i70_foddr_scp_fadeout(t_all,i) Fodder fadeout (share 0-1) to be replaced by SCP (1) p70_country_dummy(iso) Dummy parameter indicating whether country is affected by feed scenarios (1) p70_feedscen_region_shr(t_all,i) Weighted share of region with regards to feed scenario of countries (1) - p70_cost_share_livst(t,i,req) Capital and labor shares of the regional factor costs for plant production for livestock (1) + p70_cost_share_livst(t,i,factors) Capital and labor shares of the regional factor costs for plant production for livestock (1) p70_cost_share_calibration(i) Summation factor used to calibrate calculated capital shares with historical values (1) i70_cost_regr(i,kap,cost_regr) Regression coefficients for livestock factor requirements (1) ; @@ -39,7 +39,7 @@ parameters *#################### R SECTION START (OUTPUT DECLARATIONS) #################### parameters ov_dem_feed(t,i,kap,kall,type) Regional feed demand including byproducts (mio. tDM per yr) - ov_cost_prod_livst(t,i,req,type) Livestock factor costs (mio. USD05MER per yr) + ov_cost_prod_livst(t,i,factors,type) Livestock factor costs (mio. USD05MER per yr) ov_cost_prod_fish(t,i,type) Fish factor costs (mio. USD05MER per yr) oq70_feed(t,i,kap,kall,type) Regional feed demand oq70_cost_prod_liv_labor(t,i,type) Regional labor costs for livestock production diff --git a/modules/70_livestock/fbask_jan16/equations.gms b/modules/70_livestock/fbask_jan16/equations.gms index c1ed962ead..db8959984d 100644 --- a/modules/70_livestock/fbask_jan16/equations.gms +++ b/modules/70_livestock/fbask_jan16/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/70_livestock/fbask_jan16/input.gms b/modules/70_livestock/fbask_jan16/input.gms index d51c8eeb74..ea67293f5b 100644 --- a/modules/70_livestock/fbask_jan16/input.gms +++ b/modules/70_livestock/fbask_jan16/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/70_livestock/fbask_jan16/not_used.txt b/modules/70_livestock/fbask_jan16/not_used.txt deleted file mode 100644 index da77c77f60..0000000000 --- a/modules/70_livestock/fbask_jan16/not_used.txt +++ /dev/null @@ -1,8 +0,0 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de - -name,type,reason diff --git a/modules/70_livestock/fbask_jan16/postsolve.gms b/modules/70_livestock/fbask_jan16/postsolve.gms index f1df09c4ff..02d77327eb 100644 --- a/modules/70_livestock/fbask_jan16/postsolve.gms +++ b/modules/70_livestock/fbask_jan16/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -9,28 +9,28 @@ *#################### R SECTION START (OUTPUT DEFINITIONS) ##################### ov_dem_feed(t,i,kap,kall,"marginal") = vm_dem_feed.m(i,kap,kall); - ov_cost_prod_livst(t,i,req,"marginal") = vm_cost_prod_livst.m(i,req); + ov_cost_prod_livst(t,i,factors,"marginal") = vm_cost_prod_livst.m(i,factors); ov_cost_prod_fish(t,i,"marginal") = vm_cost_prod_fish.m(i); oq70_feed(t,i,kap,kall,"marginal") = q70_feed.m(i,kap,kall); oq70_cost_prod_liv_labor(t,i,"marginal") = q70_cost_prod_liv_labor.m(i); oq70_cost_prod_liv_capital(t,i,"marginal") = q70_cost_prod_liv_capital.m(i); oq70_cost_prod_fish(t,i,"marginal") = q70_cost_prod_fish.m(i); ov_dem_feed(t,i,kap,kall,"level") = vm_dem_feed.l(i,kap,kall); - ov_cost_prod_livst(t,i,req,"level") = vm_cost_prod_livst.l(i,req); + ov_cost_prod_livst(t,i,factors,"level") = vm_cost_prod_livst.l(i,factors); ov_cost_prod_fish(t,i,"level") = vm_cost_prod_fish.l(i); oq70_feed(t,i,kap,kall,"level") = q70_feed.l(i,kap,kall); oq70_cost_prod_liv_labor(t,i,"level") = q70_cost_prod_liv_labor.l(i); oq70_cost_prod_liv_capital(t,i,"level") = q70_cost_prod_liv_capital.l(i); oq70_cost_prod_fish(t,i,"level") = q70_cost_prod_fish.l(i); ov_dem_feed(t,i,kap,kall,"upper") = vm_dem_feed.up(i,kap,kall); - ov_cost_prod_livst(t,i,req,"upper") = vm_cost_prod_livst.up(i,req); + ov_cost_prod_livst(t,i,factors,"upper") = vm_cost_prod_livst.up(i,factors); ov_cost_prod_fish(t,i,"upper") = vm_cost_prod_fish.up(i); oq70_feed(t,i,kap,kall,"upper") = q70_feed.up(i,kap,kall); oq70_cost_prod_liv_labor(t,i,"upper") = q70_cost_prod_liv_labor.up(i); oq70_cost_prod_liv_capital(t,i,"upper") = q70_cost_prod_liv_capital.up(i); oq70_cost_prod_fish(t,i,"upper") = q70_cost_prod_fish.up(i); ov_dem_feed(t,i,kap,kall,"lower") = vm_dem_feed.lo(i,kap,kall); - ov_cost_prod_livst(t,i,req,"lower") = vm_cost_prod_livst.lo(i,req); + ov_cost_prod_livst(t,i,factors,"lower") = vm_cost_prod_livst.lo(i,factors); ov_cost_prod_fish(t,i,"lower") = vm_cost_prod_fish.lo(i); oq70_feed(t,i,kap,kall,"lower") = q70_feed.lo(i,kap,kall); oq70_cost_prod_liv_labor(t,i,"lower") = q70_cost_prod_liv_labor.lo(i); diff --git a/modules/70_livestock/fbask_jan16/preloop.gms b/modules/70_livestock/fbask_jan16/preloop.gms index e2b6227076..e19fbd99f2 100644 --- a/modules/70_livestock/fbask_jan16/preloop.gms +++ b/modules/70_livestock/fbask_jan16/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -64,4 +64,4 @@ $if "%c70_fac_req_regr%" == "glo" i70_cost_regr(i,kli,"cost_regr_a") = f70_cost_ $if "%c70_fac_req_regr%" == "reg" i70_cost_regr(i,kli,"cost_regr_a") = (f70_hist_factor_costs_livst(i,kli)/f70_hist_prod_livst(i,kli,"dm"))-f70_cost_regr(kli,"cost_regr_b")*sum(sys_to_kli(sys,kli),i70_livestock_productivity("y2005",i,sys)); i70_cost_regr(i,"fish",cost_regr) = f70_cost_regr("fish",cost_regr); -i70_cost_regr(i,kap,"cost_regr_b") = f70_cost_regr(kap,"cost_regr_b"); \ No newline at end of file +i70_cost_regr(i,kap,"cost_regr_b") = f70_cost_regr(kap,"cost_regr_b"); diff --git a/modules/70_livestock/fbask_jan16/presolve.gms b/modules/70_livestock/fbask_jan16/presolve.gms index fcf9900ead..c991b071ae 100644 --- a/modules/70_livestock/fbask_jan16/presolve.gms +++ b/modules/70_livestock/fbask_jan16/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/70_livestock/fbask_jan16/realization.gms b/modules/70_livestock/fbask_jan16/realization.gms index 3eabdff5c1..d95254b5b8 100644 --- a/modules/70_livestock/fbask_jan16/realization.gms +++ b/modules/70_livestock/fbask_jan16/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/70_livestock/fbask_jan16/sets.gms b/modules/70_livestock/fbask_jan16/sets.gms index f2a548a1d3..ecd8a6e3b0 100644 --- a/modules/70_livestock/fbask_jan16/sets.gms +++ b/modules/70_livestock/fbask_jan16/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/70_livestock/module.gms b/modules/70_livestock/module.gms index c7d9dc29cd..284e0450b1 100644 --- a/modules/70_livestock/module.gms +++ b/modules/70_livestock/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/70_livestock/scaling.gms b/modules/70_livestock/scaling.gms index d3a478a32a..76a926f2e7 100644 --- a/modules/70_livestock/scaling.gms +++ b/modules/70_livestock/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the @@ -6,5 +6,5 @@ *** | Contact: magpie@pik-potsdam.de -vm_cost_prod_livst.scale(i,req) = 10e5; +vm_cost_prod_livst.scale(i,factors) = 10e5; vm_cost_prod_fish.scale(i) = 10e5; diff --git a/modules/71_disagg_lvst/foragebased_aug18/declarations.gms b/modules/71_disagg_lvst/foragebased_aug18/declarations.gms index 6d6496bd8f..d68611a046 100644 --- a/modules/71_disagg_lvst/foragebased_aug18/declarations.gms +++ b/modules/71_disagg_lvst/foragebased_aug18/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/71_disagg_lvst/foragebased_aug18/equations.gms b/modules/71_disagg_lvst/foragebased_aug18/equations.gms index 0a18c32c5b..f6a6c65236 100644 --- a/modules/71_disagg_lvst/foragebased_aug18/equations.gms +++ b/modules/71_disagg_lvst/foragebased_aug18/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/71_disagg_lvst/foragebased_aug18/nl_fix.gms b/modules/71_disagg_lvst/foragebased_aug18/nl_fix.gms index d0f05d5b7c..3e88e2581d 100644 --- a/modules/71_disagg_lvst/foragebased_aug18/nl_fix.gms +++ b/modules/71_disagg_lvst/foragebased_aug18/nl_fix.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/71_disagg_lvst/foragebased_aug18/nl_release.gms b/modules/71_disagg_lvst/foragebased_aug18/nl_release.gms index 993efd071a..cbad58b03d 100644 --- a/modules/71_disagg_lvst/foragebased_aug18/nl_release.gms +++ b/modules/71_disagg_lvst/foragebased_aug18/nl_release.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/71_disagg_lvst/foragebased_aug18/postsolve.gms b/modules/71_disagg_lvst/foragebased_aug18/postsolve.gms index 22a176c320..9c2b6507f3 100644 --- a/modules/71_disagg_lvst/foragebased_aug18/postsolve.gms +++ b/modules/71_disagg_lvst/foragebased_aug18/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/71_disagg_lvst/foragebased_aug18/preloop.gms b/modules/71_disagg_lvst/foragebased_aug18/preloop.gms index b047238c07..9945cf80ad 100644 --- a/modules/71_disagg_lvst/foragebased_aug18/preloop.gms +++ b/modules/71_disagg_lvst/foragebased_aug18/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/71_disagg_lvst/foragebased_aug18/realization.gms b/modules/71_disagg_lvst/foragebased_aug18/realization.gms index a209fba9b1..dfea6fd299 100644 --- a/modules/71_disagg_lvst/foragebased_aug18/realization.gms +++ b/modules/71_disagg_lvst/foragebased_aug18/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/71_disagg_lvst/foragebased_aug18/scaling.gms b/modules/71_disagg_lvst/foragebased_aug18/scaling.gms index d711917a54..b4939dbc37 100644 --- a/modules/71_disagg_lvst/foragebased_aug18/scaling.gms +++ b/modules/71_disagg_lvst/foragebased_aug18/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/71_disagg_lvst/foragebased_aug18/sets.gms b/modules/71_disagg_lvst/foragebased_aug18/sets.gms index 3aafa13aac..648b0c7ff9 100644 --- a/modules/71_disagg_lvst/foragebased_aug18/sets.gms +++ b/modules/71_disagg_lvst/foragebased_aug18/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/71_disagg_lvst/module.gms b/modules/71_disagg_lvst/module.gms index b30e09ca5b..388e97797d 100644 --- a/modules/71_disagg_lvst/module.gms +++ b/modules/71_disagg_lvst/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/71_disagg_lvst/off/declarations.gms b/modules/71_disagg_lvst/off/declarations.gms index 42b3d214b5..36a9ac4131 100644 --- a/modules/71_disagg_lvst/off/declarations.gms +++ b/modules/71_disagg_lvst/off/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/71_disagg_lvst/off/not_used.txt b/modules/71_disagg_lvst/off/not_used.txt index 47389c1abd..79577f6d78 100644 --- a/modules/71_disagg_lvst/off/not_used.txt +++ b/modules/71_disagg_lvst/off/not_used.txt @@ -1,10 +1,3 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de - name,type,reason im_feed_baskets,input,questionnaire fm_feed_balanceflow,input,questionnaire diff --git a/modules/71_disagg_lvst/off/postsolve.gms b/modules/71_disagg_lvst/off/postsolve.gms index 08d55db6e9..55b88c347d 100644 --- a/modules/71_disagg_lvst/off/postsolve.gms +++ b/modules/71_disagg_lvst/off/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/71_disagg_lvst/off/presolve.gms b/modules/71_disagg_lvst/off/presolve.gms index 29409103ea..1724f1af5f 100644 --- a/modules/71_disagg_lvst/off/presolve.gms +++ b/modules/71_disagg_lvst/off/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/71_disagg_lvst/off/realization.gms b/modules/71_disagg_lvst/off/realization.gms index 9f1ecd1ffc..4494ad794a 100644 --- a/modules/71_disagg_lvst/off/realization.gms +++ b/modules/71_disagg_lvst/off/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/73_timber/default/declarations.gms b/modules/73_timber/default/declarations.gms index d90ff1c87c..a0bd1312bf 100644 --- a/modules/73_timber/default/declarations.gms +++ b/modules/73_timber/default/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/73_timber/default/equations.gms b/modules/73_timber/default/equations.gms index f2e3f3a857..06a0a86b36 100644 --- a/modules/73_timber/default/equations.gms +++ b/modules/73_timber/default/equations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/73_timber/default/input.gms b/modules/73_timber/default/input.gms index 41a7d7461e..254d4a3aa2 100644 --- a/modules/73_timber/default/input.gms +++ b/modules/73_timber/default/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/73_timber/default/not_used.txt b/modules/73_timber/default/not_used.txt deleted file mode 100644 index da77c77f60..0000000000 --- a/modules/73_timber/default/not_used.txt +++ /dev/null @@ -1,8 +0,0 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de - -name,type,reason diff --git a/modules/73_timber/default/postsolve.gms b/modules/73_timber/default/postsolve.gms index ca0b0324ea..460db7e6d7 100644 --- a/modules/73_timber/default/postsolve.gms +++ b/modules/73_timber/default/postsolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/73_timber/default/preloop.gms b/modules/73_timber/default/preloop.gms index 63b06b81dd..4437e845c6 100644 --- a/modules/73_timber/default/preloop.gms +++ b/modules/73_timber/default/preloop.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/73_timber/default/presolve.gms b/modules/73_timber/default/presolve.gms index ade25b0ae9..a676e748c4 100644 --- a/modules/73_timber/default/presolve.gms +++ b/modules/73_timber/default/presolve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/73_timber/default/realization.gms b/modules/73_timber/default/realization.gms index cdf112b606..15fa94b41d 100644 --- a/modules/73_timber/default/realization.gms +++ b/modules/73_timber/default/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/73_timber/default/scaling.gms b/modules/73_timber/default/scaling.gms index b85ee56694..ec3e8d2cac 100644 --- a/modules/73_timber/default/scaling.gms +++ b/modules/73_timber/default/scaling.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/73_timber/default/sets.gms b/modules/73_timber/default/sets.gms index 26fe82040b..bf07c22198 100644 --- a/modules/73_timber/default/sets.gms +++ b/modules/73_timber/default/sets.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/73_timber/module.gms b/modules/73_timber/module.gms index f4780e0419..87fe568c32 100644 --- a/modules/73_timber/module.gms +++ b/modules/73_timber/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/80_optimization/lp_nlp_apr17/declarations.gms b/modules/80_optimization/lp_nlp_apr17/declarations.gms index f799984956..c0fb121035 100644 --- a/modules/80_optimization/lp_nlp_apr17/declarations.gms +++ b/modules/80_optimization/lp_nlp_apr17/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/80_optimization/lp_nlp_apr17/input.gms b/modules/80_optimization/lp_nlp_apr17/input.gms index 5a76b22de5..3d524e93bd 100644 --- a/modules/80_optimization/lp_nlp_apr17/input.gms +++ b/modules/80_optimization/lp_nlp_apr17/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/80_optimization/lp_nlp_apr17/realization.gms b/modules/80_optimization/lp_nlp_apr17/realization.gms index 5226e2fd12..0b0008e1c4 100644 --- a/modules/80_optimization/lp_nlp_apr17/realization.gms +++ b/modules/80_optimization/lp_nlp_apr17/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/80_optimization/lp_nlp_apr17/solve.gms b/modules/80_optimization/lp_nlp_apr17/solve.gms index 9cc750ffe5..ed983c2047 100644 --- a/modules/80_optimization/lp_nlp_apr17/solve.gms +++ b/modules/80_optimization/lp_nlp_apr17/solve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/80_optimization/module.gms b/modules/80_optimization/module.gms index a1ba9375e4..cff00726b0 100644 --- a/modules/80_optimization/module.gms +++ b/modules/80_optimization/module.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/80_optimization/nlp_apr17/declarations.gms b/modules/80_optimization/nlp_apr17/declarations.gms index 1470817636..8df87fbefe 100644 --- a/modules/80_optimization/nlp_apr17/declarations.gms +++ b/modules/80_optimization/nlp_apr17/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/80_optimization/nlp_apr17/input.gms b/modules/80_optimization/nlp_apr17/input.gms index a87ab9e0a5..ff28a54eb7 100644 --- a/modules/80_optimization/nlp_apr17/input.gms +++ b/modules/80_optimization/nlp_apr17/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/80_optimization/nlp_apr17/not_used.txt b/modules/80_optimization/nlp_apr17/not_used.txt index 1b0a635e7b..ea605f3b35 100644 --- a/modules/80_optimization/nlp_apr17/not_used.txt +++ b/modules/80_optimization/nlp_apr17/not_used.txt @@ -1,8 +1,2 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de name,type,reason vm_landdiff,input,questionnaire diff --git a/modules/80_optimization/nlp_apr17/realization.gms b/modules/80_optimization/nlp_apr17/realization.gms index a3bc416cc0..e45364d549 100644 --- a/modules/80_optimization/nlp_apr17/realization.gms +++ b/modules/80_optimization/nlp_apr17/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/80_optimization/nlp_apr17/solve.gms b/modules/80_optimization/nlp_apr17/solve.gms index bf4f10f3ce..55ab6c222d 100644 --- a/modules/80_optimization/nlp_apr17/solve.gms +++ b/modules/80_optimization/nlp_apr17/solve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/80_optimization/nlp_par/declarations.gms b/modules/80_optimization/nlp_par/declarations.gms index e51d0b3884..ad3a9b624b 100644 --- a/modules/80_optimization/nlp_par/declarations.gms +++ b/modules/80_optimization/nlp_par/declarations.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/80_optimization/nlp_par/input.gms b/modules/80_optimization/nlp_par/input.gms index 59ed255f2c..3132eebf4e 100644 --- a/modules/80_optimization/nlp_par/input.gms +++ b/modules/80_optimization/nlp_par/input.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/80_optimization/nlp_par/not_used.txt b/modules/80_optimization/nlp_par/not_used.txt index 1b0a635e7b..ea605f3b35 100644 --- a/modules/80_optimization/nlp_par/not_used.txt +++ b/modules/80_optimization/nlp_par/not_used.txt @@ -1,8 +1,2 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de name,type,reason vm_landdiff,input,questionnaire diff --git a/modules/80_optimization/nlp_par/realization.gms b/modules/80_optimization/nlp_par/realization.gms index 0e92ecfd2d..251d6d87d3 100644 --- a/modules/80_optimization/nlp_par/realization.gms +++ b/modules/80_optimization/nlp_par/realization.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/80_optimization/nlp_par/solve.gms b/modules/80_optimization/nlp_par/solve.gms index a68295ce90..96019f4024 100644 --- a/modules/80_optimization/nlp_par/solve.gms +++ b/modules/80_optimization/nlp_par/solve.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/modules/include.gms b/modules/include.gms index 6bfc180fd8..0729ba1b54 100644 --- a/modules/include.gms +++ b/modules/include.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/output.R b/output.R index 25617c7cb3..fc2af1bb88 100644 --- a/output.R +++ b/output.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the @@ -9,31 +9,37 @@ #### MAgPIE output generation #### ########################################################## +if (!is.null(renv::project()) && !exists("source_include")) { + ask <- function(question) { + message(question, appendLF = FALSE) + return(tolower(gms::getLine()) %in% c("", "y", "yes")) + } + + message("Checking for updates... ", appendLF = FALSE) + if (getOption("autoRenvUpdates", FALSE) || + (!is.null(piamenv::showUpdates()) && ask("Update now? (Y/n): "))) { + updates <- piamenv::updateRenv() + piamenv::stopIfLoaded(names(updates)) + } + message("Update check done.") + + message("Checking package version requirements... ", appendLF = FALSE) + updates <- piamenv::fixDeps(ask = TRUE) + piamenv::stopIfLoaded(names(updates)) + message("Requirements check done.") +} + library(lucode2) library(gms) runOutputs <- function(comp=NULL, output=NULL, outputdir=NULL, submit=NULL) { - - get_line <- function(){ - # gets characters (line) from the terminal or from a connection - # and returns it - if(interactive()){ - s <- readline() - } else { - con <- file("stdin") - s <- readLines(con, 1, warn=FALSE) - on.exit(close(con)) - } - return(s); - } - choose_folder <- function(title="Please choose a folder") { # try to use find because it is significantly quicker than list.dirs tmp <- try(system("find ./output -name 'full.gms'", intern=TRUE, ignore.stderr = TRUE), silent=TRUE) - if("try-error" %in% class(tmp) | length(tmp)==0) { + if("try-error" %in% class(tmp) || length(tmp)==0) { tmp <- base::list.dirs("./output/",recursive=TRUE) dirs <- NULL - for (i in 1:length(tmp)) { + for (i in seq_along(tmp)) { if (file.exists(file.path(tmp[i],"full.gms"))) dirs <- c(dirs,sub("./output/","",tmp[i])) } } else { @@ -42,27 +48,29 @@ runOutputs <- function(comp=NULL, output=NULL, outputdir=NULL, submit=NULL) { dirs <- sort(dirs) dirs <- c("all",dirs) cat("\n",title,":\n", sep="") - cat(paste(1:length(dirs), dirs, sep=": " ),sep="\n") + cat(paste(seq_along(dirs), dirs, sep=": " ),sep="\n") cat(paste(length(dirs)+1, "Search by the pattern.\n", sep=": ")) cat("Number: ") - identifier <- get_line() + identifier <- gms::getLine() identifier <- strsplit(identifier,",")[[1]] tmp <- NULL - for (i in 1:length(identifier)) { - if (length(strsplit(identifier,":")[[i]]) > 1) tmp <- c(tmp,as.numeric(strsplit(identifier,":")[[i]])[1]:as.numeric(strsplit(identifier,":")[[i]])[2]) + for (i in seq_along(identifier)) { + if (length(strsplit(identifier,":")[[i]]) > 1) { + tmp <- c(tmp,as.numeric(strsplit(identifier,":")[[i]])[1]:as.numeric(strsplit(identifier,":")[[i]])[2]) + } else tmp <- c(tmp,as.numeric(identifier[i])) } identifier <- tmp # PATTERN if(length(identifier==1) && identifier==(length(dirs)+1)){ cat("\nInsert the search pattern or the regular expression: ") - pattern <- get_line() + pattern <- gms::getLine() id <- grep(pattern=pattern, dirs[-1], perl=TRUE) # lists all directories matching the pattern and ask for confirmation cat("\n\nYou have chosen the following directories:\n") - cat(paste(1:length(id), dirs[id+1], sep=": "), sep="\n") + cat(paste(seq_along(id), dirs[id+1], sep=": "), sep="\n") cat("\nAre you sure these are the right directories?(y/n): ") - answer <- get_line() + answer <- gms::getLine() if(answer=="y"){ return(paste0("./output/",dirs[id+1])) } else { @@ -87,9 +95,9 @@ runOutputs <- function(comp=NULL, output=NULL, outputdir=NULL, submit=NULL) { modes <- grep("^SLURM", modes, invert = TRUE, value = TRUE) } cat("\n",title,":\n",sep="") - cat(paste(1:length(modes), modes, sep=": " ),sep="\n") + cat(paste(seq_along(modes), modes, sep=": " ),sep="\n") cat("Number: ") - identifier <- get_line() + identifier <- gms::getLine() identifier <- as.numeric(strsplit(identifier,",")[[1]]) if(slurm) { system("sclass") @@ -116,7 +124,7 @@ runOutputs <- function(comp=NULL, output=NULL, outputdir=NULL, submit=NULL) { if(!dir.exists("logs")) dir.create("logs") #Set value source_include so that loaded scripts know, that they are #included as source (instead of a load from command line) - source_include <- TRUE + source_include <- TRUE # nolint # run output scripts over all choosen folders for(rout in output){ name <- ifelse(file.exists(paste0(script_path,rout)), rout, paste0(rout,".R")) @@ -130,7 +138,7 @@ runOutputs <- function(comp=NULL, output=NULL, outputdir=NULL, submit=NULL) { if(comp) { loop <- list(alloutputdirs) } else { - loop <- alloutputdirs + loop <- alloutputdirs } rout_name <- sub("\\.R$","",sub("/","_",rout)) for(outputdir in loop) { @@ -182,6 +190,33 @@ runOutputs <- function(comp=NULL, output=NULL, outputdir=NULL, submit=NULL) { message("No output folder selected! Stop here.") return(invisible(NULL)) } + + # Write a separate lockfile called {datetime}_{outputscript}_renv.lock into outputdir + # unless the renv from outputdir itself was used to run output.R + if (!is.null(renv::project())) { + datetime <- format(Sys.time(), "%Y-%m-%dT%H%M%S") + scriptName <- gsub("/", "-", paste(sub("\\.R$", "", output), collapse = "--")) + for (runFolder in setdiff(normalizePath(outputdir), normalizePath(renv::project()))) { + lockfile <- file.path(runFolder, "renv.lock") + newLockfile <- gsub("//", "/", file.path(runFolder, paste0(datetime, "__", scriptName, "__renv.lock"))) + + utils::capture.output({ + utils::capture.output({ + renv::snapshot(lockfile = newLockfile, prompt = FALSE) + }, type = "message") + }) + + if (!file.exists(lockfile)) { + warning(normalizePath(lockfile), " does not exist.") + message("Lockfile written to ", newLockfile) + } else if (identical(readLines(lockfile), readLines(newLockfile))) { + file.remove(newLockfile) + } else { + message("Lockfile written to ", newLockfile) + } + } + } + runsubmit(output, alloutputdirs = outputdir, submit, "scripts/output/") message("") } diff --git a/renv/.gitignore b/renv/.gitignore new file mode 100644 index 0000000000..7b56d7001f --- /dev/null +++ b/renv/.gitignore @@ -0,0 +1,8 @@ +library/ +local/ +cellar/ +lock/ +python/ +sandbox/ +staging/ +archive/ diff --git a/renv/activate.R b/renv/activate.R new file mode 100644 index 0000000000..019b5a6693 --- /dev/null +++ b/renv/activate.R @@ -0,0 +1,994 @@ + +local({ + + # the requested version of renv + version <- "0.16.0" + + # the project directory + project <- getwd() + + # figure out whether the autoloader is enabled + enabled <- local({ + + # first, check config option + override <- getOption("renv.config.autoloader.enabled") + if (!is.null(override)) + return(override) + + # next, check environment variables + # TODO: prefer using the configuration one in the future + envvars <- c( + "RENV_CONFIG_AUTOLOADER_ENABLED", + "RENV_AUTOLOADER_ENABLED", + "RENV_ACTIVATE_PROJECT" + ) + + for (envvar in envvars) { + envval <- Sys.getenv(envvar, unset = NA) + if (!is.na(envval)) + return(tolower(envval) %in% c("true", "t", "1")) + } + + # enable by default + TRUE + + }) + + if (!enabled) + return(FALSE) + + # avoid recursion + if (identical(getOption("renv.autoloader.running"), TRUE)) { + warning("ignoring recursive attempt to run renv autoloader") + return(invisible(TRUE)) + } + + # signal that we're loading renv during R startup + options(renv.autoloader.running = TRUE) + on.exit(options(renv.autoloader.running = NULL), add = TRUE) + + # signal that we've consented to use renv + options(renv.consent = TRUE) + + # load the 'utils' package eagerly -- this ensures that renv shims, which + # mask 'utils' packages, will come first on the search path + library(utils, lib.loc = .Library) + + # unload renv if it's already been loaded + if ("renv" %in% loadedNamespaces()) + unloadNamespace("renv") + + # load bootstrap tools + `%||%` <- function(x, y) { + if (is.environment(x) || length(x)) x else y + } + + bootstrap <- function(version, library) { + + # attempt to download renv + tarball <- tryCatch(renv_bootstrap_download(version), error = identity) + if (inherits(tarball, "error")) + stop("failed to download renv ", version) + + # now attempt to install + status <- tryCatch(renv_bootstrap_install(version, tarball, library), error = identity) + if (inherits(status, "error")) + stop("failed to install renv ", version) + + } + + renv_bootstrap_tests_running <- function() { + getOption("renv.tests.running", default = FALSE) + } + + renv_bootstrap_repos <- function() { + + # check for repos override + repos <- Sys.getenv("RENV_CONFIG_REPOS_OVERRIDE", unset = NA) + if (!is.na(repos)) + return(repos) + + # check for lockfile repositories + repos <- tryCatch(renv_bootstrap_repos_lockfile(), error = identity) + if (!inherits(repos, "error") && length(repos)) + return(repos) + + # if we're testing, re-use the test repositories + if (renv_bootstrap_tests_running()) + return(getOption("renv.tests.repos")) + + # retrieve current repos + repos <- getOption("repos") + + # ensure @CRAN@ entries are resolved + repos[repos == "@CRAN@"] <- getOption( + "renv.repos.cran", + "https://cloud.r-project.org" + ) + + # add in renv.bootstrap.repos if set + default <- c(FALLBACK = "https://cloud.r-project.org") + extra <- getOption("renv.bootstrap.repos", default = default) + repos <- c(repos, extra) + + # remove duplicates that might've snuck in + dupes <- duplicated(repos) | duplicated(names(repos)) + repos[!dupes] + + } + + renv_bootstrap_repos_lockfile <- function() { + + lockpath <- Sys.getenv("RENV_PATHS_LOCKFILE", unset = "renv.lock") + if (!file.exists(lockpath)) + return(NULL) + + lockfile <- tryCatch(renv_json_read(lockpath), error = identity) + if (inherits(lockfile, "error")) { + warning(lockfile) + return(NULL) + } + + repos <- lockfile$R$Repositories + if (length(repos) == 0) + return(NULL) + + keys <- vapply(repos, `[[`, "Name", FUN.VALUE = character(1)) + vals <- vapply(repos, `[[`, "URL", FUN.VALUE = character(1)) + names(vals) <- keys + + return(vals) + + } + + renv_bootstrap_download <- function(version) { + + # if the renv version number has 4 components, assume it must + # be retrieved via github + nv <- numeric_version(version) + components <- unclass(nv)[[1]] + + # if this appears to be a development version of 'renv', we'll + # try to restore from github + dev <- length(components) == 4L + + # begin collecting different methods for finding renv + methods <- c( + renv_bootstrap_download_tarball, + if (dev) + renv_bootstrap_download_github + else c( + renv_bootstrap_download_cran_latest, + renv_bootstrap_download_cran_archive + ) + ) + + for (method in methods) { + path <- tryCatch(method(version), error = identity) + if (is.character(path) && file.exists(path)) + return(path) + } + + stop("failed to download renv ", version) + + } + + renv_bootstrap_download_impl <- function(url, destfile) { + + mode <- "wb" + + # https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17715 + fixup <- + Sys.info()[["sysname"]] == "Windows" && + substring(url, 1L, 5L) == "file:" + + if (fixup) + mode <- "w+b" + + args <- list( + url = url, + destfile = destfile, + mode = mode, + quiet = TRUE + ) + + if ("headers" %in% names(formals(utils::download.file))) + args$headers <- renv_bootstrap_download_custom_headers(url) + + do.call(utils::download.file, args) + + } + + renv_bootstrap_download_custom_headers <- function(url) { + + headers <- getOption("renv.download.headers") + if (is.null(headers)) + return(character()) + + if (!is.function(headers)) + stopf("'renv.download.headers' is not a function") + + headers <- headers(url) + if (length(headers) == 0L) + return(character()) + + if (is.list(headers)) + headers <- unlist(headers, recursive = FALSE, use.names = TRUE) + + ok <- + is.character(headers) && + is.character(names(headers)) && + all(nzchar(names(headers))) + + if (!ok) + stop("invocation of 'renv.download.headers' did not return a named character vector") + + headers + + } + + renv_bootstrap_download_cran_latest <- function(version) { + + spec <- renv_bootstrap_download_cran_latest_find(version) + type <- spec$type + repos <- spec$repos + + message("* Downloading renv ", version, " ... ", appendLF = FALSE) + + baseurl <- utils::contrib.url(repos = repos, type = type) + ext <- if (identical(type, "source")) + ".tar.gz" + else if (Sys.info()[["sysname"]] == "Windows") + ".zip" + else + ".tgz" + name <- sprintf("renv_%s%s", version, ext) + url <- paste(baseurl, name, sep = "/") + + destfile <- file.path(tempdir(), name) + status <- tryCatch( + renv_bootstrap_download_impl(url, destfile), + condition = identity + ) + + if (inherits(status, "condition")) { + message("FAILED") + return(FALSE) + } + + # report success and return + message("OK (downloaded ", type, ")") + destfile + + } + + renv_bootstrap_download_cran_latest_find <- function(version) { + + # check whether binaries are supported on this system + binary <- + getOption("renv.bootstrap.binary", default = TRUE) && + !identical(.Platform$pkgType, "source") && + !identical(getOption("pkgType"), "source") && + Sys.info()[["sysname"]] %in% c("Darwin", "Windows") + + types <- c(if (binary) "binary", "source") + + # iterate over types + repositories + for (type in types) { + for (repos in renv_bootstrap_repos()) { + + # retrieve package database + db <- tryCatch( + as.data.frame( + utils::available.packages(type = type, repos = repos), + stringsAsFactors = FALSE + ), + error = identity + ) + + if (inherits(db, "error")) + next + + # check for compatible entry + entry <- db[db$Package %in% "renv" & db$Version %in% version, ] + if (nrow(entry) == 0) + next + + # found it; return spec to caller + spec <- list(entry = entry, type = type, repos = repos) + return(spec) + + } + } + + # if we got here, we failed to find renv + fmt <- "renv %s is not available from your declared package repositories" + stop(sprintf(fmt, version)) + + } + + renv_bootstrap_download_cran_archive <- function(version) { + + name <- sprintf("renv_%s.tar.gz", version) + repos <- renv_bootstrap_repos() + urls <- file.path(repos, "src/contrib/Archive/renv", name) + destfile <- file.path(tempdir(), name) + + message("* Downloading renv ", version, " ... ", appendLF = FALSE) + + for (url in urls) { + + status <- tryCatch( + renv_bootstrap_download_impl(url, destfile), + condition = identity + ) + + if (identical(status, 0L)) { + message("OK") + return(destfile) + } + + } + + message("FAILED") + return(FALSE) + + } + + renv_bootstrap_download_tarball <- function(version) { + + # if the user has provided the path to a tarball via + # an environment variable, then use it + tarball <- Sys.getenv("RENV_BOOTSTRAP_TARBALL", unset = NA) + if (is.na(tarball)) + return() + + # allow directories + info <- file.info(tarball, extra_cols = FALSE) + if (identical(info$isdir, TRUE)) { + name <- sprintf("renv_%s.tar.gz", version) + tarball <- file.path(tarball, name) + } + + # bail if it doesn't exist + if (!file.exists(tarball)) { + + # let the user know we weren't able to honour their request + fmt <- "* RENV_BOOTSTRAP_TARBALL is set (%s) but does not exist." + msg <- sprintf(fmt, tarball) + warning(msg) + + # bail + return() + + } + + fmt <- "* Bootstrapping with tarball at path '%s'." + msg <- sprintf(fmt, tarball) + message(msg) + + tarball + + } + + renv_bootstrap_download_github <- function(version) { + + enabled <- Sys.getenv("RENV_BOOTSTRAP_FROM_GITHUB", unset = "TRUE") + if (!identical(enabled, "TRUE")) + return(FALSE) + + # prepare download options + pat <- Sys.getenv("GITHUB_PAT") + if (nzchar(Sys.which("curl")) && nzchar(pat)) { + fmt <- "--location --fail --header \"Authorization: token %s\"" + extra <- sprintf(fmt, pat) + saved <- options("download.file.method", "download.file.extra") + options(download.file.method = "curl", download.file.extra = extra) + on.exit(do.call(base::options, saved), add = TRUE) + } else if (nzchar(Sys.which("wget")) && nzchar(pat)) { + fmt <- "--header=\"Authorization: token %s\"" + extra <- sprintf(fmt, pat) + saved <- options("download.file.method", "download.file.extra") + options(download.file.method = "wget", download.file.extra = extra) + on.exit(do.call(base::options, saved), add = TRUE) + } + + message("* Downloading renv ", version, " from GitHub ... ", appendLF = FALSE) + + url <- file.path("https://api.github.com/repos/rstudio/renv/tarball", version) + name <- sprintf("renv_%s.tar.gz", version) + destfile <- file.path(tempdir(), name) + + status <- tryCatch( + renv_bootstrap_download_impl(url, destfile), + condition = identity + ) + + if (!identical(status, 0L)) { + message("FAILED") + return(FALSE) + } + + message("OK") + return(destfile) + + } + + renv_bootstrap_install <- function(version, tarball, library) { + + # attempt to install it into project library + message("* Installing renv ", version, " ... ", appendLF = FALSE) + dir.create(library, showWarnings = FALSE, recursive = TRUE) + + # invoke using system2 so we can capture and report output + bin <- R.home("bin") + exe <- if (Sys.info()[["sysname"]] == "Windows") "R.exe" else "R" + r <- file.path(bin, exe) + + args <- c( + "--vanilla", "CMD", "INSTALL", "--no-multiarch", + "-l", shQuote(path.expand(library)), + shQuote(path.expand(tarball)) + ) + + output <- system2(r, args, stdout = TRUE, stderr = TRUE) + message("Done!") + + # check for successful install + status <- attr(output, "status") + if (is.numeric(status) && !identical(status, 0L)) { + header <- "Error installing renv:" + lines <- paste(rep.int("=", nchar(header)), collapse = "") + text <- c(header, lines, output) + writeLines(text, con = stderr()) + } + + status + + } + + renv_bootstrap_platform_prefix <- function() { + + # construct version prefix + version <- paste(R.version$major, R.version$minor, sep = ".") + prefix <- paste("R", numeric_version(version)[1, 1:2], sep = "-") + + # include SVN revision for development versions of R + # (to avoid sharing platform-specific artefacts with released versions of R) + devel <- + identical(R.version[["status"]], "Under development (unstable)") || + identical(R.version[["nickname"]], "Unsuffered Consequences") + + if (devel) + prefix <- paste(prefix, R.version[["svn rev"]], sep = "-r") + + # build list of path components + components <- c(prefix, R.version$platform) + + # include prefix if provided by user + prefix <- renv_bootstrap_platform_prefix_impl() + if (!is.na(prefix) && nzchar(prefix)) + components <- c(prefix, components) + + # build prefix + paste(components, collapse = "/") + + } + + renv_bootstrap_platform_prefix_impl <- function() { + + # if an explicit prefix has been supplied, use it + prefix <- Sys.getenv("RENV_PATHS_PREFIX", unset = NA) + if (!is.na(prefix)) + return(prefix) + + # if the user has requested an automatic prefix, generate it + auto <- Sys.getenv("RENV_PATHS_PREFIX_AUTO", unset = NA) + if (auto %in% c("TRUE", "True", "true", "1")) + return(renv_bootstrap_platform_prefix_auto()) + + # empty string on failure + "" + + } + + renv_bootstrap_platform_prefix_auto <- function() { + + prefix <- tryCatch(renv_bootstrap_platform_os(), error = identity) + if (inherits(prefix, "error") || prefix %in% "unknown") { + + msg <- paste( + "failed to infer current operating system", + "please file a bug report at https://github.com/rstudio/renv/issues", + sep = "; " + ) + + warning(msg) + + } + + prefix + + } + + renv_bootstrap_platform_os <- function() { + + sysinfo <- Sys.info() + sysname <- sysinfo[["sysname"]] + + # handle Windows + macOS up front + if (sysname == "Windows") + return("windows") + else if (sysname == "Darwin") + return("macos") + + # check for os-release files + for (file in c("/etc/os-release", "/usr/lib/os-release")) + if (file.exists(file)) + return(renv_bootstrap_platform_os_via_os_release(file, sysinfo)) + + # check for redhat-release files + if (file.exists("/etc/redhat-release")) + return(renv_bootstrap_platform_os_via_redhat_release()) + + "unknown" + + } + + renv_bootstrap_platform_os_via_os_release <- function(file, sysinfo) { + + # read /etc/os-release + release <- utils::read.table( + file = file, + sep = "=", + quote = c("\"", "'"), + col.names = c("Key", "Value"), + comment.char = "#", + stringsAsFactors = FALSE + ) + + vars <- as.list(release$Value) + names(vars) <- release$Key + + # get os name + os <- tolower(sysinfo[["sysname"]]) + + # read id + id <- "unknown" + for (field in c("ID", "ID_LIKE")) { + if (field %in% names(vars) && nzchar(vars[[field]])) { + id <- vars[[field]] + break + } + } + + # read version + version <- "unknown" + for (field in c("UBUNTU_CODENAME", "VERSION_CODENAME", "VERSION_ID", "BUILD_ID")) { + if (field %in% names(vars) && nzchar(vars[[field]])) { + version <- vars[[field]] + break + } + } + + # join together + paste(c(os, id, version), collapse = "-") + + } + + renv_bootstrap_platform_os_via_redhat_release <- function() { + + # read /etc/redhat-release + contents <- readLines("/etc/redhat-release", warn = FALSE) + + # infer id + id <- if (grepl("centos", contents, ignore.case = TRUE)) + "centos" + else if (grepl("redhat", contents, ignore.case = TRUE)) + "redhat" + else + "unknown" + + # try to find a version component (very hacky) + version <- "unknown" + + parts <- strsplit(contents, "[[:space:]]")[[1L]] + for (part in parts) { + + nv <- tryCatch(numeric_version(part), error = identity) + if (inherits(nv, "error")) + next + + version <- nv[1, 1] + break + + } + + paste(c("linux", id, version), collapse = "-") + + } + + renv_bootstrap_library_root_name <- function(project) { + + # use project name as-is if requested + asis <- Sys.getenv("RENV_PATHS_LIBRARY_ROOT_ASIS", unset = "FALSE") + if (asis) + return(basename(project)) + + # otherwise, disambiguate based on project's path + id <- substring(renv_bootstrap_hash_text(project), 1L, 8L) + paste(basename(project), id, sep = "-") + + } + + renv_bootstrap_library_root <- function(project) { + + prefix <- renv_bootstrap_profile_prefix() + + path <- Sys.getenv("RENV_PATHS_LIBRARY", unset = NA) + if (!is.na(path)) + return(paste(c(path, prefix), collapse = "/")) + + path <- renv_bootstrap_library_root_impl(project) + if (!is.null(path)) { + name <- renv_bootstrap_library_root_name(project) + return(paste(c(path, prefix, name), collapse = "/")) + } + + renv_bootstrap_paths_renv("library", project = project) + + } + + renv_bootstrap_library_root_impl <- function(project) { + + root <- Sys.getenv("RENV_PATHS_LIBRARY_ROOT", unset = NA) + if (!is.na(root)) + return(root) + + type <- renv_bootstrap_project_type(project) + if (identical(type, "package")) { + userdir <- renv_bootstrap_user_dir() + return(file.path(userdir, "library")) + } + + } + + renv_bootstrap_validate_version <- function(version) { + + loadedversion <- utils::packageDescription("renv", fields = "Version") + if (version == loadedversion) + return(TRUE) + + # assume four-component versions are from GitHub; three-component + # versions are from CRAN + components <- strsplit(loadedversion, "[.-]")[[1]] + remote <- if (length(components) == 4L) + paste("rstudio/renv", loadedversion, sep = "@") + else + paste("renv", loadedversion, sep = "@") + + fmt <- paste( + "renv %1$s was loaded from project library, but this project is configured to use renv %2$s.", + "Use `renv::record(\"%3$s\")` to record renv %1$s in the lockfile.", + "Use `renv::restore(packages = \"renv\")` to install renv %2$s into the project library.", + sep = "\n" + ) + + msg <- sprintf(fmt, loadedversion, version, remote) + warning(msg, call. = FALSE) + + FALSE + + } + + renv_bootstrap_hash_text <- function(text) { + + hashfile <- tempfile("renv-hash-") + on.exit(unlink(hashfile), add = TRUE) + + writeLines(text, con = hashfile) + tools::md5sum(hashfile) + + } + + renv_bootstrap_load <- function(project, libpath, version) { + + # try to load renv from the project library + if (!requireNamespace("renv", lib.loc = libpath, quietly = TRUE)) + return(FALSE) + + # warn if the version of renv loaded does not match + renv_bootstrap_validate_version(version) + + # load the project + renv::load(project) + + TRUE + + } + + renv_bootstrap_profile_load <- function(project) { + + # if RENV_PROFILE is already set, just use that + profile <- Sys.getenv("RENV_PROFILE", unset = NA) + if (!is.na(profile) && nzchar(profile)) + return(profile) + + # check for a profile file (nothing to do if it doesn't exist) + path <- renv_bootstrap_paths_renv("profile", profile = FALSE, project = project) + if (!file.exists(path)) + return(NULL) + + # read the profile, and set it if it exists + contents <- readLines(path, warn = FALSE) + if (length(contents) == 0L) + return(NULL) + + # set RENV_PROFILE + profile <- contents[[1L]] + if (!profile %in% c("", "default")) + Sys.setenv(RENV_PROFILE = profile) + + profile + + } + + renv_bootstrap_profile_prefix <- function() { + profile <- renv_bootstrap_profile_get() + if (!is.null(profile)) + return(file.path("profiles", profile, "renv")) + } + + renv_bootstrap_profile_get <- function() { + profile <- Sys.getenv("RENV_PROFILE", unset = "") + renv_bootstrap_profile_normalize(profile) + } + + renv_bootstrap_profile_set <- function(profile) { + profile <- renv_bootstrap_profile_normalize(profile) + if (is.null(profile)) + Sys.unsetenv("RENV_PROFILE") + else + Sys.setenv(RENV_PROFILE = profile) + } + + renv_bootstrap_profile_normalize <- function(profile) { + + if (is.null(profile) || profile %in% c("", "default")) + return(NULL) + + profile + + } + + renv_bootstrap_path_absolute <- function(path) { + + substr(path, 1L, 1L) %in% c("~", "/", "\\") || ( + substr(path, 1L, 1L) %in% c(letters, LETTERS) && + substr(path, 2L, 3L) %in% c(":/", ":\\") + ) + + } + + renv_bootstrap_paths_renv <- function(..., profile = TRUE, project = NULL) { + renv <- Sys.getenv("RENV_PATHS_RENV", unset = "renv") + root <- if (renv_bootstrap_path_absolute(renv)) NULL else project + prefix <- if (profile) renv_bootstrap_profile_prefix() + components <- c(root, renv, prefix, ...) + paste(components, collapse = "/") + } + + renv_bootstrap_project_type <- function(path) { + + descpath <- file.path(path, "DESCRIPTION") + if (!file.exists(descpath)) + return("unknown") + + desc <- tryCatch( + read.dcf(descpath, all = TRUE), + error = identity + ) + + if (inherits(desc, "error")) + return("unknown") + + type <- desc$Type + if (!is.null(type)) + return(tolower(type)) + + package <- desc$Package + if (!is.null(package)) + return("package") + + "unknown" + + } + + renv_bootstrap_user_dir <- function() { + dir <- renv_bootstrap_user_dir_impl() + path.expand(chartr("\\", "/", dir)) + } + + renv_bootstrap_user_dir_impl <- function() { + + # use local override if set + override <- getOption("renv.userdir.override") + if (!is.null(override)) + return(override) + + # use R_user_dir if available + tools <- asNamespace("tools") + if (is.function(tools$R_user_dir)) + return(tools$R_user_dir("renv", "cache")) + + # try using our own backfill for older versions of R + envvars <- c("R_USER_CACHE_DIR", "XDG_CACHE_HOME") + for (envvar in envvars) { + root <- Sys.getenv(envvar, unset = NA) + if (!is.na(root)) + return(file.path(root, "R/renv")) + } + + # use platform-specific default fallbacks + if (Sys.info()[["sysname"]] == "Windows") + file.path(Sys.getenv("LOCALAPPDATA"), "R/cache/R/renv") + else if (Sys.info()[["sysname"]] == "Darwin") + "~/Library/Caches/org.R-project.R/R/renv" + else + "~/.cache/R/renv" + + } + + + renv_json_read <- function(file = NULL, text = NULL) { + + # if jsonlite is loaded, use that instead + if ("jsonlite" %in% loadedNamespaces()) + renv_json_read_jsonlite(file, text) + else + renv_json_read_default(file, text) + + } + + renv_json_read_jsonlite <- function(file = NULL, text = NULL) { + text <- paste(text %||% read(file), collapse = "\n") + jsonlite::fromJSON(txt = text, simplifyVector = FALSE) + } + + renv_json_read_default <- function(file = NULL, text = NULL) { + + # find strings in the JSON + text <- paste(text %||% read(file), collapse = "\n") + pattern <- '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]' + locs <- gregexpr(pattern, text, perl = TRUE)[[1]] + + # if any are found, replace them with placeholders + replaced <- text + strings <- character() + replacements <- character() + + if (!identical(c(locs), -1L)) { + + # get the string values + starts <- locs + ends <- locs + attr(locs, "match.length") - 1L + strings <- substring(text, starts, ends) + + # only keep those requiring escaping + strings <- grep("[[\\]{}:]", strings, perl = TRUE, value = TRUE) + + # compute replacements + replacements <- sprintf('"\032%i\032"', seq_along(strings)) + + # replace the strings + mapply(function(string, replacement) { + replaced <<- sub(string, replacement, replaced, fixed = TRUE) + }, strings, replacements) + + } + + # transform the JSON into something the R parser understands + transformed <- replaced + transformed <- gsub("{}", "`names<-`(list(), character())", transformed, fixed = TRUE) + transformed <- gsub("[[{]", "list(", transformed, perl = TRUE) + transformed <- gsub("[]}]", ")", transformed, perl = TRUE) + transformed <- gsub(":", "=", transformed, fixed = TRUE) + text <- paste(transformed, collapse = "\n") + + # parse it + json <- parse(text = text, keep.source = FALSE, srcfile = NULL)[[1L]] + + # construct map between source strings, replaced strings + map <- as.character(parse(text = strings)) + names(map) <- as.character(parse(text = replacements)) + + # convert to list + map <- as.list(map) + + # remap strings in object + remapped <- renv_json_remap(json, map) + + # evaluate + eval(remapped, envir = baseenv()) + + } + + renv_json_remap <- function(json, map) { + + # fix names + if (!is.null(names(json))) { + lhs <- match(names(json), names(map), nomatch = 0L) + rhs <- match(names(map), names(json), nomatch = 0L) + names(json)[rhs] <- map[lhs] + } + + # fix values + if (is.character(json)) + return(map[[json]] %||% json) + + # handle true, false, null + if (is.name(json)) { + text <- as.character(json) + if (text == "true") + return(TRUE) + else if (text == "false") + return(FALSE) + else if (text == "null") + return(NULL) + } + + # recurse + if (is.recursive(json)) { + for (i in seq_along(json)) { + json[i] <- list(renv_json_remap(json[[i]], map)) + } + } + + json + + } + + # load the renv profile, if any + renv_bootstrap_profile_load(project) + + # construct path to library root + root <- renv_bootstrap_library_root(project) + + # construct library prefix for platform + prefix <- renv_bootstrap_platform_prefix() + + # construct full libpath + libpath <- file.path(root, prefix) + + # attempt to load + if (renv_bootstrap_load(project, libpath, version)) + return(TRUE) + + # load failed; inform user we're about to bootstrap + prefix <- paste("# Bootstrapping renv", version) + postfix <- paste(rep.int("-", 77L - nchar(prefix)), collapse = "") + header <- paste(prefix, postfix) + message(header) + + # perform bootstrap + bootstrap(version, libpath) + + # exit early if we're just testing bootstrap + if (!is.na(Sys.getenv("RENV_BOOTSTRAP_INSTALL_ONLY", unset = NA))) + return(TRUE) + + # try again to load + if (requireNamespace("renv", lib.loc = libpath, quietly = TRUE)) { + message("* Successfully installed and loaded renv ", version, ".") + return(renv::load()) + } + + # failed to download or load renv; warn the user + msg <- c( + "Failed to find an renv installation: the project will not be loaded.", + "Use `renv::activate()` to re-initialize the project." + ) + + warning(paste(msg, collapse = "\n"), call. = FALSE) + +}) diff --git a/renv/settings.dcf b/renv/settings.dcf new file mode 100644 index 0000000000..169d82f1bc --- /dev/null +++ b/renv/settings.dcf @@ -0,0 +1,10 @@ +bioconductor.version: +external.libraries: +ignored.packages: +package.dependency.fields: Imports, Depends, LinkingTo +r.version: +snapshot.type: implicit +use.cache: TRUE +vcs.ignore.cellar: TRUE +vcs.ignore.library: TRUE +vcs.ignore.local: TRUE diff --git a/scripts/calibration/calc_calib.R b/scripts/calibration/calc_calib.R index 3b2d0a0220..5a555f59e5 100644 --- a/scripts/calibration/calc_calib.R +++ b/scripts/calibration/calc_calib.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/calibration/landconversion_cost.R b/scripts/calibration/landconversion_cost.R index ee1e053765..a149101479 100644 --- a/scripts/calibration/landconversion_cost.R +++ b/scripts/calibration/landconversion_cost.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/downloader/inputdelete.cfg b/scripts/downloader/inputdelete.cfg index 33c7d374ca..9d2fc65ce9 100644 --- a/scripts/downloader/inputdelete.cfg +++ b/scripts/downloader/inputdelete.cfg @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/insertheader/insertheader.R b/scripts/insertheader/insertheader.R index c2cbb56e6f..5353b92306 100644 --- a/scripts/insertheader/insertheader.R +++ b/scripts/insertheader/insertheader.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the @@ -6,7 +6,7 @@ # | Contact: magpie@pik-potsdam.de insertheader <- function(maindir=".", - header=c("(C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK)", + header=c("(C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK)", "authors, and contributors see CITATION.cff file. This file is part", "of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of", "AGPL-3.0, you are granted additional permissions described in the", @@ -16,7 +16,7 @@ insertheader <- function(maindir=".", ".spam",".xlsx",".sh","files",".md",".RData", ".jpg", ".png",".cff", ".rds", ".aux", ".log", ".out", ".pdf", ".tex", ".htm", ".css", ".bib", ".ref", ".mif", ".gdx", - ".lst", ".git-id", ".csv", ".Rdata"), + ".lst", ".git-id", ".csv", ".Rdata", ".txt"), comments=c(".R"="#",".gms"="***",".cfg"="#",".csv"="*",".cs2"="*", ".cs3"="*",".cs4"="*",".sh"="#",".txt"="#"), key = "| ", diff --git a/scripts/npi_ndc/start_npi_ndc.R b/scripts/npi_ndc/start_npi_ndc.R index e34006b03a..3434719b3a 100644 --- a/scripts/npi_ndc/start_npi_ndc.R +++ b/scripts/npi_ndc/start_npi_ndc.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/comparison_validation.R b/scripts/output/comparison_validation.R index 961e32902e..68dc26672d 100644 --- a/scripts/output/comparison_validation.R +++ b/scripts/output/comparison_validation.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/deprecated/disaggregation_cropsplit.R b/scripts/output/deprecated/disaggregation_cropsplit.R index 80645dc7f9..f4e92ba427 100644 --- a/scripts/output/deprecated/disaggregation_cropsplit.R +++ b/scripts/output/deprecated/disaggregation_cropsplit.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/deprecated/disaggregation_transitions.R b/scripts/output/deprecated/disaggregation_transitions.R index 353f1c88fd..d062d47fcb 100644 --- a/scripts/output/deprecated/disaggregation_transitions.R +++ b/scripts/output/deprecated/disaggregation_transitions.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/extra/aff_area.R b/scripts/output/extra/aff_area.R index 6ea3035b20..e52798f9b7 100644 --- a/scripts/output/extra/aff_area.R +++ b/scripts/output/extra/aff_area.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/extra/disaggregation.R b/scripts/output/extra/disaggregation.R index f1aa80a439..8aad7500be 100644 --- a/scripts/output/extra/disaggregation.R +++ b/scripts/output/extra/disaggregation.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/extra/disaggregation_BII.R b/scripts/output/extra/disaggregation_BII.R index 124da18975..8976819c49 100644 --- a/scripts/output/extra/disaggregation_BII.R +++ b/scripts/output/extra/disaggregation_BII.R @@ -1,4 +1,4 @@ -# | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/extra/disaggregation_LUH2.R b/scripts/output/extra/disaggregation_LUH2.R index 72b9a869d9..abef0a37aa 100644 --- a/scripts/output/extra/disaggregation_LUH2.R +++ b/scripts/output/extra/disaggregation_LUH2.R @@ -1,4 +1,4 @@ -# | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/extra/emulator.R b/scripts/output/extra/emulator.R index 09af1e12e0..ddc270fb5a 100644 --- a/scripts/output/extra/emulator.R +++ b/scripts/output/extra/emulator.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/extra/force_runstatistics.R b/scripts/output/extra/force_runstatistics.R index fac83320d6..84da313c8a 100644 --- a/scripts/output/extra/force_runstatistics.R +++ b/scripts/output/extra/force_runstatistics.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/extra/highres.R b/scripts/output/extra/highres.R index 7f74974272..688c09d6aa 100644 --- a/scripts/output/extra/highres.R +++ b/scripts/output/extra/highres.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/extra/modelstat.R b/scripts/output/extra/modelstat.R index 6dd55526e4..7ba7bbfb78 100644 --- a/scripts/output/extra/modelstat.R +++ b/scripts/output/extra/modelstat.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/extra/reportMAgPIE2REMIND.R b/scripts/output/extra/reportMAgPIE2REMIND.R index b19248dccc..8275548f5f 100644 --- a/scripts/output/extra/reportMAgPIE2REMIND.R +++ b/scripts/output/extra/reportMAgPIE2REMIND.R @@ -1,4 +1,4 @@ -# | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/extra/resubmit.R b/scripts/output/extra/resubmit.R index 3f37df0c74..7997323c54 100644 --- a/scripts/output/extra/resubmit.R +++ b/scripts/output/extra/resubmit.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/extra/runtime.R b/scripts/output/extra/runtime.R index 99fcefc18f..70617156db 100644 --- a/scripts/output/extra/runtime.R +++ b/scripts/output/extra/runtime.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/extra/timestep_duration.R b/scripts/output/extra/timestep_duration.R index f312329f12..7f4e086330 100644 --- a/scripts/output/extra/timestep_duration.R +++ b/scripts/output/extra/timestep_duration.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/extra/validation_existing_report.R b/scripts/output/extra/validation_existing_report.R index bb6ad8132c..6de5fac3fd 100644 --- a/scripts/output/extra/validation_existing_report.R +++ b/scripts/output/extra/validation_existing_report.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/merge_report.R b/scripts/output/merge_report.R index acb27179fb..4dcb31adc4 100644 --- a/scripts/output/merge_report.R +++ b/scripts/output/merge_report.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/output_check.R b/scripts/output/output_check.R index ba571861aa..144fa1bdf3 100644 --- a/scripts/output/output_check.R +++ b/scripts/output/output_check.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/projects/BEST_merge_report.R b/scripts/output/projects/BEST_merge_report.R index 8c705bc962..53c3436f9a 100644 --- a/scripts/output/projects/BEST_merge_report.R +++ b/scripts/output/projects/BEST_merge_report.R @@ -1,4 +1,4 @@ -# | (C) 2008-2019 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/projects/FABLE_India_subnational_validation.R b/scripts/output/projects/FABLE_India_subnational_validation.R new file mode 100644 index 0000000000..70cd6ebcb6 --- /dev/null +++ b/scripts/output/projects/FABLE_India_subnational_validation.R @@ -0,0 +1,104 @@ +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) +# | authors, and contributors see CITATION.cff file. This file is part +# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of +# | AGPL-3.0, you are granted additional permissions described in the +# | MAgPIE License Exception, version 1.0 (see LICENSE file). +# | Contact: magpie@pik-potsdam.de + +# -------------------------------------------------------------- +# description: India subnational validation +# comparison script: FALSE +# --------------------------------------------------------------- + +#Version 1.00 - Miodrag Stevanovic, Prantika Das +# 1.00: first working version + +library(lucode2) +library(magpie4) +library(madrat) +library(mrfable) +library(mip) +library(mrvalidation) +library(magpiesets) +library(lusweave) + +print("Start India state level validation output runscript") + +############################# BASIC CONFIGURATION ####################################### + +if(!exists("source_include")) { + + outputdir <- "output/v4p77/h12_2022-12-15_22.09.46" + + ###Define arguments that can be read from command line + readArgs("outputdir") +} +file <- file.path(outputdir,paste0("India_subnational_validation_",format(Sys.time(), "%Y%H%M%S"),".pdf")) +######################################################################################### + +print(paste0("Script started for output directory: ",outputdir)) + +# Determine cells for India +mapping <- toolGetMapping("scripts/npi_ndc/policies/country2cell.rds") +mapping$iso_mag <- paste(mapping$iso,mapping$cell,sep=".") +# load Indian states +indStates <- toolGetMapping(system.file("extdata", "regional/india_state_code.csv", package = "mrfable")) +indCells <- which(mapping$ind %in% indStates$State_code) + +# Subnational validation data of specific crops +landHr <- read.magpie(file.path(outputdir,"cell.land_0.5.mz"))[indCells,,] +cropareaHrShare <- read.magpie(file.path(outputdir,"cell.croparea_0.5_share.mz"))[indCells,,] +cellHr <- dimSums(landHr, dim=3) +cropareaHr <- cropareaHrShare[,,]*setItems(cell_hr[,1,], dim=2, NULL) +cropareaHr <- dimSums(cropareaHr, dim=3.2) + +# aggregate land from grid to state level +mappingInd <- mapping[indCells,] +cropareaState <- toolAggregate(cropareaHr, rel=mappingInd, from="iso_mag", to="ind") + +# Observed data from mrfable +setConfig(extramappings = "mappingIndiaAPY.csv") +indApyMapping <- toolGetMapping(system.file("extdata", "regional/mappingIndiaAPY.csv", package = "mrfable")) +h <- calcOutput("IndiaFoodcrop", subtype = "Area", aggregate = "Region") +# Data cleaning: +h <- h[indStates$State_code,,] +h <- collapseNames(h) +h <- collapseNames(h[,,"total"]) +h <- h/1000 +# Crops in the APY database: +mappingCropsAPY <- as.matrix(data.frame(APYcrop=c("Bajra", "Barley", "Gram", + "Jowar", "Tur", "Maize", + "Wheat", "Ragi", "Rice"), + k=c("trce", "tece", "puls_pro", + "trce", "puls_pro", "maiz", + "tece", "trce", "rice_pro"))) +# Aggregate to magpie crops: +h <- toolAggregate(h, rel=mappingCropsAPY, from="APYcrop", to="k", dim=3) +h <- add_dimension(h, dim=3.1, add="scenario", nm="historical") +h <- add_dimension(h, dim=3.2, add="model", nm="APY") +h <- setItems(h, dim=3.3, reportingnames(getItems(h,dim=3.3))) + +cropareaState <- cropareaState[,,unique(mappingCropsAPY[,"k"])] +names(dimnames(cropareaState)) <- c("state","year","crop") +cropareaState <- add_dimension(cropareaState, dim=3.1, add="scenario", nm="") +cropareaState <- add_dimension(cropareaState, dim=3.2, add="model", nm="MAgPIE") +cropareaState <- setItems(cropareaState, dim=3.3, reportingnames(getItems(cropareaState,dim=3.3))) + +sw <- swopen(file) +swlatex(sw,"\\huge") +swlatex(sw,"\\textbf{MAgPIE state level croparea comparison for India}\\newline") +swlatex(sw,"\\normalsize") +swlatex(sw,"\\newline") +swlatex(sw,"\\tableofcontents") + +for(k in getItems(h, dim=3.3)){ + for(state in getItems(h, dim=1)){ + swlatex(sw,"\\newpage") + swlatex(sw,paste0("\\section{Croparea ",k," in ",indStates[which(indStates$State_code==state),"State_name"],"}")) + swfigure(sw, print, mipLineHistorical(cropareaState[state,,k],h[state,,k],ylab="Mha")) + } +} + +swclose(sw,clean_output=TRUE) + + diff --git a/scripts/output/projects/FSDP_collect.R b/scripts/output/projects/FSDP_collect.R index ec20852628..e30a4aebae 100644 --- a/scripts/output/projects/FSDP_collect.R +++ b/scripts/output/projects/FSDP_collect.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the @@ -144,8 +144,8 @@ var_reg <- c(indicators_main, ### Maps "Costs", "Population", - "Share of working age population employed in agriculture|Crop and livestock products", - "Hourly labor costs", + "Labor|Employment|Share of working age population employed in agriculture", + "Labor|Wages|Hourly labor costs", ### Suppl plots "Population", "Nutrition|Calorie Intake", @@ -261,11 +261,12 @@ var_reg <- c(indicators_main, "Nutrition|Anthropometrics|People obese", "Nutrition|Anthropometrics|People overweight", "Nutrition|Anthropometrics|People underweight", - "Agricultural employment|Crop and livestock products", - "Agricultural employment|+|Crop products", - "Agricultural employment|+|Livestock products", - "Hourly labor costs", - "Total Hours Worked|Crop and livestock products", + "Labor|Employment|Agricultural employment", + "Labor|Employment|Agricultural employment|+|Crop products", + "Labor|Employment|Agricultural employment|+|Livestock products", + "Labor|Employment|Agricultural employment|+|MACCS", + "Labor|Wages|Hourly labor costs", + "Labor|Total Hours Worked", "Income|Gini Coefficient", "Income|Average Income of Lower 40% of Population", "Income|Fraction of Population below half of Median Income", @@ -276,7 +277,7 @@ var_reg <- c(indicators_main, var_reg <- unique(var_reg) var_iso <- c("Population", - "Agricultural employment|Crop and livestock products", + "Labor|Employment|Agricultural employment", "Nutrition|Anthropometrics|People underweight", "Nutrition|Anthropometrics|People obese", "Household Expenditure|Food|Expenditure", diff --git a/scripts/output/projects/FSDP_process.R b/scripts/output/projects/FSDP_process.R index 16aed72ff5..4f91a79a60 100644 --- a/scripts/output/projects/FSDP_process.R +++ b/scripts/output/projects/FSDP_process.R @@ -1,4 +1,4 @@ -# | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/projects/FSEC_AlessandroPassaro.R b/scripts/output/projects/FSEC_AlessandroPassaro.R index 3167a36adf..d78c741ceb 100644 --- a/scripts/output/projects/FSEC_AlessandroPassaro.R +++ b/scripts/output/projects/FSEC_AlessandroPassaro.R @@ -1,4 +1,4 @@ -# | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the @@ -50,4 +50,4 @@ message("Generating Alessandro Passaro's output for the run: ", title) out <- getReportFSECAlessandroPassaro(magpieOutputDir = outputdir, reportOutputDir = reportOutputDir, - scenario = title) \ No newline at end of file + scenario = title) diff --git a/scripts/output/projects/FSEC_SimonDietz.R b/scripts/output/projects/FSEC_SimonDietz.R index a22f83c9aa..72dec6b34a 100644 --- a/scripts/output/projects/FSEC_SimonDietz.R +++ b/scripts/output/projects/FSEC_SimonDietz.R @@ -1,4 +1,4 @@ -# | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/projects/FSEC_StevenLord.R b/scripts/output/projects/FSEC_StevenLord.R index b01b80d7cb..473ea52e40 100644 --- a/scripts/output/projects/FSEC_StevenLord.R +++ b/scripts/output/projects/FSEC_StevenLord.R @@ -1,4 +1,4 @@ -# | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/projects/FSEC_costs.R b/scripts/output/projects/FSEC_costs.R index 31882db059..1ad7b5d941 100644 --- a/scripts/output/projects/FSEC_costs.R +++ b/scripts/output/projects/FSEC_costs.R @@ -1,4 +1,4 @@ -# | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/projects/FSEC_cropDiversityGrid.R b/scripts/output/projects/FSEC_cropDiversityGrid.R index c590626ff6..49cf84eb16 100644 --- a/scripts/output/projects/FSEC_cropDiversityGrid.R +++ b/scripts/output/projects/FSEC_cropDiversityGrid.R @@ -1,4 +1,4 @@ -# | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/projects/FSEC_dietaryIndicators.R b/scripts/output/projects/FSEC_dietaryIndicators.R index fa8ae72953..a07219e229 100644 --- a/scripts/output/projects/FSEC_dietaryIndicators.R +++ b/scripts/output/projects/FSEC_dietaryIndicators.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/projects/FSEC_nitrogenPollution.R b/scripts/output/projects/FSEC_nitrogenPollution.R index c107a257f5..c03cb38fc6 100644 --- a/scripts/output/projects/FSEC_nitrogenPollution.R +++ b/scripts/output/projects/FSEC_nitrogenPollution.R @@ -1,4 +1,4 @@ -# | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/projects/FSEC_water.R b/scripts/output/projects/FSEC_water.R index f2677bdcb5..47997d7cd2 100644 --- a/scripts/output/projects/FSEC_water.R +++ b/scripts/output/projects/FSEC_water.R @@ -1,4 +1,4 @@ -# | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/projects/MAgPIE2GAINS.R b/scripts/output/projects/MAgPIE2GAINS.R index 26c2772cc0..2ee67514db 100644 --- a/scripts/output/projects/MAgPIE2GAINS.R +++ b/scripts/output/projects/MAgPIE2GAINS.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/projects/MAgPIE2LPJmL.R b/scripts/output/projects/MAgPIE2LPJmL.R index e9e6ec8100..eaa94c5f8e 100644 --- a/scripts/output/projects/MAgPIE2LPJmL.R +++ b/scripts/output/projects/MAgPIE2LPJmL.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/projects/agmip_merge_report.R b/scripts/output/projects/agmip_merge_report.R index ee7c46ab55..d7bf55b10d 100644 --- a/scripts/output/projects/agmip_merge_report.R +++ b/scripts/output/projects/agmip_merge_report.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/projects/agmip_report.R b/scripts/output/projects/agmip_report.R index 0d7816f94f..08939675e5 100644 --- a/scripts/output/projects/agmip_report.R +++ b/scripts/output/projects/agmip_report.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/projects/inms_merge_report.R b/scripts/output/projects/inms_merge_report.R index e24fd785b1..67c2b17525 100644 --- a/scripts/output/projects/inms_merge_report.R +++ b/scripts/output/projects/inms_merge_report.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/projects/inms_reporting_cell.R b/scripts/output/projects/inms_reporting_cell.R index 217ea10959..0d614c17a8 100644 --- a/scripts/output/projects/inms_reporting_cell.R +++ b/scripts/output/projects/inms_reporting_cell.R @@ -1,4 +1,4 @@ -# | (C) 2008-2020 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/projects/inms_reporting_reg.R b/scripts/output/projects/inms_reporting_reg.R index a8caf6d979..8a3f922cff 100644 --- a/scripts/output/projects/inms_reporting_reg.R +++ b/scripts/output/projects/inms_reporting_reg.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/projects/peatland.R b/scripts/output/projects/peatland.R index c93a47136f..d00423dc2c 100644 --- a/scripts/output/projects/peatland.R +++ b/scripts/output/projects/peatland.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/rds_report.R b/scripts/output/rds_report.R index ff1ed58336..c6a3f34f47 100644 --- a/scripts/output/rds_report.R +++ b/scripts/output/rds_report.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/rds_report_iso.R b/scripts/output/rds_report_iso.R index abd22944db..eeaac04167 100644 --- a/scripts/output/rds_report_iso.R +++ b/scripts/output/rds_report_iso.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/runBlackmagicc.R b/scripts/output/runBlackmagicc.R index 725d497710..96c78a2d31 100644 --- a/scripts/output/runBlackmagicc.R +++ b/scripts/output/runBlackmagicc.R @@ -1,4 +1,4 @@ -# | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/validation.R b/scripts/output/validation.R index 0497936ff2..7fd189847a 100644 --- a/scripts/output/validation.R +++ b/scripts/output/validation.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/output/validation_short.R b/scripts/output/validation_short.R index f921b36f98..51ae291320 100644 --- a/scripts/output/validation_short.R +++ b/scripts/output/validation_short.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/performance_test.R b/scripts/performance_test.R index b6b0f95263..8f0f2c6188 100644 --- a/scripts/performance_test.R +++ b/scripts/performance_test.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/postRelease.R b/scripts/postRelease.R new file mode 100644 index 0000000000..12fe62e276 --- /dev/null +++ b/scripts/postRelease.R @@ -0,0 +1,42 @@ +postRelease <- function() { + gert::git_fetch("upstream") + gert::git_merge("upstream/master") + + pattern <- "and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)." + textToAdd <- paste("", + "", + "", + "## [Unreleased]", + "", + "### changed", + "-", + "", + "### added", + "-", + "", + "### removed", + "-", + "", + "### fixed", + "-", + sep = "\n") + + readLines("CHANGELOG.md") |> + sub(pattern = pattern, replacement = paste0(pattern, textToAdd), fixed = TRUE) |> + writeLines("CHANGELOG.md") + + readLines("CITATION.cff") |> + sub(pattern = "^(version:.*)$", replacement = "\\1dev") |> + writeLines("CITATION.cff") + + citation::cff2zenodo("CITATION.cff") + + message("TODO: git add -p") + gms::getLine() + + gert::git_commit("merge master into develop") + gert::git_push() + system(paste0("gh pr create --base develop --title 'merge master into develop' --body ''")) +} + +postRelease() diff --git a/scripts/projects/fsec.R b/scripts/projects/fsec.R index 0825aec0ae..46749a7ec4 100644 --- a/scripts/projects/fsec.R +++ b/scripts/projects/fsec.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/release.R b/scripts/release.R new file mode 100644 index 0000000000..6063d85436 --- /dev/null +++ b/scripts/release.R @@ -0,0 +1,54 @@ +release <- function(newVersion) { + if (Sys.which("sbatch") == "") { + stop("release must be created on cluster") + } + + releaseDate <- format(Sys.time(), "%Y-%m-%d") + oldVersion <- readLines("CITATION.cff") |> + grep(pattern = "^version: (.*)$", value = TRUE) |> + sub(pattern = "^version: (.*)$", replacement = "\\1") |> + sub(pattern = "dev", replacement = "") + + githubUrl <- "https://github.com/magpiemodel/magpie/compare/" + readLines("CHANGELOG.md") |> + sub(pattern = "## [Unreleased]", replacement = paste0("## [", newVersion, "] - ", releaseDate), fixed = TRUE) |> + sub(pattern = paste0("\\[Unreleased\\]: ", githubUrl, "v(.+)\\.\\.\\.develop"), + replacement = paste0("[Unreleased]: ", githubUrl, "v", newVersion, "...develop\n", + "[", newVersion, "]: ", githubUrl, "v\\1...v", newVersion)) |> + writeLines("CHANGELOG.md") + + readLines("CITATION.cff") |> + sub(pattern = "^version:.*$", replacement = paste("version:", newVersion)) |> + sub(pattern = "^date-released:.*$", replacement = paste("date-released:", releaseDate)) |> + writeLines("CITATION.cff") + + readLines("README.md") |> + gsub(pattern = oldVersion, replacement = newVersion) |> + writeLines("README.md") + + citation::cff2zenodo("CITATION.cff") + + message("creating documentation using goxygen...") + goxygen::goxygen() + message("uploading documentation to RSE server") + system(paste0("rsync -e ssh -avz doc/html rse:/webservice/doc/magpie/", newVersion)) + + message("uploading input data to RSE server") + sys.source("scripts/start/extra/publish_data.R", envir = new.env()) # only works on cluster + + message("TODO:\n", + "- CHANGELOG.md: sort lines in each category: changed, added, removed, fixed; remove empty categories\n", + "- git add -p\n", + "Press enter when done to commit, push and create PR") + gms::getLine() + + gert::git_commit(paste("magpie release", newVersion)) + gert::git_push() + system(paste0("gh pr create --base master --title 'magpie release ", newVersion, "' --body ''")) +} + +arguments <- commandArgs(TRUE) +if (length(arguments) != 1) { + stop("Please pass the new version number, e.g. `Rscript scripts/release.R 4.6.2`") +} +release(arguments) diff --git a/scripts/run_submit/submit.R b/scripts/run_submit/submit.R index f830cdfffc..b7c258b262 100644 --- a/scripts/run_submit/submit.R +++ b/scripts/run_submit/submit.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/Rprofile.R b/scripts/start/Rprofile.R index 57b6c85649..53a6a41391 100644 --- a/scripts/start/Rprofile.R +++ b/scripts/start/Rprofile.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the @@ -11,19 +11,6 @@ # ------------------------------------------------- setSnapshot <- function(snapshotdir=NULL) { - get_line <- function(){ - # gets characters (line) from the terminal or from a connection - # and returns it - if(interactive()){ - s <- readline() - } else { - con <- file("stdin") - s <- readLines(con, 1, warn=FALSE) - on.exit(close(con)) - } - return(s); - } - choose_snapshot <- function(title="Please choose a R snapshot") { if(dir.exists("/p/projects/rd3mod/R/libraries/snapshots/")) { dirs <- base::list.dirs("/p/projects/rd3mod/R/libraries/snapshots/",recursive=F,full.names=F) @@ -32,7 +19,7 @@ setSnapshot <- function(snapshotdir=NULL) { cat("0: No snapshot\n") cat(paste(1:length(dirs), dirs, sep=": " ),sep="\n") cat("Number: ") - identifier <- as.numeric(get_line()) + identifier <- as.numeric(gms::getLine()) if(identifier > 0 & identifier <= length(dirs)) { return(paste0("/p/projects/rd3mod/R/libraries/snapshots/",dirs[identifier])) } else return(invisible(NULL)) diff --git a/scripts/start/check_code.R b/scripts/start/check_code.R index e98181734b..eea63d13a5 100644 --- a/scripts/start/check_code.R +++ b/scripts/start/check_code.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/compilation_check.R b/scripts/start/compilation_check.R index e523c3aaae..78c40f0a88 100644 --- a/scripts/start/compilation_check.R +++ b/scripts/start/compilation_check.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/default.R b/scripts/start/default.R index 681d207bd0..02ec919a35 100644 --- a/scripts/start/default.R +++ b/scripts/start/default.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/download_data.R b/scripts/start/download_data.R index 79849961bc..be69358736 100644 --- a/scripts/start/download_data.R +++ b/scripts/start/download_data.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/extra/empty_model.R b/scripts/start/extra/empty_model.R new file mode 100644 index 0000000000..30196831b5 --- /dev/null +++ b/scripts/start/extra/empty_model.R @@ -0,0 +1,25 @@ +# | (C) 2023 Potsdam Institute for Climate Impact Research (PIK) +# | authors, and contributors see CITATION.cff file. This file is part +# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of +# | AGPL-3.0, you are granted additional permissions described in the +# | MAgPIE License Exception, version 1.0 (see LICENSE file). +# | Contact: magpie@pik-potsdam.de + +# ------------------------------------------------------------- +# description: run an empty model, output is the latest AMT run +# ------------------------------------------------------------- + +source("scripts/start_functions.R") +source("config/default.cfg") + +# Find latest fulldata.gdx from automated model test (AMT) runs +amtRunDirs <- list.files("/p/projects/landuse/tests/magpie/output", + pattern = "default_\\d{4}-\\d{2}-\\d{2}_\\d{2}\\.\\d{2}.\\d{2}", + full.names = TRUE) +fullDataGdxs <- file.path(amtRunDirs, "fulldata.gdx") +latestFullData <- sort(fullDataGdxs[file.exists(fullDataGdxs)], decreasing = TRUE)[[1]] + +cfg <- configureEmptyModel(cfg, latestFullData) +cfg$title <- "empty_model" + +start_run(cfg = cfg, codeCheck = FALSE) diff --git a/scripts/start/extra/emulator.R b/scripts/start/extra/emulator.R index 93759d5759..7a5b65bd1c 100644 --- a/scripts/start/extra/emulator.R +++ b/scripts/start/extra/emulator.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/extra/input_REMIND.R b/scripts/start/extra/input_REMIND.R index ded0db9ef4..8a61eddde4 100644 --- a/scripts/start/extra/input_REMIND.R +++ b/scripts/start/extra/input_REMIND.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/extra/irrig_dep_test.R b/scripts/start/extra/irrig_dep_test.R index bd12676559..4ba340b955 100644 --- a/scripts/start/extra/irrig_dep_test.R +++ b/scripts/start/extra/irrig_dep_test.R @@ -1,4 +1,4 @@ -# | (C) 2008-2019 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/extra/publish_data.R b/scripts/start/extra/publish_data.R index ae94cf083d..72ac2b0b53 100644 --- a/scripts/start/extra/publish_data.R +++ b/scripts/start/extra/publish_data.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/extra/recalibrate.R b/scripts/start/extra/recalibrate.R index acb0487771..dec4a3c3a4 100644 --- a/scripts/start/extra/recalibrate.R +++ b/scripts/start/extra/recalibrate.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/extra/recalibrate_FSEC.R b/scripts/start/extra/recalibrate_FSEC.R index 61c9067128..d110525a5b 100644 --- a/scripts/start/extra/recalibrate_FSEC.R +++ b/scripts/start/extra/recalibrate_FSEC.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/extra/recalibrate_all.R b/scripts/start/extra/recalibrate_all.R index d7895c8cdd..38b1c7c2d9 100644 --- a/scripts/start/extra/recalibrate_all.R +++ b/scripts/start/extra/recalibrate_all.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/extra/recalibrate_land_conversion_costs.R b/scripts/start/extra/recalibrate_land_conversion_costs.R index b65d1f7564..d07d5f9519 100644 --- a/scripts/start/extra/recalibrate_land_conversion_costs.R +++ b/scripts/start/extra/recalibrate_land_conversion_costs.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/extra/recalibrate_realizations.R b/scripts/start/extra/recalibrate_realizations.R index 20452ba352..4d57af30cb 100644 --- a/scripts/start/extra/recalibrate_realizations.R +++ b/scripts/start/extra/recalibrate_realizations.R @@ -1,4 +1,4 @@ -# | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/extra/test_maccs.R b/scripts/start/extra/test_maccs.R index 41cec306ae..fd6c757259 100644 --- a/scripts/start/extra/test_maccs.R +++ b/scripts/start/extra/test_maccs.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/extra/test_n.R b/scripts/start/extra/test_n.R index a280fa2c42..34f5591d40 100644 --- a/scripts/start/extra/test_n.R +++ b/scripts/start/extra/test_n.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/forestry.R b/scripts/start/forestry.R index c17a1899e0..2145190baf 100644 --- a/scripts/start/forestry.R +++ b/scripts/start/forestry.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/TAUhistfree.R b/scripts/start/projects/TAUhistfree.R index 9d71350ff7..3a0602f65c 100644 --- a/scripts/start/projects/TAUhistfree.R +++ b/scripts/start/projects/TAUhistfree.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/aff_bgp.R b/scripts/start/projects/aff_bgp.R index 662e2c083f..1239ac49ad 100644 --- a/scripts/start/projects/aff_bgp.R +++ b/scripts/start/projects/aff_bgp.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/duallayer.R b/scripts/start/projects/duallayer.R index f9cec77f1c..145da6a663 100644 --- a/scripts/start/projects/duallayer.R +++ b/scripts/start/projects/duallayer.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/fable_india.R b/scripts/start/projects/fable_india.R index dc989ada6c..acb666a4a9 100644 --- a/scripts/start/projects/fable_india.R +++ b/scripts/start/projects/fable_india.R @@ -1,4 +1,4 @@ -# | (C) 2008-2019 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/forestry.R b/scripts/start/projects/forestry.R index 8708709713..6ee0427559 100644 --- a/scripts/start/projects/forestry.R +++ b/scripts/start/projects/forestry.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/forestry_co2.R b/scripts/start/projects/forestry_co2.R index 6054174e43..e033123534 100644 --- a/scripts/start/projects/forestry_co2.R +++ b/scripts/start/projects/forestry_co2.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/gmd-2021-76.R b/scripts/start/projects/gmd-2021-76.R index 34e59bafa6..bc5cd3ddb5 100644 --- a/scripts/start/projects/gmd-2021-76.R +++ b/scripts/start/projects/gmd-2021-76.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/paper_ClimNat.R b/scripts/start/projects/paper_ClimNat.R index 9672e5c947..8f2eb167d9 100644 --- a/scripts/start/projects/paper_ClimNat.R +++ b/scripts/start/projects/paper_ClimNat.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/paper_fooddemand_standalone.R b/scripts/start/projects/paper_fooddemand_standalone.R index 634393b955..ec24e7c8b6 100644 --- a/scripts/start/projects/paper_fooddemand_standalone.R +++ b/scripts/start/projects/paper_fooddemand_standalone.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/paper_grassland.R b/scripts/start/projects/paper_grassland.R index ee9e18143b..7968cc2deb 100644 --- a/scripts/start/projects/paper_grassland.R +++ b/scripts/start/projects/paper_grassland.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/paper_peatland.R b/scripts/start/projects/paper_peatland.R index 8c7168c335..6a7cbc072c 100644 --- a/scripts/start/projects/paper_peatland.R +++ b/scripts/start/projects/paper_peatland.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/paper_scp.R b/scripts/start/projects/paper_scp.R index 12e1f3faab..71208eb53a 100644 --- a/scripts/start/projects/paper_scp.R +++ b/scripts/start/projects/paper_scp.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/project_BEST.R b/scripts/start/projects/project_BEST.R index 3c3cffcfc8..1ed15abd80 100644 --- a/scripts/start/projects/project_BEST.R +++ b/scripts/start/projects/project_BEST.R @@ -1,4 +1,4 @@ -# | (C) 2008-2019 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/project_FSEC_Scenarios.R b/scripts/start/projects/project_FSEC_Scenarios.R index ea06071473..372e9c8e30 100644 --- a/scripts/start/projects/project_FSEC_Scenarios.R +++ b/scripts/start/projects/project_FSEC_Scenarios.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/project_GCS.R b/scripts/start/projects/project_GCS.R index 97c3198975..063a780201 100644 --- a/scripts/start/projects/project_GCS.R +++ b/scripts/start/projects/project_GCS.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/project_LAMACLIMA_WP4.R b/scripts/start/projects/project_LAMACLIMA_WP4.R index 7e26ce98b2..e86dd6a26e 100644 --- a/scripts/start/projects/project_LAMACLIMA_WP4.R +++ b/scripts/start/projects/project_LAMACLIMA_WP4.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/project_SHAPE.R b/scripts/start/projects/project_SHAPE.R index d6231d2ff9..9d044879ee 100644 --- a/scripts/start/projects/project_SHAPE.R +++ b/scripts/start/projects/project_SHAPE.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/project_agmip.R b/scripts/start/projects/project_agmip.R index 32dc6610b3..934b36cbdf 100644 --- a/scripts/start/projects/project_agmip.R +++ b/scripts/start/projects/project_agmip.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/project_coacch.R b/scripts/start/projects/project_coacch.R index bbb37f5067..f0c16a3a2a 100644 --- a/scripts/start/projects/project_coacch.R +++ b/scripts/start/projects/project_coacch.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/project_coacch_lpjml5.R b/scripts/start/projects/project_coacch_lpjml5.R index 85459beeff..b42f6360e9 100644 --- a/scripts/start/projects/project_coacch_lpjml5.R +++ b/scripts/start/projects/project_coacch_lpjml5.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/project_inms2.R b/scripts/start/projects/project_inms2.R index 19ff581124..47971a3331 100644 --- a/scripts/start/projects/project_inms2.R +++ b/scripts/start/projects/project_inms2.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/project_sim4nexus.R b/scripts/start/projects/project_sim4nexus.R index 6c82e9fb34..6ec6e71c67 100644 --- a/scripts/start/projects/project_sim4nexus.R +++ b/scripts/start/projects/project_sim4nexus.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/project_sustag.R b/scripts/start/projects/project_sustag.R index 20a99f505c..04f9be6b37 100644 --- a/scripts/start/projects/project_sustag.R +++ b/scripts/start/projects/project_sustag.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/rcTest_default.R b/scripts/start/projects/rcTest_default.R index 74527b8a1e..0c58bc64c0 100644 --- a/scripts/start/projects/rcTest_default.R +++ b/scripts/start/projects/rcTest_default.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/sticky.R b/scripts/start/projects/sticky.R index 93cd07c5f3..fdeb330f5e 100644 --- a/scripts/start/projects/sticky.R +++ b/scripts/start/projects/sticky.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/test_bii.R b/scripts/start/projects/test_bii.R index 931cc4aef3..bf35b38ce7 100644 --- a/scripts/start/projects/test_bii.R +++ b/scripts/start/projects/test_bii.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/test_country.R b/scripts/start/projects/test_country.R index 0b61cdc32e..b3b86b59ee 100644 --- a/scripts/start/projects/test_country.R +++ b/scripts/start/projects/test_country.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/test_diets.R b/scripts/start/projects/test_diets.R index 3228753bbe..a1a9399a96 100644 --- a/scripts/start/projects/test_diets.R +++ b/scripts/start/projects/test_diets.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/projects/test_rotations.R b/scripts/start/projects/test_rotations.R index fc4a5a9fd3..a17928ebdd 100644 --- a/scripts/start/projects/test_rotations.R +++ b/scripts/start/projects/test_rotations.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start/test_runs.R b/scripts/start/test_runs.R index ced1476f9e..7addcd5b4e 100644 --- a/scripts/start/test_runs.R +++ b/scripts/start/test_runs.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the diff --git a/scripts/start_functions.R b/scripts/start_functions.R index 3bc5ff6f35..8554dbdca8 100644 --- a/scripts/start_functions.R +++ b/scripts/start_functions.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the @@ -250,15 +250,41 @@ start_run <- function(cfg, scenario = NULL, codeCheck = TRUE, lock_model = TRUE) cfg$results_folder <- gsub(":title:", cfg$title, cfg$results_folder, fixed=TRUE) # Create output folder - if (!file.exists(cfg$results_folder)) { - dir.create(cfg$results_folder, recursive=TRUE, showWarnings=FALSE) - } else if (cfg$force_replace) { - cat("Deleting results folder because it already exists:",cfg$results_folder,"\n") - unlink(cfg$results_folder, recursive = TRUE) - dir.create(cfg$results_folder, recursive = TRUE, showWarnings = FALSE) + if (file.exists(cfg$results_folder)) { + if (cfg$force_replace) { + message("Deleting results folder because it already exists:", cfg$results_folder) + unlink(cfg$results_folder, recursive = TRUE) + } else { + stop(paste0("Results folder ", cfg$results_folder, + " could not be created because it already exists.")) + } + } + dir.create(cfg$results_folder, recursive = TRUE) + + if (is.null(renv::project())) { + message("No active renv project found, not using renv.") } else { - stop(paste0("Results folder ",cfg$results_folder, - " could not be created because is already exists.")) + message("Generating lockfile '", file.path(cfg$results_folder, "renv.lock"), "'... ", appendLF = FALSE) + # suppress output of renv::snapshot + utils::capture.output({ + utils::capture.output({ + # snapshot current main renv into run folder + renv::snapshot(lockfile = file.path(cfg$results_folder, "main_renv.lock"), prompt = FALSE) + }, type = "message") + }) + message("done.") + + message("Creating renv in '", cfg$results_folder, "'... ", appendLF = FALSE) + createResultsfolderRenv <- function() { + renv::init() # will overwrite renv.lock if existing... + file.rename("main_renv.lock", "renv.lock") # so we need this rename + renv::restore(prompt = FALSE) + } + # init renv in a separate session so the libPaths of the current session remain unchanged + callr::r(createResultsfolderRenv, + wd = cfg$results_folder, + env = c(RENV_PATHS_LIBRARY = "renv/library")) + message("done.") } # If reports for both bioenergy and GHG prices are available convert them @@ -563,3 +589,35 @@ getReportData <- function(path_to_report_bioenergy, mute_ghgprices_until = "y201 .emissionPrices(ghgmag, mute_ghgprices_until) } } + +# Will not actually solve the model: after compilation, this just copies the results +# of a previous run, useful for testing compilation and input/output handling. +# Used in scripts/start/extra/empty_model.R and tests for REMIND-MAgPIE coupling. +configureEmptyModel <- function(cfg, inputGdxPath) { + message("Configuring to use empty MAgPIE model, reproduces prior run ", inputGdxPath) + originalModel <- withr::local_connection(file(cfg$model, "r")) + emptyModelFile <- "standalone/empty_test_model.gms" + emptyModel <- withr::local_connection(file(emptyModelFile, "w")) + while (TRUE) { + originalLine <- readLines(originalModel, n = 1) + if (length(originalLine) == 0) { + break + } + writeLines(originalLine, emptyModel) + if (grepl("*END MODULE SETUP*", originalLine)) { + # add code for short-circuiting the model + writeLines(c( + "***********************TEST USING EMPTY MODEL***********************************", + "*** empty model just uses input gdx as the result", + "*** rest of the model is compiled, but not executed", + "$setglobal c_input_gdx_path path", + "execute \"cp %c_input_gdx_path% fulldata.gdx\";", + "abort.noerror \"cp %c_input_gdx_path% fulldata.gdx\";", + "********************************************************************************"), + emptyModel) + } + } + cfg$model <- emptyModelFile + cfg$gms$c_input_gdx_path <- inputGdxPath + return(cfg) +} diff --git a/standalone/.gitignore b/standalone/.gitignore new file mode 100644 index 0000000000..f836b512c0 --- /dev/null +++ b/standalone/.gitignore @@ -0,0 +1 @@ +empty_test_model.gms diff --git a/standalone/demand_model.gms b/standalone/demand_model.gms index 612e58d272..20c44f2abf 100644 --- a/standalone/demand_model.gms +++ b/standalone/demand_model.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/standalone/template.gms b/standalone/template.gms index cc0eb7deec..1fd74a3cd0 100644 --- a/standalone/template.gms +++ b/standalone/template.gms @@ -1,4 +1,4 @@ -*** | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +*** | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) *** | authors, and contributors see CITATION.cff file. This file is part *** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of *** | AGPL-3.0, you are granted additional permissions described in the diff --git a/start.R b/start.R index 7ca9dbc3d0..9ca78a4cae 100644 --- a/start.R +++ b/start.R @@ -1,4 +1,4 @@ -# | (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK) +# | (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK) # | authors, and contributors see CITATION.cff file. This file is part # | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of # | AGPL-3.0, you are granted additional permissions described in the @@ -9,24 +9,30 @@ #### MAgPIE output generation #### ########################################################## +if (!is.null(renv::project())) { + ask <- function(question) { + message(question, appendLF = FALSE) + return(tolower(gms::getLine()) %in% c("", "y", "yes")) + } + + message("Checking for updates... ", appendLF = FALSE) + if (getOption("autoRenvUpdates", FALSE) || + (!is.null(piamenv::showUpdates()) && ask("Update now? (Y/n): "))) { + updates <- piamenv::updateRenv() + piamenv::stopIfLoaded(names(updates)) + } + message("Update check done.") + + message("Checking package version requirements... ", appendLF = FALSE) + updates <- piamenv::fixDeps(ask = TRUE) + piamenv::stopIfLoaded(names(updates)) + message("Requirements check done.") +} + library(lucode2) library(gms) runOutputs <- function(runscripts=NULL, submit=NULL) { - - get_line <- function(){ - # gets characters (line) from the terminal or from a connection - # and returns it - if(interactive()){ - s <- readline() - } else { - con <- file("stdin") - s <- readLines(con, 1, warn=FALSE) - on.exit(close(con)) - } - return(s); - } - choose_submit <- function(title="Please choose run submission type") { slurm <- suppressWarnings(ifelse(system2("srun",stdout=FALSE,stderr=FALSE) != 127, TRUE, FALSE)) modes <- c("SLURM priority", @@ -43,9 +49,9 @@ runOutputs <- function(runscripts=NULL, submit=NULL) { modes <- grep("SLURM",modes,invert=TRUE,value=TRUE) } cat("\n",title,":\n", sep="") - cat(paste(1:length(modes), modes, sep=": " ),sep="\n") + cat(paste(seq_along(modes), modes, sep=": " ),sep="\n") cat("Number: ") - identifier <- get_line() + identifier <- gms::getLine() identifier <- as.numeric(strsplit(identifier,",")[[1]]) if(slurm) { comp <- switch(identifier,