Commits · e07d213e8c0fe2f4c004899f2c3d2cabff89ef69 · Jerome Hilaire / remind

Dec 16, 2019
- add documentation for the modules 33_CDR and 39_CCU (done by Jessi) · e07d213e
  Lavinia Baumstark authored 5 years ago
  
  e07d213e
- add documentation for the module 41_emicapregi (done by Marian) · 4992f2fb
  Lavinia Baumstark authored 5 years ago
  
  4992f2fb
Dec 13, 2019
- add .travis.yml file · 3706ae40
  Lavinia Baumstark authored 5 years ago
  
  3706ae40
- Merge pull request #17 from LaviniaBaumstark/develop · da7d98fa
  Anastasis Giannousakis authored 5 years ago
  
  remove .travis.yml file
  Unverified
  
  da7d98fa
- remove .travis.yml file · c39d5bc7
  Lavinia Baumstark authored 5 years ago
  
  c39d5bc7
Dec 12, 2019
- Merge pull request #15 from johanneskoch94/develop · 0b4b8e0a
  Lavinia Baumstark authored 5 years ago
  
  Fix typo that throws an error when running compareScenarios locally
  Unverified
  
  0b4b8e0a
- Delete .travis.yml · d4bb48b1
  Lavinia Baumstark authored 5 years ago
  
  Unverified
  
  d4bb48b1
- Create .travis.yml · 1fe99107
  Lavinia Baumstark authored 5 years ago
  
  Unverified
  
  1fe99107
- Fix typo that throws an error when running compareScenarios locally · 79148bb2
  Johannes Koch authored 5 years ago
  
  79148bb2
- Merge pull request #14 from LaviniaBaumstark/develop · 43f2f618
  David Klein authored 5 years ago
  
  added missing not_used.txt files
  Unverified
  
  43f2f618
- Merge pull request #13 from dklein-pik/develop · 7a433cdd
  Lavinia Baumstark authored 5 years ago
  
  *gdx effect* Add scenarios for phase out of trad. biomass for SDP, SS…
  Unverified
  
  7a433cdd
- added missing not_used.txt files · e22fac2c
  Lavinia Baumstark authored 5 years ago
  
  e22fac2c
Dec 11, 2019
- Merge pull request #11 from giannou/develop · 7ba310b0
  Lavinia Baumstark authored 5 years ago
  
  documentation of modules 80_optimization and 81_codePerformance
  Unverified
  
  7ba310b0
- *gdx effect* Add scenarios for phase out of trad. biomass for SDP, SSP1, SSP5 · ef21ece6
  David Klein authored 5 years ago
  
  ef21ece6
- Merge pull request #12 from dklein-pik/develop · 7cbcd83f
  David Klein authored 5 years ago
  
  Minor changes (docu)
  Unverified
  
  7cbcd83f
- Merge pull request #1 from remindmodel/develop · eb1409d9
  David Klein authored 5 years ago
  
  Merge remindmodel/remind develop into my repo
  Unverified
  
  eb1409d9
- documentation of modules 80_optimization and 81_codePerformance · bc496b50
  giannou authored 5 years ago
  
  bc496b50
- Merge pull request #10 from LaviniaBaumstark/develop · 36a392e1
  Anastasis Giannousakis authored 5 years ago
  
  *refactoring* adjusted not_used.txt files and renamed parameters to f…
  Unverified
  
  36a392e1
- *refactoring* adjusted not_used.txt files and renamed parameters to follow the coding etiquette · 52264573
  Lavinia Baumstark authored 5 years ago
  
  52264573
- *gdx neutral* Documentation · dc6cc3b1
  David Klein authored 5 years ago
  
  dc6cc3b1
- *gdx neutral* Documentation · 91cc538e
  David Klein authored 5 years ago
  
  91cc538e
- Merge pull request #9 from LaviniaBaumstark/develop · 42815008
  David Klein authored 5 years ago
  
  *bugfix* adjust gdpPcScen according to gdpScen
  Unverified
  
  42815008
- Merge branch 'develop' of https://github.com/remindmodel/remind into develop · 24c9da07
  Lavinia Baumstark authored 5 years ago
  
  24c9da07
- Merge pull request #8 from giannou/develop · 49fe690a
  Lavinia Baumstark authored 5 years ago
  
  restoring older state of some magicc files and of the c_GDPpcScen commit to allow the model to run
  Unverified
  
  49fe690a
- *bugfix* choose the right GDPpcScen according to the gdpScen · 8fb4bb63
  Lavinia Baumstark authored 5 years ago
  
  8fb4bb63
Dec 10, 2019
- Merge pull request #6 from christophbertram/develop · 687f4975
  Lavinia Baumstark authored 5 years ago
  
  Correct the description of incolearn in generisdata_tech.prn, _SSP1, _SSP5 files
  Unverified
  
  687f4975
- Merge branch 'develop' of https://github.com/giannou/remind into develop · 38c1c189
  Anastasis Giannousakis authored 5 years ago
  
  38c1c189
- restoring some magicc files to allow the model to run · 4083b0cd
  Anastasis Giannousakis authored 5 years ago
  
  4083b0cd
- Revert "*bugfix* fixed p_GDPpcScen definition and added SDP as scenario.... · f5f93a7a
  Anastasis Giannousakis authored 5 years ago
  
  Revert "*bugfix* fixed p_GDPpcScen definition and added SDP as scenario. Corrects p_developmentState and the phase-in of MAgPIE CO2 price" This reverts commit 844132d2.
  f5f93a7a
- Update generisdata_tech_SSP1.prn · 1a8b3dc5
  Christoph Bertram authored 5 years ago
  
  Unverified
  
  1a8b3dc5
- Update generisdata_tech_SSP5.prn · 867e557c
  Christoph Bertram authored 5 years ago
  
  Unverified
  
  867e557c
- Update generisdata_tech_SSP5.prn · c91ca959
  Christoph Bertram authored 5 years ago
  
  Correct description of incolearn
  Unverified
  
  c91ca959
- Update generisdata_tech_SSP1.prn · c580c53d
  Christoph Bertram authored 5 years ago
  
  Correct description of incolearn
  Unverified
  
  c580c53d
- Update generisdata_tech.prn · 39bd77d3
  Christoph Bertram authored 5 years ago
  
  Correct description of incolearn
  Unverified
  
  39bd77d3
- Merge pull request #5 from bs538/developmentState_fix · a9872cc8
  Lavinia Baumstark authored 5 years ago
  
  *bugfix* fixed p_GDPpcScen definition and added SDP as scenario.
  Unverified
  
  a9872cc8
- Merge pull request #4 from giannou/develop · 14d81511
  Lavinia Baumstark authored 5 years ago
  
  removed core/magicc from "files to be copied to output folder" as it …
  Unverified
  
  14d81511
- *bugfix* fixed p_GDPpcScen definition and added SDP as scenario. Corrects... · 844132d2
  Bjoern Soergel authored 5 years ago
  
  *bugfix* fixed p_GDPpcScen definition and added SDP as scenario. Corrects p_developmentState and the phase-in of MAgPIE CO2 price
  844132d2
- Merge pull request #3 from LaviniaBaumstark/develop · b242ace1
  David Klein authored 5 years ago
  
  added missing files
  Unverified
  
  b242ace1
- removed core/magicc from "files to be copied to output folder" as it does not exist · 28a745dc
  Anastasis Giannousakis authored 5 years ago
  
  28a745dc
Dec 09, 2019
- Merge branch 'develop' of https://github.com/remindmodel/remind into develop · d5ad3f75
  Lavinia Baumstark authored 5 years ago
  
  d5ad3f75