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

Jump to bottom

Ariadne develop #1676

Closed
wants to merge 134 commits into from
Closed

Ariadne develop #1676

wants to merge 134 commits into from

Conversation

fschreyer
Copy link
Contributor

Purpose of this PR

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)
  • The changelog CHANGELOG.md has been updated correctly

Further information (optional):

  • Test runs are here:
  • Comparison of results (what changes by this PR?):

pweigmann and others added 30 commits April 4, 2023 11:14
@pweigmann
set coal-power capacity minimum from 2030 to 2040
8c5662f
@pweigmann
cherry-pick techstat5 commit
6b25ff6
@pweigmann
cherry-pick VRE H2 commit
1c23dd2
@pweigmann
introduce vm_VREminCap for ampel scen
354a955
@pweigmann
increase max wind offshore allowed in DEU
8a4e516
@pweigmann
mini fix
64f5a1c
@pweigmann
merge trunk
4f33e64
@pweigmann
early coal phase out for ampel scenario
01ec6bb
@pweigmann
Merge branch 'ampel' of https://github.com/pweigmann/remind into ampel
f5dd3e9
@pweigmann
Merge branch 'develop' of https://github.com/remindmodel/remind into …
f240bf1 
…ampel
@pweigmann
raise retirements rates for ESW, FRA and UKI to achieve coal phase-out
620dac6
@pweigmann
introduce vm_VREminCap for ampel scen
ff5fd4a
Merge branch 'ampel_dev' of https://github.com/pweigmann/remind into …
c2ad05b 
…ariadne_prod_merge_ampel
Merge branch 'develop' of https://github.com/remindmodel/remind into …
5a53302 
…ariadne_mergeTrunk
go back to previous input data revision and calibration string that w…
d061fe3 
…orked for EU21 runs
update ariadne scenario config
a0d6018
update ariadne config, remove geohe adjustment cost as they are alrea…
ba71a91 
…dy set by default as desired and remove old ariadne import switches
@pweigmann
phase in flexibility tax until 2040
2676213
@pweigmann
Merge branch 'ap_tech_push' of https://github.com/pweigmann/remind in…
8081151 
…to ap_tech_push_release
@pweigmann
bump input-rev to release
4b5c674
@pweigmann
lower adjustment costs for district heating
fd74c80
@pweigmann
dampen carbon price jumps
e53ef11
@pweigmann
bugfix
b1d30ee
@pweigmann
dampen carbon price fluctuations
9ce8c6e
@pweigmann
config updates
cf661da
implement phase-in of CES mark-up cost changes from cm_CESMkup_build …
06cfe3d 
…switch starting low in 2025 and reaching switch value only in 2040
implement phase-in of CES mark-up cost changes in industry from cm_CE…
62d6791 
…SMkup_ind switch starting low in 2025 and reaching switch value only in 2040
add constraint to limit the phase-in of biomass in industry depending…
684a38c 
… on the industrial subsector
add maximum biomass shares in steel sector for all regions and set a …
7f38f07 
…specific value of 0.1 maximum in Germany
only start biomass share constraint in industry subsectors from 2020 on
2355606
@0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q
require updated remind2 package
ade28ec
Merge branch 'develop' of github.com:remindmodel/remind into FossilFr…
f6a3cc3 
…ee_rev330_dev
add condition to load statement from input_ref GDX file in se_trade r…
b8cbd8f 
…ealization to only be active if cm_startyear is greater than 2005
add seel and seliqsyn to SE traded quantities set by default
ba63302
deactivate q_limitBiotrmod equation to allow full substitution of coa…
9a0efc4 
…l by biomass in industry
increment CES parameter version in deafult.cfg
0452650
extend marginal adjustment cost calculation in postsolve to include m…
ae42621 
…arginal adjustment cost due to vm_deltaCap change from current to next time step
add switch cm_trade_SE_shareDemand that allows to define SE imports t…
fabafed 
…o be a certain share of the SE demand of the importing region. The implementation checks convergence of trade quantities over iterations.
add seel and seliqsyn to SE traded quantities set by default
ff254ca
fix reporting of pm_IndstCO2Captured in industry subsectors postsolve…
ebb3a95 
… by also substracting non-energy use
@0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q
exclude non-industry, non-fuel FE from calculation of industry CCS costs
4ef7795
@0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q
exclude non-industry FE from calculation of max industry CCS
b061f2a
@0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q
exclude co2cement_process from calculation of captured fuel CO2
5b51c26
@0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q
formatting
90d3680
remove fixing of energy efficiency limits in industry to Npi which wa…
0851c93 
…s used in Ariadne
@LaviniaBaumstark
change version number and date AND adjust CHANGELOG.md
555c365
fix net negative emissions tax for runs with regipol emissions target…
59c8a9b 
…s by applying the correct carbon price parameter
fix bug in cm_regiExoPrice_fromFile switch that loads CO2 price from …
d59c12d 
…previous GDX in regipol module
adapt q37_plasticWaste equation in industry such that there is no tim…
8c1ccb8 
…e lag anymore between plastics production and plastic waste, i.e. plastics are incinerated in the same time step in which they are produced
add ariadne scenario config
b0f304d
Merge branch 'FossilFree_rev330' of github.com:fschreyer/remind into …
247fbd8 
…ariadne_develop
Merge branch 'remind_331' into ariadne_develop
bd993d2
@orichters
fix R complaining about if in output.R
419f769 
```
Error in all(is.na(output)) || output == "NA" :
  'length = 5' in coercion to 'logical(1)'
Calls: prepareAndRun -> run -> sys.source -> eval -> eval
```
add ariadne_lowDem and ariadne_highDem scenarios for exogenuous indus…
2654004 
…try trajectories
increment CES parameter hash to include new ariadne calibrations
eea8a8e
add ariadne low demand scenario to files list in CES parameter module
cdec519
@0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q
fix cm_ind_energy_limit_manual for single regions rather then region
e7c59c4 
groups
@LaviniaBaumstark
Copy link
Member

what ist the status of this PR?

@fschreyer
Copy link
Contributor Author

These changes will be dealt with in other PRs. This one can be closed.

@fschreyer fschreyer closed this Aug 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@fschreyer @LaviniaBaumstark @pweigmann @0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q @Renato-Rodrigues @orichters