Finalize v6.1.0

- update NEWS - update SOILWAT2 submodule to v8.0.0
DrylandEcology · Jul 15, 2024 · 14b88c4 · 14b88c4
1 parent e477397
commit 14b88c4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "src/SOILWAT2"]
 	path = src/SOILWAT2
 	url = https://github.com/DrylandEcology/SOILWAT2
-	branch = release/devel_v8.0.0
+	branch = master
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: rSOILWAT2
-Version: 6.1.0-9000
+Version: 6.1.0
 Title: An Ecohydrological Ecosystem-Scale Water Balance Simulation Model
 Description: Access to the C-based SOILWAT2 v8.0.0 and functionality for
   SQLite-database of weather data.
@@ -47,7 +47,7 @@ URL: https://github.com/DrylandEcology/rSOILWAT2
 BugReports: https://github.com/DrylandEcology/rSOILWAT2/issues
 Encoding: UTF-8
 Config/testthat/edition: 3
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2
 LazyData: true
 Language: en-US
 VignetteBuilder: knitr
diff --git a/src/SOILWAT2 b/src/SOILWAT2
+37 −24		NEWS.md
+9 −0		doc/additional_pages/code_contribution_guidelines.md
+0 −2		include/SW_datastructs.h
+48 −22		makefile
+1 −1		src/SW_Domain.c
+21 −0		src/SW_Main_lib.c
+2 −2		src/SW_Output.c
+2 −1		src/SW_netCDF.c
+13 −5		tools/check_outputModes.sh
+29 −0		tools/rscripts/Rscript__SW2_output_txt_vs_r_vs_nc.R