Merge branch 'main' into multiplatform-builds

Author: Zeitsperre

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ default_language_version:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
     - id: check-json
     - id: pretty-format-json
@@ -26,7 +26,7 @@ repos:
 #      - id: include-what-you-use
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.28.6
+    rev: 0.29.3
     hooks:
       - id: check-github-workflows
   - repo: meta

README.md

@@ -2,9 +2,9 @@
 
 The code repository for the Raven Hydrological Modelling Framework developed at the University of Waterloo.
 
-Release versions, tutorials, documentation, and more distributed at [the Raven website](http://raven.uwaterloo.ca/Main.html).
+Release versions, tutorials, documentation, and more distributed at [the Raven website](https://raven.uwaterloo.ca/Main.html).
 
-Intended for use with Visual Studio Community Edition 2021, but also provided with Windows/linux/unix/MacOS g++ makefile and CMake configuration file.
+Intended for use with Visual Studio Community Edition 2022, but also provided with Windows/linux/unix/MacOS g++ makefile and CMake configuration file.
 
 Note unconventional two-space tabbing conventions.
 If you would like to work with the active development of Raven's core, please do so on a branch and coordinate commits to the trunk with the Raven development team.
@@ -32,3 +32,4 @@ So that the ```cmake``` command to build Raven as solely a dynamic library becom
 ```bash
 cmake -DCOMPILE_LIB=ON -DCOMPILE_EXE=OFF ../
 ```
+Raven can alternately be bullt in unix/MacOS using the makefile provided with the source code (g++ must be installed on the machine). Lastly, it may be compiled within Visual Studio Community Edition 2022.

src/CommonFunctions.cpp

@@ -367,6 +367,9 @@ void JulianConvert(double model_time, const double start_date, const int start_y
 
   tt.date_string=string(out);
   tt.leap_yr=IsLeapYear(tt.year,calendar);
+
+  //tt.nn=(int)((tt.model_time+TIME_CORRECTION)/Options.timestep);//current timestep index - likely needs Options.timestep to be in global member
+
 }
 
 ////////////////////////////////////////////////////////////////////////////