diff --git a/sw_src b/sw_src index 436bfeb6..0a11f713 160000 --- a/sw_src +++ b/sw_src @@ -1 +1 @@ -Subproject commit 436bfeb6f5d03b7dd0e616015a6227988aa7d329 +Subproject commit 0a11f713f9eb3359d10da1e774c54ca5a4046e29 diff --git a/testing.sagebrush.master/Stepwat_Inputs/Input/sxw/Input/estab.in b/testing.sagebrush.master/Stepwat_Inputs/Input/sxw/Input/estab.in index c23c6fc0..c6f7f0d3 100644 --- a/testing.sagebrush.master/Stepwat_Inputs/Input/sxw/Input/estab.in +++ b/testing.sagebrush.master/Stepwat_Inputs/Input/sxw/Input/estab.in @@ -1,13 +1,21 @@ -# list of filenames for which to check establishment -# each filename pertains to a species and contains the +#------ Input file for (optional) plant establishment + + +#--- Activate/deactivate plant establishment calculations + +0 # 1/0 = do/don't calculate and output establishment conditions + + +#--- File names with establishment parameters (only used if activated) +# Each file pertains to a species and contains the # soil moisture and timing parameters required for the # species to establish in a given year. # There is no limit to the number of files in the list. -# to suppress checking establishment, comment all the -# lines below. - -0 # use flag; 1=check establishment, 0=don't check, ignore following -bouteloua.estab -#aristida.estab -#vulpia.estab -#opuntia.estab \ No newline at end of file +# File names with paths relative to the SOILWAT2 directory (`_ProjDir`) + +Input/estab/bouteloua.estab +Input/estab/bromus.estab + +#Input/estab/aristida.estab +#Input/estab/vulpia.estab +#Input/estab/opuntia.estab diff --git a/testing.sagebrush.master/Stepwat_Inputs/Input/sxw/Input/bouteloua.estab b/testing.sagebrush.master/Stepwat_Inputs/Input/sxw/Input/estab/bouteloua.estab similarity index 91% rename from testing.sagebrush.master/Stepwat_Inputs/Input/sxw/Input/bouteloua.estab rename to testing.sagebrush.master/Stepwat_Inputs/Input/sxw/Input/estab/bouteloua.estab index d9365b09..7b07dae3 100644 --- a/testing.sagebrush.master/Stepwat_Inputs/Input/sxw/Input/bouteloua.estab +++ b/testing.sagebrush.master/Stepwat_Inputs/Input/sxw/Input/estab/bouteloua.estab @@ -1,4 +1,5 @@ bogr # 4-char name of species +3 # Vegetation type of species (0, trees; 1, shrubs; 2, forbs; 3 grasses) # soil layer parameters 2 # number of layers affecting establishment 10.0 # SWP (bars) requirement for germination (top layer) diff --git a/testing.sagebrush.master/Stepwat_Inputs/Input/sxw/Input/bromus.estab b/testing.sagebrush.master/Stepwat_Inputs/Input/sxw/Input/estab/bromus.estab similarity index 91% rename from testing.sagebrush.master/Stepwat_Inputs/Input/sxw/Input/bromus.estab rename to testing.sagebrush.master/Stepwat_Inputs/Input/sxw/Input/estab/bromus.estab index 7f44463d..eddb3e28 100644 --- a/testing.sagebrush.master/Stepwat_Inputs/Input/sxw/Input/bromus.estab +++ b/testing.sagebrush.master/Stepwat_Inputs/Input/sxw/Input/estab/bromus.estab @@ -1,4 +1,5 @@ brte # 4-char name of species +3 # Vegetation type of species (0, trees; 1, shrubs; 2, forbs; 3 grasses) # soil layer parameters 3 # number of layers affecting establishment 10.0 # SWP (bars) requirement for germination (top layer)