edgeTransport 2.0 release

CHANGELOG.md

@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### changed
 - plastic waste by default does not lag plastics production by ten years
     anymore; can be re-activated using `cm_wastelag`
+- moved to edgeTransport 2.0 version [[#1749](https://github.com/remindmodel/remind/pull/1749]
 
 ### added
 - **50_damages**, **51_internalizeDamages** add KotzWenz realization based on Kotz & Wenz (2024)

DESCRIPTION

@@ -17,7 +17,8 @@ Imports:
     data.table,
     devtools,
     dplyr,
-    edgeTransport (>= 1.5.5),
+    edgeTransport (>= 2.0),
+    reporttransport (>= 0.0.11),
     flexdashboard,
     GDPuc,
     gdx (>= 1.53.0),
@@ -50,7 +51,7 @@ Imports:
     nleqslv,
     optparse,
     piamenv (>= 0.4.0),
-    piamInterfaces (>= 0.17.4),
+    piamInterfaces (>= 0.20.21),
     piamPlotComparison (>= 0.0.10),
     piamutils,
     plotly,
@@ -60,7 +61,7 @@ Imports:
     raster,
     readr,
     readxl,
-    remind2 (>= 1.144),
+    remind2 (>= 1.147.2),
     renv,
     reshape2,
     reticulate,

config/default.cfg

@@ -27,10 +27,10 @@ cfg$regionmapping <- "config/regionmappingH12.csv"
 ### Additional (optional) region mapping, so that those validation data can be loaded that contain the corresponding additional regions.
 cfg$extramappings_historic <- ""
 #### Current input data revision (<mainrevision>.<subrevision>) ####
-cfg$inputRevision <- "6.79"
+cfg$inputRevision <- "6.83edgeTransportReloaded"
 
 #### Current CES parameter and GDX revision (commit hash) ####
-cfg$CESandGDXversion <- "997bd3ebd9de58471f80adeb5d79fda0915878d2"
+cfg$CESandGDXversion <- "2ca8c53c815df225647013d19fb20b4a8031afe3"
 
 #### Force the model to download new input data ####
 cfg$force_download <- FALSE
@@ -144,17 +144,13 @@ cfg$files2export$start <- c("config/conopt3.opt",
                             "modules/11_aerosols/exoGAINS/input/emi_gains.cs4r",
                             "modules/11_aerosols/exoGAINS/input/mappingGAINSmixedtoREMIND17activities.csv",
                             "modules/11_aerosols/exoGAINS/input/mappingGAINStoREMINDsectors.csv",
-                            "modules/35_transport/edge_esm/input/mapping_CESnodes_EDGE.csv",
-                            "modules/35_transport/edge_esm/input/mapping_EDGE_REMIND_transport_categories.csv",
-                            "modules/35_transport/edge_esm/input/value_time.cs4r",
-                            "modules/35_transport/edge_esm/input/pref.cs4r",
-                            "modules/35_transport/edge_esm/input/logit_exponent.cs4r",
-                            "modules/35_transport/edge_esm/input/annual_mileage.cs4r",
-                            "modules/35_transport/edge_esm/input/harmonized_intensities.cs4r",
-                            "modules/35_transport/edge_esm/input/UCD_NEC_iso.cs4r",
-                            "modules/35_transport/edge_esm/input/price_nonmot.cs4r",
-                            "modules/35_transport/edge_esm/input/loadFactor.cs4r",
-                            "modules/35_transport/edge_esm/input/ptab4W.cs4r")
+                            "modules/35_transport/edge_esm/input/CAPEXandNonFuelOPEX.cs4r",
+                            "modules/35_transport/edge_esm/input/scenSpecPrefTrends.cs4r",
+                            "modules/35_transport/edge_esm/input/scenSpecLoadFactor.cs4r",
+                            "modules/35_transport/edge_esm/input/scenSpecEnIntensity.cs4r",
+                            "modules/35_transport/edge_esm/input/initialIncoCosts.cs4r",
+                            "modules/35_transport/edge_esm/input/annualMileage.cs4r",
+                            "modules/35_transport/edge_esm/input/timeValueCosts.cs4r")
 
 # Files that should be copied after the REMIND run is finished
 cfg$files2export$end <- NULL

core/bounds.gms

@@ -537,5 +537,4 @@ $ENDIF.transpGDPscale
 v_changeProdStartyearSlack.up(t,regi,te)$( (t.val gt 2005) AND (t.val eq cm_startyear ) ) = + c_SlackMultiplier * p_adj_seed_reg(t,regi) * p_adj_seed_te(t,regi,te) ;
 v_changeProdStartyearSlack.lo(t,regi,te)$( (t.val gt 2005) AND (t.val eq cm_startyear ) ) = - c_SlackMultiplier * p_adj_seed_reg(t,regi) * p_adj_seed_te(t,regi,te) ;
 
-
 *** EOF ./core/bounds.gms

core/sets.gms

@@ -76,7 +76,6 @@ gdp_SSP2EU_NAV_lce "NAVIGATE demand scenarios: Low consumption energy (act + tec
 gdp_SSP2EU_NAV_all "NAVIGATE demand scenarios: All measures (ele + act + tec)"
 gdp_SSP2EU_CAMP_weak   "CAMPAIGNers scenario with low ambition lifestyle change"
 gdp_SSP2EU_CAMP_strong "CAMPAIGNers scenario with high ambition lifestyle change"
-gdp_SSP2EU_demRedWeak
 /
 
 all_GDPpcScen    "all possible GDP per capita scenarios (GDP and Population from the same SSP-scenario"
@@ -763,123 +762,131 @@ sets
    ext_regi "extended regions list (includes subsets of H12 regions)"
       /
         GLO,
-        LAM_regi,OAS_regi,SSA_regi,EUR_regi,NEU_regi,MEA_regi,REF_regi,CAZ_regi,CHA_regi,IND_regi,JPN_regi,USA_regi,
-        LAM,OAS,SSA,EUR,NEU,MEA,REF,CAZ,CHA,IND,JPN,USA
+        LAM_regi,OAS_regi,SSA_regi,EUR_regi,NEU_regi,MEA_regi,REF_regi,CAZ_regi,CHA_regi,IND_regi,JPN_regi,USA_regi,EU27_regi,NEU_UKI_regi,
+        OAS,ENC,NES,MEA,SSA,LAM,REF,CAZ,EWN,ECS,CHA,ESC,ECE,FRA,DEU,UKI,NEN,IND,JPN,ESW,USA
       /
 
-   all_regi "all regions" /LAM,OAS,SSA,EUR,NEU,MEA,REF,CAZ,CHA,IND,JPN,USA/
+   all_regi "all regions" /OAS,ENC,NES,MEA,SSA,LAM,REF,CAZ,EWN,ECS,CHA,ESC,ECE,FRA,DEU,UKI,NEN,IND,JPN,ESW,USA/
 
    regi_group(ext_regi,all_regi) "region groups (regions that together corresponds to a H12 region)"
       /
-        GLO.( LAM,OAS,SSA,EUR,NEU,MEA,REF,CAZ,CHA,IND,JPN,USA )
+        GLO.( OAS,ENC,NES,MEA,SSA,LAM,REF,CAZ,EWN,ECS,CHA,ESC,ECE,FRA,DEU,UKI,NEN,IND,JPN,ESW,USA )
         LAM_regi .(LAM)
         OAS_regi .(OAS)
         SSA_regi .(SSA)
-        EUR_regi .(EUR)
-        NEU_regi .(NEU)
+        EUR_regi .(ENC,EWN,ECS,ESC,ECE,FRA,DEU,UKI,ESW)
+        NEU_regi .(NES,NEN)
         MEA_regi .(MEA)
         REF_regi .(REF)
         CAZ_regi .(CAZ)
         CHA_regi .(CHA)
         IND_regi .(IND)
         JPN_regi .(JPN)
         USA_regi .(USA)
+        EU27_regi .(ENC,EWN,ECS,ESC,ECE,FRA,DEU,ESW)
+        NEU_UKI_regi .(NES,NEN,UKI)
       /
 
    iso "list of iso countries" /
-       ABW,AFG,AGO,AIA,ALA,ALB,AND,ARE,ARG,ARM,
-       ASM,ATA,ATF,ATG,AUS,AUT,AZE,BDI,BEL,BEN,
-       BES,BFA,BGD,BGR,BHR,BHS,BIH,BLM,BLR,BLZ,
-       BMU,BOL,BRA,BRB,BRN,BTN,BVT,BWA,CAF,CAN,
-       CCK,CHN,CHE,CHL,CIV,CMR,COD,COG,COK,COL,
-       COM,CPV,CRI,CUB,CUW,CXR,CYM,CYP,CZE,DEU,
-       DJI,DMA,DNK,DOM,DZA,ECU,EGY,ERI,ESH,ESP,
-       EST,ETH,FIN,FJI,FLK,FRA,FRO,FSM,GAB,GBR,
-       GEO,GGY,GHA,GIB,GIN,GLP,GMB,GNB,GNQ,GRC,
-       GRD,GRL,GTM,GUF,GUM,GUY,HKG,HMD,HND,HRV,
-       HTI,HUN,IDN,IMN,IND,IOT,IRL,IRN,IRQ,ISL,
-       ISR,ITA,JAM,JEY,JOR,JPN,KAZ,KEN,KGZ,KHM,
-       KIR,KNA,KOR,KWT,LAO,LBN,LBR,LBY,LCA,LIE,
-       LKA,LSO,LTU,LUX,LVA,MAC,MAF,MAR,MCO,MDA,
-       MDG,MDV,MEX,MHL,MKD,MLI,MLT,MMR,MNE,MNG,
-       MNP,MOZ,MRT,MSR,MTQ,MUS,MWI,MYS,MYT,NAM,
-       NCL,NER,NFK,NGA,NIC,NIU,NLD,NOR,NPL,NRU,
-       NZL,OMN,PAK,PAN,PCN,PER,PHL,PLW,PNG,POL,
-       PRI,PRK,PRT,PRY,PSE,PYF,QAT,REU,ROU,RUS,
-       RWA,SAU,SDN,SEN,SGP,SGS,SHN,SJM,SLB,SLE,
-       SLV,SMR,SOM,SPM,SRB,SSD,STP,SUR,SVK,SVN,
-       SWE,SWZ,SXM,SYC,SYR,TCA,TCD,TGO,THA,TJK,
-       TKL,TKM,TLS,TON,TTO,TUN,TUR,TUV,TWN,TZA,
-       UGA,UKR,UMI,URY,USA,UZB,VAT,VCT,VEN,VGB,
-       VIR,VNM,VUT,WLF,WSM,YEM,ZAF,ZMB,ZWE /
+       AFG,ALA,ALB,DZA,ASM,AND,AGO,AIA,ATA,ATG,
+       ARG,ARM,ABW,AUS,AUT,AZE,BHS,BHR,BGD,BRB,
+       BLR,BEL,BLZ,BEN,BMU,BTN,BOL,BES,BIH,BWA,
+       BVT,BRA,IOT,BRN,BGR,BFA,BDI,KHM,CMR,CAN,
+       CPV,CYM,CAF,TCD,CHL,CHN,CXR,CCK,COL,COM,
+       COG,COD,COK,CRI,CIV,HRV,CUB,CUW,CYP,CZE,
+       DNK,DJI,DMA,DOM,ECU,EGY,SLV,GNQ,ERI,EST,
+       ETH,FLK,FRO,FJI,FIN,FRA,GUF,PYF,ATF,GAB,
+       GMB,GEO,DEU,GHA,GIB,GRC,GRL,GRD,GLP,GUM,
+       GTM,GGY,GIN,GNB,GUY,HTI,HMD,VAT,HND,HKG,
+       HUN,ISL,IND,IDN,IRN,IRQ,IRL,IMN,ISR,ITA,
+       JAM,JPN,JEY,JOR,KAZ,KEN,KIR,PRK,KOR,KWT,
+       KGZ,LAO,LVA,LBN,LSO,LBR,LBY,LIE,LTU,LUX,
+       MAC,MKD,MDG,MWI,MYS,MDV,MLI,MLT,MHL,MTQ,
+       MRT,MUS,MYT,MEX,FSM,MDA,MCO,MNG,MNE,MSR,
+       MAR,MOZ,MMR,NAM,NRU,NPL,NLD,NCL,NZL,NIC,
+       NER,NGA,NIU,NFK,MNP,NOR,OMN,PAK,PLW,PSE,
+       PAN,PNG,PRY,PER,PHL,PCN,POL,PRT,PRI,QAT,
+       REU,ROU,RUS,RWA,BLM,SHN,KNA,LCA,MAF,SPM,
+       VCT,WSM,SMR,STP,SAU,SEN,SRB,SYC,SLE,SGP,
+       SXM,SVK,SVN,SLB,SOM,ZAF,SGS,SSD,ESP,LKA,
+       SDN,SUR,SJM,SWZ,SWE,CHE,SYR,TWN,TJK,TZA,
+       THA,TLS,TGO,TKL,TON,TTO,TUN,TUR,TKM,TCA,
+       TUV,UGA,UKR,ARE,GBR,USA,UMI,URY,UZB,VUT,
+       VEN,VNM,VGB,VIR,WLF,ESH,YEM,ZMB,ZWE /
 
    regi2iso(all_regi,iso) "mapping regions to iso countries"
       /
-       LAM . (ABW,AIA,ARG,ATA,ATG,BES,BHS,BLM,BLZ,BMU)
-       LAM . (BOL,BRA,BRB,BVT,CHL,COL,CRI,CUB,CUW,CYM)
-       LAM . (DMA,DOM,ECU,FLK,GLP,GRD,GTM,GUF,GUY,HND)
-       LAM . (HTI,JAM,KNA,LCA,MAF,MEX,MSR,MTQ,NIC,PAN)
-       LAM . (PER,PRI,PRY,SGS,SLV,SUR,SXM,TCA,TTO,URY)
-       LAM . (VCT,VEN,VGB,VIR)
-       OAS . (AFG,ASM,ATF,BGD,BRN,BTN,CCK,COK,CXR,FJI)
-       OAS . (FSM,GUM,IDN,IOT,KHM,KIR,KOR,LAO,LKA,MDV)
-       OAS . (MHL,MMR,MNG,MNP,MYS,NCL,NFK,NIU,NPL,NRU)
-       OAS . (PAK,PCN,PHL,PLW,PNG,PRK,PYF,SGP,SLB,THA)
-       OAS . (TKL,TLS,TON,TUV,UMI,VNM,VUT,WLF,WSM)
-       SSA . (AGO,BDI,BEN,BFA,BWA,CAF,CIV,CMR,COD,COG)
-       SSA . (COM,CPV,DJI,ERI,ETH,GAB,GHA,GIN,GMB,GNB)
-       SSA . (GNQ,KEN,LBR,LSO,MDG,MLI,MOZ,MRT,MUS,MWI)
-       SSA . (MYT,NAM,NER,NGA,REU,RWA,SEN,SHN,SLE,SOM)
-       SSA . (SSD,STP,SWZ,SYC,TCD,TGO,TZA,UGA,ZAF,ZMB)
-       SSA . (ZWE)
-       EUR . (ALA,AUT,BEL,BGR,CYP,CZE,DEU,DNK,ESP,EST)
-       EUR . (FIN,FRA,FRO,GBR,GGY,GIB,GRC,HRV,HUN,IMN)
-       EUR . (IRL,ITA,JEY,LTU,LUX,LVA,MLT,NLD,POL,PRT)
-       EUR . (ROU,SVK,SVN,SWE)
-       NEU . (ALB,AND,BIH,CHE,GRL,ISL,LIE,MCO,MKD,MNE)
-       NEU . (NOR,SJM,SMR,SRB,TUR,VAT)
-       MEA . (ARE,BHR,DZA,EGY,ESH,IRN,IRQ,ISR,JOR,KWT)
-       MEA . (LBN,LBY,MAR,OMN,PSE,QAT,SAU,SDN,SYR,TUN)
+       OAS . (AFG,ASM,BGD,BTN,IOT,BRN,KHM,CXR,CCK,COK)
+       OAS . (FJI,PYF,ATF,GUM,IDN,KIR,PRK,KOR,LAO,MYS)
+       OAS . (MDV,MHL,FSM,MNG,MMR,NRU,NPL,NCL,NIU,NFK)
+       OAS . (MNP,PAK,PLW,PNG,PHL,PCN,WSM,SGP,SLB,LKA)
+       OAS . (THA,TLS,TKL,TON,TUV,UMI,VUT,VNM,WLF)
+       ENC . (ALA,DNK,FRO,FIN,SWE)
+       NES . (ALB,AND,BIH,VAT,MKD,MCO,MNE,SMR,SRB,TUR)
+       MEA . (DZA,BHR,EGY,IRN,IRQ,ISR,JOR,KWT,LBN,LBY)
+       MEA . (MAR,OMN,PSE,QAT,SAU,SDN,SYR,TUN,ARE,ESH)
        MEA . (YEM)
+       SSA . (AGO,BEN,BWA,BFA,BDI,CMR,CPV,CAF,TCD,COM)
+       SSA . (COG,COD,CIV,DJI,GNQ,ERI,ETH,GAB,GMB,GHA)
+       SSA . (GIN,GNB,KEN,LSO,LBR,MDG,MWI,MLI,MRT,MUS)
+       SSA . (MYT,MOZ,NAM,NER,NGA,REU,RWA,SHN,STP,SEN)
+       SSA . (SYC,SLE,SOM,ZAF,SSD,SWZ,TZA,TGO,UGA,ZMB)
+       SSA . (ZWE)
+       LAM . (AIA,ATA,ATG,ARG,ABW,BHS,BRB,BLZ,BMU,BOL)
+       LAM . (BES,BVT,BRA,CYM,CHL,COL,CRI,CUB,CUW,DMA)
+       LAM . (DOM,ECU,SLV,FLK,GUF,GRD,GLP,GTM,GUY,HTI)
+       LAM . (HND,JAM,MTQ,MEX,MSR,NIC,PAN,PRY,PER,PRI)
+       LAM . (BLM,KNA,LCA,MAF,VCT,SXM,SGS,SUR,TTO,TCA)
+       LAM . (URY,VEN,VGB,VIR)
        REF . (ARM,AZE,BLR,GEO,KAZ,KGZ,MDA,RUS,TJK,TKM)
        REF . (UKR,UZB)
        CAZ . (AUS,CAN,HMD,NZL,SPM)
+       EWN . (AUT,BEL,LUX,NLD)
+       ECS . (BGR,HRV,HUN,ROU,SVN)
        CHA . (CHN,HKG,MAC,TWN)
+       ESC . (CYP,GRC,ITA,MLT)
+       ECE . (CZE,EST,LVA,LTU,POL,SVK)
+       FRA . (FRA)
+       DEU . (DEU)
+       UKI . (GIB,GGY,IRL,IMN,JEY,GBR)
+       NEN . (GRL,ISL,LIE,NOR,SJM,CHE)
        IND . (IND)
        JPN . (JPN)
+       ESW . (PRT,ESP)
        USA . (USA)
       /
 iso_regi "all iso countries and EU and greater China region" /  EUR,CHA,
-       ABW,AFG,AGO,AIA,ALA,ALB,AND,ARE,ARG,ARM,
-       ASM,ATA,ATF,ATG,AUS,AUT,AZE,BDI,BEL,BEN,
-       BES,BFA,BGD,BGR,BHR,BHS,BIH,BLM,BLR,BLZ,
-       BMU,BOL,BRA,BRB,BRN,BTN,BVT,BWA,CAF,CAN,
-       CCK,CHN,CHE,CHL,CIV,CMR,COD,COG,COK,COL,
-       COM,CPV,CRI,CUB,CUW,CXR,CYM,CYP,CZE,DEU,
-       DJI,DMA,DNK,DOM,DZA,ECU,EGY,ERI,ESH,ESP,
-       EST,ETH,FIN,FJI,FLK,FRA,FRO,FSM,GAB,GBR,
-       GEO,GGY,GHA,GIB,GIN,GLP,GMB,GNB,GNQ,GRC,
-       GRD,GRL,GTM,GUF,GUM,GUY,HKG,HMD,HND,HRV,
-       HTI,HUN,IDN,IMN,IND,IOT,IRL,IRN,IRQ,ISL,
-       ISR,ITA,JAM,JEY,JOR,JPN,KAZ,KEN,KGZ,KHM,
-       KIR,KNA,KOR,KWT,LAO,LBN,LBR,LBY,LCA,LIE,
-       LKA,LSO,LTU,LUX,LVA,MAC,MAF,MAR,MCO,MDA,
-       MDG,MDV,MEX,MHL,MKD,MLI,MLT,MMR,MNE,MNG,
-       MNP,MOZ,MRT,MSR,MTQ,MUS,MWI,MYS,MYT,NAM,
-       NCL,NER,NFK,NGA,NIC,NIU,NLD,NOR,NPL,NRU,
-       NZL,OMN,PAK,PAN,PCN,PER,PHL,PLW,PNG,POL,
-       PRI,PRK,PRT,PRY,PSE,PYF,QAT,REU,ROU,RUS,
-       RWA,SAU,SDN,SEN,SGP,SGS,SHN,SJM,SLB,SLE,
-       SLV,SMR,SOM,SPM,SRB,SSD,STP,SUR,SVK,SVN,
-       SWE,SWZ,SXM,SYC,SYR,TCA,TCD,TGO,THA,TJK,
-       TKL,TKM,TLS,TON,TTO,TUN,TUR,TUV,TWN,TZA,
-       UGA,UKR,UMI,URY,USA,UZB,VAT,VCT,VEN,VGB,
-       VIR,VNM,VUT,WLF,WSM,YEM,ZAF,ZMB,ZWE /
+       AFG,ALA,ALB,DZA,ASM,AND,AGO,AIA,ATA,ATG,
+       ARG,ARM,ABW,AUS,AUT,AZE,BHS,BHR,BGD,BRB,
+       BLR,BEL,BLZ,BEN,BMU,BTN,BOL,BES,BIH,BWA,
+       BVT,BRA,IOT,BRN,BGR,BFA,BDI,KHM,CMR,CAN,
+       CPV,CYM,CAF,TCD,CHL,CHN,CXR,CCK,COL,COM,
+       COG,COD,COK,CRI,CIV,HRV,CUB,CUW,CYP,CZE,
+       DNK,DJI,DMA,DOM,ECU,EGY,SLV,GNQ,ERI,EST,
+       ETH,FLK,FRO,FJI,FIN,FRA,GUF,PYF,ATF,GAB,
+       GMB,GEO,DEU,GHA,GIB,GRC,GRL,GRD,GLP,GUM,
+       GTM,GGY,GIN,GNB,GUY,HTI,HMD,VAT,HND,HKG,
+       HUN,ISL,IND,IDN,IRN,IRQ,IRL,IMN,ISR,ITA,
+       JAM,JPN,JEY,JOR,KAZ,KEN,KIR,PRK,KOR,KWT,
+       KGZ,LAO,LVA,LBN,LSO,LBR,LBY,LIE,LTU,LUX,
+       MAC,MKD,MDG,MWI,MYS,MDV,MLI,MLT,MHL,MTQ,
+       MRT,MUS,MYT,MEX,FSM,MDA,MCO,MNG,MNE,MSR,
+       MAR,MOZ,MMR,NAM,NRU,NPL,NLD,NCL,NZL,NIC,
+       NER,NGA,NIU,NFK,MNP,NOR,OMN,PAK,PLW,PSE,
+       PAN,PNG,PRY,PER,PHL,PCN,POL,PRT,PRI,QAT,
+       REU,ROU,RUS,RWA,BLM,SHN,KNA,LCA,MAF,SPM,
+       VCT,WSM,SMR,STP,SAU,SEN,SRB,SYC,SLE,SGP,
+       SXM,SVK,SVN,SLB,SOM,ZAF,SGS,SSD,ESP,LKA,
+       SDN,SUR,SJM,SWZ,SWE,CHE,SYR,TWN,TJK,TZA,
+       THA,TLS,TGO,TKL,TON,TTO,TUN,TUR,TKM,TCA,
+       TUV,UGA,UKR,ARE,GBR,USA,UMI,URY,UZB,VUT,
+       VEN,VNM,VGB,VIR,WLF,ESH,YEM,ZMB,ZWE /
 
    map_iso_regi(iso_regi,all_regi) "mapping from iso countries to regions that represent country" 
          /
-       EUR . EUR
        CHA . CHA
+       FRA . FRA
+       DEU . DEU
        IND . IND
        JPN . JPN
        USA . USA

modules/29_CES_parameters/calibrate/datainput.gms

@@ -147,7 +147,7 @@ Parameter
 p29_trpdemand       "transport demand"
 /
 $ondelim
-$include "./modules/29_CES_parameters/calibrate/input/pm_trp_demand.cs4r"
+$include "./modules/29_CES_parameters/calibrate/input/f29_trpdemand.cs4r"
 $offdelim
 /
 

modules/29_CES_parameters/calibrate/input/files

@@ -1,3 +1,2 @@
 f29_capitalQuantity.cs4r
-pm_trp_demand.cs4r
-pm_fe_demand_EDGETbased.cs4r
+f29_trpdemand.cs4r

modules/31_fossil/grades2poly/bounds.gms

@@ -44,5 +44,4 @@ display v31_fuExtrCum.up;
 *------------------------------------
 v31_fuExtrCum.up(ttot,regi,"peur", "1") = p31_fuExtrCumMaxBound(regi,"peur", "1");
 
-
 *** EOF ./modules/31_fossil/grades2poly/bounds.gms

modules/35_transport/edge_esm/datainput.gms

@@ -19,7 +19,7 @@ parameters
 p35_esCapCost(tall,all_regi,all_GDPscen,all_demScen,EDGE_scenario_all,all_teEs) "Capital costs for the transport system [$/pkm or $/tkm]"
 /
 $ondelim
-$include "./modules/35_transport/edge_esm/input/esCapCost.cs4r"
+$include "./modules/35_transport/edge_esm/input/f35_esCapCost.cs4r"
 $offdelim
 /
 
@@ -33,14 +33,14 @@ $offdelim
 p35_fe2es(tall,all_regi,all_GDPscen,all_demScen,EDGE_scenario_all,all_teEs) "Aggregate energy efficiency of transport fuel technologies [trn pkm/Twa or trn tkm/Twa]"
 /
 $ondelim
-$include "./modules/35_transport/edge_esm/input/fe2es.cs4r"
+$include "./modules/35_transport/edge_esm/input/f35_fe2es.cs4r"
 $offdelim
 /
 
 p35_demByTech(tall,all_regi,all_GDPscen,all_demScen,EDGE_scenario_all,all_enty,all_in,all_teEs) "Aggregate FE Demand per transport fuel technology [TWa]"
 /
 $ondelim
-$include "./modules/35_transport/edge_esm/input/fe_demand_tech.cs4r"
+$include "./modules/35_transport/edge_esm/input/f35_demByTech.cs4r"
 $offdelim
 /
 

modules/35_transport/edge_esm/input/files

@@ -1,13 +1,11 @@
-UCD_NEC_iso.cs4r
-esCapCost.cs4r
-fe2es.cs4r
-fe_demand_tech.cs4r
-harmonized_intensities.cs4r
-pref.cs4r
-logit_exponent.cs4r
-price_nonmot.cs4r
-value_time.cs4r
-loadFactor.cs4r
-annual_mileage.cs4r
-ptab4W.cs4r
 f35_transportGDPshare.cs4r
+f35_esCapCost.cs4r
+f35_fe2es.cs4r
+f35_demByTech.cs4r
+CAPEXandNonFuelOPEX.cs4r
+scenSpecPrefTrends.cs4r
+scenSpecLoadFactor.cs4r
+scenSpecEnIntensity.cs4r
+initialIncoCosts.cs4r
+annualMileage.cs4r
+timeValueCosts.cs4r

modules/35_transport/edge_esm/output.gms

@@ -7,7 +7,7 @@
 *** SOF ./modules/35_transport/edge_esm/output.gms
 
 $ifthen.calibrate %CES_parameters% == "load"
-  Execute "Rscript -e 'edgeTransport::toolIterativeEDGETransport(reporting=TRUE)'";
+  Execute "Rscript -e 'edgeTransport::iterativeEdgeTransport()'";
 $endif.calibrate
 
 *** EOF ./modules/35_transport/edge_esm/output.gms

modules/35_transport/edge_esm/presolve.gms

@@ -10,7 +10,7 @@ if( (ord(iteration) le 25 and ord(iteration) ge cm_startIter_EDGET and (mod(ord(
     or (ord(iteration) le 45  and ord(iteration) gt 25 and  (mod(ord(iteration), 5) eq 0))
     or (ord(iteration)  gt 45 and  (mod(ord(iteration), 8) eq 0)),
 
-    Execute "Rscript -e 'edgeTransport::toolIterativeEDGETransport()'";
+    Execute "Rscript -e 'edgeTransport::iterativeEdgeTransport()'";
 
     Execute_Loadpoint 'p35_esCapCost' p35_esCapCost;
     pm_esCapCost(t,regi,teEs_dyn35)$(t.val gt 2010 AND t.val ge cm_startyear AND t.val le 2100) = p35_esCapCost(t,regi,"%cm_GDPscen%","%cm_demScen%","%cm_EDGEtr_scen%",teEs_dyn35);