Prepare for upcoming SOILWAT2 release v7.0.0

- SOILWAT2 is preparing for major new release with several improvements and new features * milestone: https://github.com/DrylandEcology/SOILWAT2/milestone/13 * PR: DrylandEcology/SOILWAT2#325 - the purpose of this STEPWAT2 branch is to track progress in SOILWAT2 towards that major release and add any necessary changes to the STEPWAT2/SOILWAT2 interface * one of the goals is to limit code changes required in STEPWAT2 and to reproduce previous STEPWAT2 behavior and output (new settings will be set such that they reproduce previous behavior), at least as much as possible (and document deviations) * new input: user specifies whether input soil density represents matric or bulk density (new input in `siteparam.in` with backwards compatible value of 0 = matric)
DrylandEcology · Dec 6, 2022 · 657153f · 657153f
1 parent d641e3b
commit 657153f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "sw_src"]
 	path = sw_src
 	url = https://github.com/DrylandEcology/SOILWAT2.git
-	branch = feature_veg_estimation
+	branch = release/devel_v7.0.0
         ignore = dirty
diff --git a/sw_src b/sw_src
diff --git a/testing.sagebrush.master/Stepwat_Inputs/Input/sxw/Input/siteparam.in b/testing.sagebrush.master/Stepwat_Inputs/Input/sxw/Input/siteparam.in
@@ -73,6 +73,10 @@
 # Scenario
 RCP85
 
+# --- Soil characterization ---
+# Are inputs of density representing bulk soil (type 1) or the matric component (type 0)?
+0
+
 # ---- Transpiration regions ----
 # ndx  : 1=shallow, 2=medium, 3=deep, 4=very deep
 # layer: deepest layer number of the region.