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.

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

Conversation

johannah-pik
Copy link
Contributor

@johannah-pik johannah-pik commented Jul 18, 2024

Purpose of this PR

Adjusting REMIND to function with the new edgeTransport 2.0 version:
Changes include:
-Change transport scenario names in sets and scenario config
-Remove files/scenarios no longer needed
-Include new transport input data files
-Adjust function calls
-Change package dependencies

Type of change

(Make sure to delete from the Type-of-change list the items not relevant to your PR)

  • Bug fix
  • Refactoring
  • New feature
  • Minor change (default scenarios show only small differences)
  • Fundamental change
  • This change requires a documentation update

Checklist:

  • My code follows the coding etiquette
  • I performed a self-review of my own code
  • I explained my changes within the PR, particularly in hard-to-understand areas
  • I checked that the in-code documentation is up-to-date
  • I adjusted the reporting in remind2 where it was needed
  • I adjusted forbiddenColumnNames in readCheckScenarioConfig.R in case the PR leads to deprecated switches
  • All automated model tests pass (FAIL 0 in the output of make test)
  • [x ] The changelog CHANGELOG.md has been updated correctly

Further information (optional):

This PR will be merged with several other PRs related to the switch to edgeTransport 2.0:

  • Test runs are here: /p/projects/edget/Refactoring/remind/output
  • Comparison of results (what changes by this PR?):

() Outdated
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?

@@ -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?

core/sets.gms Outdated
@@ -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

eval Outdated
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?

eval.parent Outdated
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?

@@ -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?

renv.lock Outdated
Copy link
Member

Choose a reason for hiding this comment

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

also not part of our Git repo

@johannah-pik johannah-pik merged commit cf167c1 into remindmodel:develop Jul 18, 2024
2 checks passed
@orichters
Copy link
Contributor

orichters commented Jul 19, 2024

Sorry to say, but after this merge REMIND is dysfunctional, see Rscript start.R --gamscompile

2280123  1900,LAM,gdp_SSP2EU,gdp_SSP2EU_demRedStrong,ECEMF_HighEl_LifestCha,te_esdie_frgt_lo,0.000342571576087318
****                                               $170
**** LINE 258726 INCLUDE     /p/tmp/oliverr/remind-edget/modules/35_transport/edge_esm/input/f35_esCapCost.cs4r
**** LINE     22 INCLUDE     /p/tmp/oliverr/remind-edget/modules/35_transport/edge_esm/datainput.gms
**** LINE     22 INCLUDE     /p/tmp/oliverr/remind-edget/modules/35_transport/edge_esm/realization.gms
**** LINE     16 INCLUDE     /p/tmp/oliverr/remind-edget/modules/35_transport/module.gms
**** LINE     30 BATINCLUDE  /p/tmp/oliverr/remind-edget/modules/include.gms
                             %1  datainput
**** LINE   1777 INPUT       /p/tmp/oliverr/remind-edget/output/gamscompile/main_default.gms
**** 170  Domain violation for element

Please run make test (or ideally, make test-full for such a big change) before merging as indicated in the check list of your PR description.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants