Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

edgeTransport 2.0 release #1749

Merged
merged 21 commits into from
Jul 18, 2024
Merged

edgeTransport 2.0 release #1749

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3c95ee3
changes to REMIND for new edgeT version
johannah-pik May 26, 2024
d95219c
Update edgeTransport scenarios
Jun 6, 2024
edca100
Merge branch 'develop' of github.com:remindmodel/remind into develop
Jun 6, 2024
6889569
adjust edge_esm
Jun 14, 2024
0983402
Merge branch '2005GDPaPOPaSSP2' of https://github.com/LaviniaBaumstar…
Jul 8, 2024
b49d5c1
Merge branch 'develop' of github.com:remindmodel/remind into develop
Jul 8, 2024
1e2bb25
Adjust REMIND for refactored EDGE-T version
Jul 12, 2024
82cd03f
Adjust the reporting:R script for using the new edgeT reporting
Jul 16, 2024
556b0f7
Add new input data to default.cfg
Jul 18, 2024
7c7513f
Merge branch 'develop' of github.com:remindmodel/remind into Refactoring
Jul 18, 2024
d8a8303
Change package dependencies in the DESCRIPTION file
Jul 18, 2024
cb02011
reset force_download in default.cfg
Jul 18, 2024
3cddd0d
Remove paths from config
Jul 18, 2024
ae5e7b0
Delete ()
johannah-pik Jul 18, 2024
f0f1399
Remove edget internal demScen
Jul 18, 2024
717ec7b
Merge branch 'Refactoring' of github.com:johannah-pik/remind into Ref…
Jul 18, 2024
7fd4f87
Update package dependencies
Jul 18, 2024
02000a6
Delete eval
johannah-pik Jul 18, 2024
9149854
Delete eval.parent
johannah-pik Jul 18, 2024
afd7b26
Delete renv.lock
johannah-pik Jul 18, 2024
d909f6a
Delete testfe2es.csv
johannah-pik Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions ()
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
update edge_esm
add!

jPlease enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch develop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where is this from?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm i dont know.. maybe we can just delete it?

# Your branch is up to date with 'origin/develop'.
#
# Changes to be committed:
# modified: config/default.cfg
# modified: core/sets.gms
# new file: f35_esCapCos.csv
# modified: modules/29_CES_parameters/calibrate/input/files
# modified: modules/35_transport/edge_esm/datainput.gms
# modified: modules/35_transport/edge_esm/input/files
# modified: modules/35_transport/edge_esm/sets.gms
#
7 changes: 4 additions & 3 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -50,7 +51,7 @@ Imports:
nleqslv,
optparse,
piamenv (>= 0.4.0),
piamInterfaces (>= 0.17.4),
piamInterfaces (>= 0.20.19),
piamPlotComparison (>= 0.0.10),
piamutils,
plotly,
Expand All @@ -60,7 +61,7 @@ Imports:
raster,
readr,
readxl,
remind2 (>= 1.144),
remind2 (>= 1.147.1),
renv,
reshape2,
reticulate,
Expand Down
22 changes: 9 additions & 13 deletions config/default.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this input data sound abit like test-data. We do not have input data with a "better" version number, right?


#### 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
Expand Down Expand Up @@ -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
Expand Down
54 changes: 27 additions & 27 deletions config/scenario_config.csv
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion core/bounds.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion core/sets.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ 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
gdp_SSP2EU_demRedStrong
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add an explanation of this scenario

/

all_GDPpcScen "all possible GDP per capita scenarios (GDP and Population from the same SSP-scenario"
Expand Down
Empty file added eval
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about this file?

Empty file.
Empty file added eval.parent
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and this file?

Empty file.
2 changes: 1 addition & 1 deletion modules/29_CES_parameters/calibrate/datainput.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you also renamed the file in fullREMIND, right?

$offdelim
/

Expand Down
3 changes: 1 addition & 2 deletions modules/29_CES_parameters/calibrate/input/files
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
f29_capitalQuantity.cs4r
pm_trp_demand.cs4r
pm_fe_demand_EDGETbased.cs4r
f29_trpdemand.cs4r
1 change: 0 additions & 1 deletion modules/31_fossil/grades2poly/bounds.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions modules/35_transport/edge_esm/datainput.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
/

Expand All @@ -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
/

Expand Down
22 changes: 10 additions & 12 deletions modules/35_transport/edge_esm/input/files
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion modules/35_transport/edge_esm/output.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion modules/35_transport/edge_esm/presolve.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
20 changes: 6 additions & 14 deletions modules/35_transport/edge_esm/sets.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,24 +118,15 @@ ces_transport_dyn35(all_in,all_in) "CES tree structure - edge transport"

EDGE_scenario_all "EDGE-T scenarios"
/
ConvCase
ConvCaseWise
ElecEra
ElecEraWise
HydrHype
HydrHype4
HydrHypeWise
Mix
MixWise
Mix1Wise
Mix2Wise
Mix3Wise
Mix4Wise
Mix1
Mix1ICEban
Mix2
Mix2ICEban
Mix3
Mix3ICEban
Mix4
PhOP
Mix4ICEban
HydrHype4
ECEMF_HighEl_HighEff
ECEMF_HighEl_ModEff
ECEMF_HighEl_LifestCha
Expand All @@ -149,6 +140,7 @@ NAV_lce
NAV_all
CAMP_lscWeak
CAMP_lscStrong
CAMP_lscLow
/

EDGE_scenario(EDGE_scenario_all) "Selected EDGE-T scenario"
Expand Down
Loading
Loading