Merge branch 'master' of https://git.ecdf.ed.ac.uk/lul/plumv2
change Shock system
No related branches found
No related tags found
Showing
- data/SSP1_tau.csv 9 additions, 0 deletionsdata/SSP1_tau.csv
- data/SSP2_tau.csv 9 additions, 0 deletionsdata/SSP2_tau.csv
- data/SSP3_tau.csv 9 additions, 0 deletionsdata/SSP3_tau.csv
- data/SSP4_tau.csv 9 additions, 0 deletionsdata/SSP4_tau.csv
- data/SSP5_tau.csv 9 additions, 0 deletionsdata/SSP5_tau.csv
- data/country_groups.csv 4 additions, 4 deletionsdata/country_groups.csv
- data/halfdeg/global_biodiversity_priorities30perc.asc 366 additions, 0 deletionsdata/halfdeg/global_biodiversity_priorities30perc.asc
- data/sims/ssp_params.csv 20 additions, 0 deletionsdata/sims/ssp_params.csv
- data/ssp.csv 32871 additions, 32871 deletionsdata/ssp.csv
- data/ssp_covid.csv 48321 additions, 32214 deletionsdata/ssp_covid.csv
- scripts/createScenarios.sh 10 additions, 1 deletionscripts/createScenarios.sh
- scripts/createShockFiles.R 116 additions, 128 deletionsscripts/createShockFiles.R
- src/ac/ed/lurg/ModelConfig.java 44 additions, 64 deletionssrc/ac/ed/lurg/ModelConfig.java
- src/ac/ed/lurg/ModelMain.java 2 additions, 4 deletionssrc/ac/ed/lurg/ModelMain.java
- src/ac/ed/lurg/country/GlobalPrice.java 8 additions, 8 deletionssrc/ac/ed/lurg/country/GlobalPrice.java
- src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java 4 additions, 6 deletionssrc/ac/ed/lurg/country/gams/GamsLocationOptimiser.java
- src/ac/ed/lurg/demand/AbstractDemandManager.java 0 additions, 43 deletionssrc/ac/ed/lurg/demand/AbstractDemandManager.java
- src/ac/ed/lurg/demand/AbstractSSPDemandManager.java 10 additions, 18 deletionssrc/ac/ed/lurg/demand/AbstractSSPDemandManager.java
- src/ac/ed/lurg/demand/DemandManagerFromFile.java 3 additions, 6 deletionssrc/ac/ed/lurg/demand/DemandManagerFromFile.java
- src/ac/ed/lurg/shock/parameterShocksReader.java 106 additions, 0 deletionssrc/ac/ed/lurg/shock/parameterShocksReader.java
Loading
Please register or sign in to comment