Index: examples/wflow_brantas_sbm_lintul/bmi2runner.py
===================================================================
diff -u
--- examples/wflow_brantas_sbm_lintul/bmi2runner.py (revision 0)
+++ examples/wflow_brantas_sbm_lintul/bmi2runner.py (revision 35916f7575fbb5e21f80b040a30e8dce13cc6120)
@@ -0,0 +1,75 @@
+"""
+
+bmi2runner - runs multiple linked bmi models
+
+Usage:
+
+ bmi2runner -c configfile -l loglevel
+
+ -l: loglevel (most be one of DEBUG, WARNING, ERROR)
+
+Example ini file:
+
+::
+
+ [models]
+ wflow_sbm=wflow_sbm/wflow_sbm_comb.ini
+ wflow_routing=wflow_routing/wflow_routing_comb.ini
+
+ [exchanges]
+ # From_model/var -> To_model/var
+ wflow_sbm@InwaterMM=wflow_routing@IW
+
+"""
+
+import wflow.wflow_bmi_combined as wfbmi
+import wflow.pcrut as pcrut
+import os
+
+
+
+"""
+Perform command line execution of the model.
+"""
+
+configfile = "bmi2runner.ini"
+
+loglevel = 'INFO'
+combilogger = pcrut.setlogger('bmi2runner.log','bmi2runner_logging',thelevel=loglevel)
+
+# Construct object and initilize the models
+combilogger.info('Starting combined bmi object')
+bmiobj = wfbmi.wflowbmi_csdms()
+
+bmiobj.initialize_config(configfile,loglevel=loglevel)
+bmiobj.initialize_model()
+
+#Get and set start and end times
+start = bmiobj.get_start_time()
+end = bmiobj.get_end_time()
+bmiobj.set_start_time(start)
+bmiobj.set_end_time(end)
+
+#Update models (if necessary) to start time
+bmiobj.update_to_start_time(start)
+
+#Number of steps to run models
+ts = bmiobj.get_time_step()
+steps = int((end - start)/ts + 1)
+
+cts = bmiobj.currenttimestep
+# Loop over the time duration
+while cts < 30:#steps:
+
+ bmiobj.update()
+ cts = bmiobj.currenttimestep
+
+bmiobj.bmimodels['wflow_sbm'].finalize()
+bmiobj.bmimodels['wflow_lintul'].finalize()
+combilogger.info('Finishing run')
+
+
+
+
+
+
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST.xml
===================================================================
diff -u
--- examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST.xml (revision 0)
+++ examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST.xml (revision 35916f7575fbb5e21f80b040a30e8dce13cc6120)
@@ -0,0 +1,15 @@
+
+
+ WGS 1984
+ 0.0
+
+ wflow_brantas
+ TP
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.001
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.002
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.003
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.004
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.005
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.006
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.007
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.008
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.009
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.010
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.011
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.012
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.013
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.014
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.015
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.016
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.017
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.018
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.019
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.020
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.021
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.022
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.023
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.024
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.025
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.026
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.027
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.028
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.029
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/CRPST000.030
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P.xml
===================================================================
diff -u
--- examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P.xml (revision 0)
+++ examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P.xml (revision 35916f7575fbb5e21f80b040a30e8dce13cc6120)
@@ -0,0 +1,15 @@
+
+
+ WGS 1984
+ 0.0
+
+ wflow_brantas
+ TP
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.001
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.002
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.003
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.004
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.005
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.006
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.007
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.008
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.009
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.010
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.011
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.012
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.013
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.014
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.015
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.016
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.017
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.018
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.019
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.020
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.021
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.022
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.023
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.024
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.025
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.026
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.027
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.028
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.029
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/P0000000.030
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET.xml
===================================================================
diff -u
--- examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET.xml (revision 0)
+++ examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET.xml (revision 35916f7575fbb5e21f80b040a30e8dce13cc6120)
@@ -0,0 +1,15 @@
+
+
+ WGS 1984
+ 0.0
+
+ wflow_brantas
+ ET.pot
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.001
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.002
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.003
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.004
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.005
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.006
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.007
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.008
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.009
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.010
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.011
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.012
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.013
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.014
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.015
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.016
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.017
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.018
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.019
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.020
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.021
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.022
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.023
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.024
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.025
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.026
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.027
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.028
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.029
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/PET00000.030
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/LCtoBranchTrunkStorage.tbl
===================================================================
diff -u
--- examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/LCtoBranchTrunkStorage.tbl (revision 0)
+++ examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/LCtoBranchTrunkStorage.tbl (revision 35916f7575fbb5e21f80b040a30e8dce13cc6120)
@@ -0,0 +1,9 @@
+1 0.01
+2 0.04
+3 0.0
+4 0.2
+5 0.0
+6 0.0
+7 0.01
+8 0.5
+9 0.0
\ No newline at end of file
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/LCtoExtinctionCoefficient.tbl
===================================================================
diff -u
--- examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/LCtoExtinctionCoefficient.tbl (revision 0)
+++ examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/LCtoExtinctionCoefficient.tbl (revision 35916f7575fbb5e21f80b040a30e8dce13cc6120)
@@ -0,0 +1,9 @@
+1 0.6
+2 0.6
+3 0.6
+4 0.6
+5 0.6
+6 0.6
+7 0.6
+8 0.8
+9 0.7
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/LCtoSpecificLeafStorage.tbl
===================================================================
diff -u
--- examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/LCtoSpecificLeafStorage.tbl (revision 0)
+++ examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/LCtoSpecificLeafStorage.tbl (revision 35916f7575fbb5e21f80b040a30e8dce13cc6120)
@@ -0,0 +1,9 @@
+1 0.04
+2 0.04
+3 0.1272
+4 0.07
+5 0.1272
+6 0.1272
+7 0.1272
+8 0.036
+9 0
\ No newline at end of file
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/globcover/LCtoBranchTrunkStorage.tbl
===================================================================
diff -u
--- examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/globcover/LCtoBranchTrunkStorage.tbl (revision 0)
+++ examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/globcover/LCtoBranchTrunkStorage.tbl (revision 35916f7575fbb5e21f80b040a30e8dce13cc6120)
@@ -0,0 +1,17 @@
+0 0
+1 0.5
+2 0.5
+3 0.5
+4 0.5
+5 0.5
+6 0.2
+7 0.1
+8 0.2
+9 0.01
+10 0.0
+11 0.01
+12 0.0
+13 0.01
+14 0.01
+15 0.0
+16 0.04
\ No newline at end of file
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/globcover/LCtoExtinctionCoefficient.tbl
===================================================================
diff -u
--- examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/globcover/LCtoExtinctionCoefficient.tbl (revision 0)
+++ examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/globcover/LCtoExtinctionCoefficient.tbl (revision 35916f7575fbb5e21f80b040a30e8dce13cc6120)
@@ -0,0 +1,17 @@
+0 0.7
+1 0.8
+2 0.8
+3 0.8
+4 0.8
+5 0.8
+6 0.6
+7 0.6
+8 0.6
+9 0.6
+10 0.6
+11 0.6
+12 0.6
+13 0.6
+14 0.6
+15 0.6
+16 0.6
\ No newline at end of file
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/globcover/LCtoSpecificLeafStorage.tbl
===================================================================
diff -u
--- examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/globcover/LCtoSpecificLeafStorage.tbl (revision 0)
+++ examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/globcover/LCtoSpecificLeafStorage.tbl (revision 35916f7575fbb5e21f80b040a30e8dce13cc6120)
@@ -0,0 +1,17 @@
+0 0
+1 0.045
+2 0.036
+3 0.045
+4 0.036
+5 0.03926
+6 0.07
+7 0.07
+8 0.07
+9 0.09
+10 0.1272
+11 0.1272
+12 0.1272
+13 0.04
+14 0.1272
+15 0.0
+16 0.04
\ No newline at end of file
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/lulegend.txt
===================================================================
diff -u
--- examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/lulegend.txt (revision 0)
+++ examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/lulegend.txt (revision 35916f7575fbb5e21f80b040a30e8dce13cc6120)
@@ -0,0 +1,17 @@
+0 Water
+1 Evergreen Needle leaf Forest
+2 Evergreen Broadleaf Forest
+3 Deciduous Needle leaf Forest
+4 Deciduous Broadleaf Forest
+5 Mixed Forests
+6 Closed Shrublands
+7 Open Shrublands
+8 Woody Savannas
+9 Savannas
+10 Grasslands
+11 Permanent Wetland
+12 Croplands
+13 Urban and Built-Up
+14 Cropland/Natural Vegetation Mosaic
+15 Snow and Ice
+16 Barren or Sparsely Vegetated
\ No newline at end of file
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/mapping wflow_lu to globcover lu v0.txt
===================================================================
diff -u
--- examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/mapping wflow_lu to globcover lu v0.txt (revision 0)
+++ examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/mapping wflow_lu to globcover lu v0.txt (revision 35916f7575fbb5e21f80b040a30e8dce13cc6120)
@@ -0,0 +1,7 @@
+mapping wflow_java lu to globcover lu
+1 0
+2 12
+3 7
+4 13
+5 13
+6 1
\ No newline at end of file
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/mapping wflow_lu to globcover lu v1.txt
===================================================================
diff -u
--- examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/mapping wflow_lu to globcover lu v1.txt (revision 0)
+++ examples/wflow_brantas_sbm_lintul/wflow/wflow_brantas/inmaps/clim/mapping wflow_lu to globcover lu v1.txt (revision 35916f7575fbb5e21f80b040a30e8dce13cc6120)
@@ -0,0 +1,10 @@
+mapping wflow_java lu to globcover lu
+1 0
+2 12
+3 7
+4 13
+5 13
+6 1
+7
+8
+9
\ No newline at end of file
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST.xml
===================================================================
diff -u
--- examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST.xml (revision 0)
+++ examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST.xml (revision 35916f7575fbb5e21f80b040a30e8dce13cc6120)
@@ -0,0 +1,15 @@
+
+
+ WGS 1984
+ 0.0
+
+ wflow_brantas
+ TP
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.001
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.002
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.003
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.004
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.005
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.006
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.007
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.008
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.009
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.010
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.011
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.012
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.013
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.014
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.015
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.016
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.017
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.018
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.019
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.020
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.021
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.022
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.023
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.024
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.025
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.026
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.027
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.028
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.029
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/CRPST000.030
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD.xml
===================================================================
diff -u
--- examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD.xml (revision 0)
+++ examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD.xml (revision 35916f7575fbb5e21f80b040a30e8dce13cc6120)
@@ -0,0 +1,15 @@
+
+
+ WGS 1984
+ 0.0
+
+ wflow_brantas
+ SWR
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.001
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.002
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.003
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.004
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.005
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.006
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.007
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.008
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.009
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.010
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.011
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.012
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.013
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.014
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.015
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.016
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.017
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.018
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.019
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.020
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.021
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.022
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.023
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.024
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.025
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.026
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.027
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.028
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.029
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/IRRAD000.030
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T.xml
===================================================================
diff -u
--- examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T.xml (revision 0)
+++ examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T.xml (revision 35916f7575fbb5e21f80b040a30e8dce13cc6120)
@@ -0,0 +1,15 @@
+
+
+ WGS 1984
+ 0.0
+
+ wflow_brantas
+ 2T
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.001
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.002
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.003
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.004
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.005
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.006
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.007
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.008
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.009
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.010
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.011
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.012
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.013
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.014
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.015
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.016
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.017
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.018
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.019
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.020
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.021
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.022
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.023
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.024
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.025
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.026
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.027
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.028
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.029
===================================================================
diff -u
Binary files differ
Index: examples/wflow_brantas_sbm_lintul/wflow/wflow_lintul/inmaps/T0000000.030
===================================================================
diff -u
Binary files differ
Index: wflow/wflow_lintul.py
===================================================================
diff -u -r4db87baaaf73b1fdadb56416ef5b67f8f6a534d3 -r35916f7575fbb5e21f80b040a30e8dce13cc6120
--- wflow/wflow_lintul.py (.../wflow_lintul.py) (revision 4db87baaaf73b1fdadb56416ef5b67f8f6a534d3)
+++ wflow/wflow_lintul.py (.../wflow_lintul.py) (revision 35916f7575fbb5e21f80b040a30e8dce13cc6120)
@@ -5,6 +5,7 @@
import math
import pcraster.framework
+import pcraster as pcr
from wflow.wf_DynamicFramework import *
from wflow.wflow_adapt import *
@@ -138,7 +139,7 @@
temptablefile.close()
def lookup_linear(self, x):
- y = lookuplinear(self.filename, x)
+ y = pcr.lookuplinear(self.filename, x)
return y
@@ -891,8 +892,8 @@
# Growth of leaves in terms of mass (GLV) and in terms of LAI (GLAI).
GLV = FLV * GTOTAL
- Adt_or_Harv = pcror(Adult, CropHarvNow)
- Juv_or_Harv = pcror(Juvenile, CropHarvNow)
+ Adt_or_Harv = pcr.pcror(Adult, CropHarvNow)
+ Juv_or_Harv = pcr.pcror(Juvenile, CropHarvNow)
NoLeavesYet = self.LAI == 0.0
LetsGo = pcr.pcrand(Enough_water, CropStartNow)
LetsGro = pcr.pcrand(NoLeavesYet, LetsGo)