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 #524

Merged
merged 40 commits into from
Jul 18, 2024
Merged

Conversation

johannah-pik
Copy link
Contributor

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

  • Refactor and adjust the read, covert, calc functions used to produce transport input data for REMIND and the iterative edgeTransport version
  • calcEDGETrData was removed
  • clean readEDGETransport(), convertEDGETransport() and calcEDGETRansport() functions were introduced
  • weight of f35_esCapCost [2005US$/(p|t)km] was changed from gdp to energy service demand [(p|t)km]
  • weight of f35_fe2es ["trn (p|t)km/Twa"] was changed to final energy [TWa]

This PR is related to the edgeTransport 2.0 release and merged together with the following PRs:
mrtransport #13
edgeTransport #266
reporttransport #18
remind #1749
remind2 #642
piamInterfaces #331

johannah-pik and others added 30 commits May 13, 2024 09:00
@johannah-pik johannah-pik changed the title Edge trefactoring edgeTransport 2.0 release Jul 18, 2024
@@ -16,36 +18,32 @@ fullREMIND <- function() {
rem_years <- seq(2005, 2150, 5)
rem_years_hist <- seq(1990, 2150, 5)

# Enable madrat caching for edgeTransport
madrat::madratAttach("edgeTransport")
madratAttach("edgeTransport") # enable madrat caching for edgeTransport
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 madrat::: @fbenke-pik do you agree?

@johannah-pik johannah-pik merged commit 65b82cf into pik-piam:master Jul 18, 2024
2 checks passed
@@ -135,22 +134,6 @@ fullREMIND <- function() {
calcOutput("CCScapacity", subtype = "projections", round = 8, file = "pm_boundCapCCS.cs4r")
calcOutput("CCSbounds", round = 8, file = "p_boundCapCCSindicator.cs4r")
calcOutput("LimitCCS", round = 8, file = "pm_dataccs.cs3r")
calcOutput('Industry_CCS_limits',
Copy link
Contributor

@fbenke-pik fbenke-pik Jul 19, 2024

Choose a reason for hiding this comment

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

Was this deleted intentionally? @jmuessel

Copy link
Contributor

@jmuessel jmuessel Jul 19, 2024

Choose a reason for hiding this comment

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

No, I'll prepare a PR rn

system(paste0('sed -i "/dummy/d" ', getConfig()$outputfolder, "/p37_clinker-to-cement-ratio.cs3r"))

calcOutput("Capacity", subtype = "capacityByTech", round = 6, file = "p_histCap.cs3r") # will be deleted after the merge of REMIND-EU
Copy link
Contributor

Choose a reason for hiding this comment

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

Was this brought back intentionally? @jmuessel

Copy link
Contributor

Choose a reason for hiding this comment

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

I think we needed this for pCap variables later. I would leave this in for now. But I noted it to check again in some weeks, when we do sth on pCap variables.

Copy link
Contributor

@fbenke-pik fbenke-pik Jul 19, 2024

Choose a reason for hiding this comment

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

why can't you use the file pm_histCap.cs3r? (see below)

Copy link
Contributor

@jmuessel jmuessel Jul 19, 2024

Choose a reason for hiding this comment

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

You are right

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