From 657153f5a7ef4c960864922766163838e41acea0 Mon Sep 17 00:00:00 2001
From: Daniel Schlaepfer <daniel.schlaepfer@alumni.ethz.ch>
Date: Tue, 6 Dec 2022 16:57:32 -0500
Subject: [PATCH] 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: https://github.com/DrylandEcology/SOILWAT2/pull/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)
---
 .gitmodules                                                   | 2 +-
 sw_src                                                        | 2 +-
 .../Stepwat_Inputs/Input/sxw/Input/siteparam.in               | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index e0854f1..6a6c049 100644
--- 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
index 3e01bb6..9789a38 160000
--- a/sw_src
+++ b/sw_src
@@ -1 +1 @@
-Subproject commit 3e01bb6d0c646b93cfadfd6c0fd8410e5cfcf249
+Subproject commit 9789a380849864c535226ffe64a2dd5d07121fb5
diff --git a/testing.sagebrush.master/Stepwat_Inputs/Input/sxw/Input/siteparam.in b/testing.sagebrush.master/Stepwat_Inputs/Input/sxw/Input/siteparam.in
index b1a4b1e..2d1e1b9 100644
--- 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.