Commits · 8f04aa4f27bad2dcba39b357aca517e6d8161735 · Jerome Hilaire / remind

Jan 06, 2020
- Merge branch 'develop' into develop · 8f04aa4f
  David Klein authored 5 years ago
  
  Unverified
  
  8f04aa4f
- Merge pull request #24 from dklein-pik/develop · 561db87b
  Lavinia Baumstark authored 5 years ago
  
  Completed documentation for 30_biomass/magpie_40 and 26_agcost/cost
  Unverified
  
  561db87b
- Merge pull request #25 from giannou/develop · fd06a231
  Lavinia Baumstark authored 5 years ago
  
  restore defaults, remove magicc binary from ds2unix system call
  Unverified
  
  fd06a231
Dec 22, 2019
- restore defaults, remove magicc binary from ds2unix system call · 87234e21
  giannou authored 5 years ago
  
  87234e21
Dec 20, 2019
- Document agricultural costs (26_agCosts). · 06755928
  David Klein authored 5 years ago
  
  06755928
- documentation in main.gms extended · 9949709d
  Lavinia Baumstark authored 5 years ago
  
  9949709d
- Document and refactor magpie_40 and related files. · 7c8d2b1c
  David Klein authored 5 years ago
  
  7c8d2b1c
- Merge branch 'develop' of https://github.com/remindmodel/remind into develop · c788403c
  David Klein authored 5 years ago
  
  c788403c
- Document biomass module. · 0935e7ee
  David Klein authored 5 years ago
  
  0935e7ee
Dec 19, 2019

*refactoring* Deleted q30_pebiolc_price_base and vm_pebiolc_price_shifted... · 8225de7f

David Klein authored 5 years ago

*refactoring* Deleted q30_pebiolc_price_base and vm_pebiolc_price_shifted since it was a remainder of old implementations and had no function anymore.

8225de7f

Dec 18, 2019
- Merge pull request #22 from LaviniaBaumstark/develop · e1561d0d
  Johannes Koch authored 5 years ago
  
  Update scenario_config_SSPSDP.csv, move old scenario_config_* files t…
  Unverified
  
  e1561d0d
- update scenario_config_SSPSDP.csv, move old scenario_config_* files to old_scenario_config-folder · 9716dd7e
  Lavinia Baumstark authored 5 years ago
  
  9716dd7e
- Merge pull request #21 from johanneskoch94/fixes_for_codeCheck · 7318fe66
  Lavinia Baumstark authored 5 years ago
  
  Fix naming inconsistencies revealed by codeCheck
  Unverified
  
  7318fe66
- Fix naming inconsistencies revealed by codeCheck · 4f52e766
  Johannes Koch authored 5 years ago
  
  These are mainly naming inconsitencies in the welfare module.
  4f52e766
- Merge branch 'develop' of https://github.com/dklein-pik/remind into develop · 97ab0244
  David Klein authored 5 years ago
  
  97ab0244
Dec 17, 2019
- Merge branch 'develop' of https://github.com/remindmodel/remind into develop · a042f91d
  David Klein authored 5 years ago
  
  a042f91d
- Merge pull request #16 from johanneskoch94/welfare_module · 8dcca049
  Anastasis Giannousakis authored 5 years ago
  
  Welfare module
  Unverified
  
  8dcca049
Dec 16, 2019
- Merge pull request #18 from fschreyer/feature_RegionSens · 1066845a
  Lavinia Baumstark authored 5 years ago
  
  Feature regional sensitvities
  Unverified
  
  1066845a
- Merge pull request #20 from giannou/develop · 09728c47
  Lavinia Baumstark authored 5 years ago
  
  Update README.md
  Unverified
  
  09728c47
- Merge branch 'develop' of https://github.com/remindmodel/remind into develop · 8982f540
  David Klein authored 5 years ago
  
  8982f540
- Update README.md · d048acd2
  Anastasis Giannousakis authored 5 years ago
  
  Unverified
  
  d048acd2
- add documentation for the module 15_climate (done by Jessi) · cf6c4070
  Lavinia Baumstark authored 5 years ago and Felix Schreyer committed 5 years ago
  
  cf6c4070
- add documentation for the modules 33_CDR and 39_CCU (done by Jessi) · 0412df17
  Lavinia Baumstark authored 5 years ago and Felix Schreyer committed 5 years ago
  
  0412df17
- add documentation for the module 41_emicapregi (done by Marian) · 1b9bb860
  Lavinia Baumstark authored 5 years ago and Felix Schreyer committed 5 years ago
  
  1b9bb860
- add regional switches to main.gms · 1220b2a8
  Felix Schreyer authored 5 years ago
  
  1220b2a8
- Merge pull request #19 from LaviniaBaumstark/develop · 1b0f1bce
  David Klein authored 5 years ago
  
  add documentation
  Unverified
  
  1b0f1bce
- add documentation for the module 15_climate (done by Jessi) · 6adabc3c
  Lavinia Baumstark authored 5 years ago
  
  6adabc3c
- 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
- Merge branch 'develop' of https://github.com/remindmodel/remind into develop · 1685044e
  Felix Schreyer authored 5 years ago
  
  1685044e
- add nucscen 7, forces regional nuclear power phase out by 2040 · 85d88560
  Felix Schreyer authored 5 years ago
  
  85d88560
- 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
- Add a new module: 'welfare' · 4b4f2e62
  Johannes Koch authored 5 years ago
  
  This is part of a larger refactoring effort of the remind core. Here, code related to the social welfare functions has been moved from the core to the new module. Some renaming was required. For now, only one module realization exists, 'utilitarian', which corresponds one to one to what was in the core before. This refactoring exercises has no effect on the results!
  4b4f2e62
- Fix typo that throws an error when running compareScenarios locally · 79148bb2
  Johannes Koch authored 5 years ago
  
  79148bb2
- add to capturescen switch, can be applied to subgroup of regions now · 92255a49
  Felix Schreyer authored 5 years ago
  
  92255a49