diff --git a/modules/37_industry/fixed_shares/declarations.gms b/modules/37_industry/fixed_shares/declarations.gms index 32cb03b2b..af6204096 100644 --- a/modules/37_industry/fixed_shares/declarations.gms +++ b/modules/37_industry/fixed_shares/declarations.gms @@ -31,7 +31,7 @@ Parameters o37_demFeIndSub(ttot,all_regi,all_enty,all_enty,secInd37,all_emiMkt) "FE demand per industry subsector, FE carrier, SE carrier, emissions market" !! empty parameters from subsectors - pm_energy_limit(all_in) "" / / + pm_energy_limit(all_in) "empty parameter" / / p37_CESMkup_input(all_in) "markup cost parameter read in from config for CES levels in industry to influence demand-side cost and efficiencies in CES tree [trUSD/CES input]" / diff --git a/tutorials/13_Submit_to_IIASA_database.md b/tutorials/13_Submit_to_IIASA_database.md index 6de7ec186..ae79a2017 100644 --- a/tutorials/13_Submit_to_IIASA_database.md +++ b/tutorials/13_Submit_to_IIASA_database.md @@ -99,14 +99,14 @@ The following functions from `piamInterfaces` might be helpful for further analy If you like to generate a 'historical.mif' file for a different regional resolution than the REMIND one to pass it to plotIntercomparison, you can use the [regionmapping](https://github.com/pik-piam/piamInterfaces/tree/master/inst/regionmapping) ISO files from piamInterfaces or a similarly formatted file, for example like this: ``` -library(madrat); library(mrremind); library(quitte) +library(madrat); library(mrremind); library(quitte); library(piamInterfaces) stopifnot(utils::packageVersion("piamInterfaces") >= "0.35.3") setConfig(regionmapping = system.file("regionmapping/ISO_2_ISO.csv", package = "piamInterfaces")) d <- madrat::retrieveData("VALIDATIONREMIND") system(paste("tar -xvf", d, "./historical.mif")) hist <- read.snapshot("historical.mif") -write.mif(piamInterfaces::convertHistoricalData(hist, "ScenarioMIP", "ISO_2_R10"), "historical_R10.mif") -write.mif(piamInterfaces::convertHistoricalData(hist, "ScenarioMIP", "ISO_2_R5"), "historical_R5.mif") +write.mif(convertHistoricalData(hist, "ScenarioMIP", "ISO_2_R10"), "historical_R10.mif") +write.mif(convertHistoricalData(hist, "ScenarioMIP", "ISO_2_R5"), "historical_R5.mif") ``` ## Further Information