Updates for SOILWAT2 (v6.7.0): fix its "vegetation establishment"

- SOILWAT2's "vegetation establishment" module works again (also as part of STEPWAT2); see DrylandEcology/SOILWAT2#336 - note: these are calculations are made on simulated SOILWAT2's conditions and do not inform simulations (no feedback) - input files with species establishment parameters "<species>.estab" now organized in a subfolder within SOILWAT2's inputs - new input parameter "vegetation type" that associates a species with one of SOILWAT2's simulated vegetation types - notes * SOILWAT2's "establishment" is calculated under the following conditions: (i) there are input files with species establishment parameters; (ii) at least one of those files is correctly listed in `"estab.in"` and the input flag in `"estab.in"` is on * these establishment results are included in the output files only if `"ESTABL"` is turned on in `"outsetup.in"` * default values: calculations are turned off and output is turned off
DrylandEcology · Jan 13, 2023 · 3a52553 · 3a52553
1 parent 7dce3c7
commit 3a52553
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/sw_src b/sw_src
diff --git 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
+# 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/...at_Inputs/Input/sxw/Input/bouteloua.estab → ...uts/Input/sxw/Input/estab/bouteloua.estab b/...at_Inputs/Input/sxw/Input/bouteloua.estab → ...uts/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/...epwat_Inputs/Input/sxw/Input/bromus.estab → ...Inputs/Input/sxw/Input/estab/bromus.estab b/...epwat_Inputs/Input/sxw/Input/bromus.estab → ...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)
+16 −0		NEWS.md
+1 −1		SW_Control.c
+2 −0		SW_Control.h
+7 −10		SW_Output.c
+1 −2		SW_Output.h
+182 −60		SW_VegEstab.c
+4 −2		SW_VegEstab.h
+36 −0		test/test_SW_VegEstab.cc
+3 −2		testing/Input/estab.in
+10 −9		testing/Input/estab/bouteloua.estab
+3 −2		testing/Input/estab/bromus.estab