Merge branch 'develop' of github.com:remindmodel/remind into pullreq1 (512e3174) · Commits · Jerome Hilaire / remind · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

R

remind
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

512e3174

Commit 512e3174 authored 4 years ago by Alois Dirnaichner

Downloads
- Plain Diff

Merge branch 'develop' of github.com:remindmodel/remind into pullreq1

parents 7e71bca3 b4a8f28c

No related branches found

No related tags found

1 merge request!159Pullreq1

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

config/default.cfg 10 additions, 4 deletions

config/default.cfg
config/scenario_config_SSPSDP.csv 30 additions, 30 deletions

config/scenario_config_SSPSDP.csv
config/scenario_config_coupled_SSPSDP.csv 26 additions, 26 deletions

config/scenario_config_coupled_SSPSDP.csv
core/declarations.gms 5 additions, 3 deletions

core/declarations.gms
core/postsolve.gms 34 additions, 10 deletions

core/postsolve.gms
main.gms 2 additions, 2 deletions

main.gms
modules/45_carbonprice/diffCurvPhaseIn2Lin/datainput.gms 5 additions, 3 deletions

modules/45_carbonprice/diffCurvPhaseIn2Lin/datainput.gms
output.R 0 additions, 2 deletions

output.R
scripts/start/choose_slurmConfig.R 41 additions, 0 deletions

scripts/start/choose_slurmConfig.R
scripts/start/prepare_and_run.R 11 additions, 5 deletions

scripts/start/prepare_and_run.R
start.R 4 additions, 3 deletions

start.R
start_bundle_coupled.R 6 additions, 3 deletions

start_bundle_coupled.R
start_coupled.R 4 additions, 4 deletions

start_coupled.R

with 178 additions and 95 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment