Merge pull request #11 from edwinkost/for_public_release

Working on public release.
UU-Hydro · Aug 17, 2016 · d45ddbb · d45ddbb
2 parents 290b922 + 9f0b1e7
commit d45ddbb
Show file tree

Hide file tree

Showing 71 changed files with 21,036 additions and 4,667 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+# ignore cartesius job ouput
+*.out
+
 # ignore pcraster maps
 *.map
 *.ldd

diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -1,8 +1,16 @@
 PCR-GLOBWB
 ==========
 
+Copyright 2016 Utrecht University
+
 PCR-GLOBWB (PCRaster Global Water Balance) is a large-scale hydrological model intended for global to regional studies and developed at the Department of Physical Geography, Utrecht University (Netherlands).
 
-contact: Edwin Sutanudjaja ([email protected]). 
+PCR-GLOBWB is copyrighted by Utrecht University and released under the GPL license, version 3
+
+This program comes with ABSOLUTELY NO WARRANTY
+
+See the "LICENSE" file for more information.
+
+contact: Edwin Sutanudjaja ([email protected]).
 
 Please also see the file README.txt.
diff --git a/README.txt b/README.txt
@@ -1,4 +1,11 @@
 PCR-GLOBWB git repository.
+
+PCR-GLOBWB is copyrighted by Utrecht University and released under the GPL license, version 3
+
+This program comes with ABSOLUTELY NO WARRANTY
+
+See the "LICENSE" file for more information.
+
 For questions, please contact Edwin Sutanudjaja (e-mail: [email protected]).
 
 Some git reference cards:

diff --git a/...b_with_modflow_4LCs_edwin_parameter_set_natural_extra_spinup_from_1901_begin_part_one.ini b/...b_with_modflow_4LCs_edwin_parameter_set_natural_extra_spinup_from_1901_begin_part_one.ini
diff --git a/...b_with_modflow_4LCs_edwin_parameter_set_natural_extra_spinup_from_1901_begin_part_two.ini b/...b_with_modflow_4LCs_edwin_parameter_set_natural_extra_spinup_from_1901_begin_part_two.ini
diff --git a/...ow/natural/begin/wmod1901_4LCs_edwin_parameter_set_natural_extra_spinup_begin_part_one.sh b/...ow/natural/begin/wmod1901_4LCs_edwin_parameter_set_natural_extra_spinup_begin_part_one.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+#SBATCH -N 1
+#SBATCH -t 119:59:00 
+#SBATCH -p normal
+
+# transient run
+cd /home/edwin/github/edwinkost/PCR-GLOBWB/model
+python parallel_pcrglobwb_with_prefactors_2016_03_29.py ../config/05min_runs_may_2016/4LCs_edwin_parameter_set_with_modflow/no_correction/from_1901_extra_spin_up/natural/begin/setup_05min_CRU-TS3.23_ERA20C_pcrglobwb_with_modflow_4LCs_edwin_parameter_set_natural_extra_spinup_from_1901_begin_part_one.ini
+
+# NOTE: pcrglobwb modflow - 4 LCs - edwin parameter set - no correction - NATURAL - with extra spin-up - part_one - start from 1901
diff --git a/...ow/natural/begin/wmod1901_4LCs_edwin_parameter_set_natural_extra_spinup_begin_part_two.sh b/...ow/natural/begin/wmod1901_4LCs_edwin_parameter_set_natural_extra_spinup_begin_part_two.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+#SBATCH -N 1
+#SBATCH -t 119:59:00 
+#SBATCH -p normal
+
+# transient run
+cd /home/edwin/github/edwinkost/PCR-GLOBWB/model
+python parallel_pcrglobwb_with_prefactors_2016_03_29.py ../config/05min_runs_may_2016/4LCs_edwin_parameter_set_with_modflow/no_correction/from_1901_extra_spin_up/natural/begin/setup_05min_CRU-TS3.23_ERA20C_pcrglobwb_with_modflow_4LCs_edwin_parameter_set_natural_extra_spinup_from_1901_begin_part_two.ini
+
+# NOTE: pcrglobwb modflow - 4 LCs - edwin parameter set - no correction - NATURAL - with extra spin-up - part_two - start from 1901
diff --git a/...w_4LCs_edwin_parameter_set_natural_extra_spinup_from_1901_continue_from_1946_part_one.ini b/...w_4LCs_edwin_parameter_set_natural_extra_spinup_from_1901_continue_from_1946_part_one.ini
diff --git a/...w_4LCs_edwin_parameter_set_natural_extra_spinup_from_1901_continue_from_1946_part_two.ini b/...w_4LCs_edwin_parameter_set_natural_extra_spinup_from_1901_continue_from_1946_part_two.ini
diff --git a/...946/wmod1901_4LCs_edwin_parameter_set_natural_extra_spinup_continue_from_1946_part_one.sh b/...946/wmod1901_4LCs_edwin_parameter_set_natural_extra_spinup_continue_from_1946_part_one.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+#SBATCH -N 1
+#SBATCH -t 119:59:00 
+#SBATCH -p normal
+
+# transient run
+cd /home/edwin/github/edwinkost/PCR-GLOBWB/model
+python parallel_pcrglobwb_with_prefactors_2016_03_29.py ../config/05min_runs_may_2016/4LCs_edwin_parameter_set_with_modflow/no_correction/from_1901_extra_spin_up/natural/continue_from_1946/setup_05min_CRU-TS3.23_ERA20C_pcrglobwb_with_modflow_4LCs_edwin_parameter_set_natural_extra_spinup_from_1901_continue_from_1946_part_one.ini
+
+# NOTE: pcrglobwb modflow - 4 LCs - edwin parameter set - no correction - NATURAL - with extra spin-up - part_one - start from 1901
+#                                                                                                                 - continue from 1946
diff --git a/...946/wmod1901_4LCs_edwin_parameter_set_natural_extra_spinup_continue_from_1946_part_two.sh b/...946/wmod1901_4LCs_edwin_parameter_set_natural_extra_spinup_continue_from_1946_part_two.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+#SBATCH -N 1
+#SBATCH -t 119:59:00 
+#SBATCH -p normal
+
+# transient run
+cd /home/edwin/github/edwinkost/PCR-GLOBWB/model
+python parallel_pcrglobwb_with_prefactors_2016_03_29.py ../config/05min_runs_may_2016/4LCs_edwin_parameter_set_with_modflow/no_correction/from_1901_extra_spin_up/natural/continue_from_1946/setup_05min_CRU-TS3.23_ERA20C_pcrglobwb_with_modflow_4LCs_edwin_parameter_set_natural_extra_spinup_from_1901_continue_from_1946_part_two.ini
+
+# NOTE: pcrglobwb modflow - 4 LCs - edwin parameter set - no correction - NATURAL - with extra spin-up - part_two - start from 1901
+#                                                                                                                 - continue from 1946
diff --git a/...w_4LCs_edwin_parameter_set_natural_extra_spinup_from_1901_continue_from_1958_part_one.ini b/...w_4LCs_edwin_parameter_set_natural_extra_spinup_from_1901_continue_from_1958_part_one.ini
diff --git a/...w_4LCs_edwin_parameter_set_natural_extra_spinup_from_1901_continue_from_1958_part_two.ini b/...w_4LCs_edwin_parameter_set_natural_extra_spinup_from_1901_continue_from_1958_part_two.ini
diff --git a/...958/wmod1901_4LCs_edwin_parameter_set_natural_extra_spinup_continue_from_1958_part_one.sh b/...958/wmod1901_4LCs_edwin_parameter_set_natural_extra_spinup_continue_from_1958_part_one.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+#SBATCH -N 1
+#SBATCH -t 119:59:00 
+#SBATCH -p normal
+
+# transient run
+cd /home/edwin/github/edwinkost/PCR-GLOBWB/model
+python parallel_pcrglobwb_with_prefactors_2016_03_29.py ../config/05min_runs_may_2016/4LCs_edwin_parameter_set_with_modflow/no_correction/from_1901_extra_spin_up/natural/continue_from_1958/setup_05min_CRU-TS3.23_ERA20C_pcrglobwb_with_modflow_4LCs_edwin_parameter_set_natural_extra_spinup_from_1901_continue_from_1958_part_one.ini
+
+# NOTE: pcrglobwb modflow - 4 LCs - edwin parameter set - no correction - NATURAL - with extra spin-up - part_one - start from 1901
+#                                                                                                                 - continue from 1946
+#                                                                                                                 - continue from 1958
diff --git a/...958/wmod1901_4LCs_edwin_parameter_set_natural_extra_spinup_continue_from_1958_part_two.sh b/...958/wmod1901_4LCs_edwin_parameter_set_natural_extra_spinup_continue_from_1958_part_two.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+#SBATCH -N 1
+#SBATCH -t 119:59:00 
+#SBATCH -p normal
+
+# transient run
+cd /home/edwin/github/edwinkost/PCR-GLOBWB/model
+python parallel_pcrglobwb_with_prefactors_2016_03_29.py ../config/05min_runs_may_2016/4LCs_edwin_parameter_set_with_modflow/no_correction/from_1901_extra_spin_up/natural/continue_from_1958/setup_05min_CRU-TS3.23_ERA20C_pcrglobwb_with_modflow_4LCs_edwin_parameter_set_natural_extra_spinup_from_1901_continue_from_1958_part_two.ini
+
+# NOTE: pcrglobwb modflow - 4 LCs - edwin parameter set - no correction - NATURAL - with extra spin-up - part_two - start from 1901
+#                                                                                                                 - continue from 1946
+#                                                                                                                 - continue from 1958