Merge branch 'develop' of https://github.com/remindmodel/remind into develop
No related branches found
No related tags found
Showing
- .travis.yml 7 additions, 5 deletions.travis.yml
- config/default.cfg 6 additions, 1 deletionconfig/default.cfg
- config/input.gdx 0 additions, 0 deletionsconfig/input.gdx
- config/scenario_config_EDGE-T_NDC_NPi_pkbudget.csv 9 additions, 9 deletionsconfig/scenario_config_EDGE-T_NDC_NPi_pkbudget.csv
- core/datainput.gms 0 additions, 5 deletionscore/datainput.gms
- core/equations.gms 1 addition, 1 deletioncore/equations.gms
- main.gms 3 additions, 1 deletionmain.gms
- modules/29_CES_parameters/load/input/stat_off-indu_fixed_shares-buil_simple-tran_edge_esm-POP_pop_SSP2-GDP_gdp_SSP2-Kap_debt_limit-demTrsp_conv-Reg_690d3718e1.inc 23771 additions, 23771 deletions...P_gdp_SSP2-Kap_debt_limit-demTrsp_conv-Reg_690d3718e1.inc
- modules/35_transport/edge_esm/datainput.gms 2 additions, 15 deletionsmodules/35_transport/edge_esm/datainput.gms
- modules/35_transport/edge_esm/declarations.gms 2 additions, 1 deletionmodules/35_transport/edge_esm/declarations.gms
- modules/35_transport/edge_esm/input/mapping_CESnodes_EDGE.csv 1 addition, 0 deletions...les/35_transport/edge_esm/input/mapping_CESnodes_EDGE.csv
- modules/35_transport/edge_esm/presolve.gms 5 additions, 4 deletionsmodules/35_transport/edge_esm/presolve.gms
- modules/39_CCU/off/not_used.txt 3 additions, 1 deletionmodules/39_CCU/off/not_used.txt
- modules/39_CCU/on/bounds.gms 22 additions, 7 deletionsmodules/39_CCU/on/bounds.gms
- modules/39_CCU/on/declarations.gms 4 additions, 2 deletionsmodules/39_CCU/on/declarations.gms
- modules/39_CCU/on/equations.gms 10 additions, 0 deletionsmodules/39_CCU/on/equations.gms
- modules/39_CCU/on/not_used.txt 9 additions, 0 deletionsmodules/39_CCU/on/not_used.txt
- scripts/input/exoGAINSAirpollutants.R 4 additions, 4 deletionsscripts/input/exoGAINSAirpollutants.R
- scripts/iterative/EDGE_transport.R 20 additions, 17 deletionsscripts/iterative/EDGE_transport.R
- scripts/output/comparison/EDGEcomparison.R 204 additions, 886 deletionsscripts/output/comparison/EDGEcomparison.R
Loading
Please register or sign in to comment