merged in PRMS 5.2.2

rniswon · Jan 17, 2024 · 457258e · 457258e
1 parent cd8f023
commit 457258e
Show file tree

Hide file tree

Showing 50 changed files with 608 additions and 713 deletions.
diff --git a/GSFLOW/src/prms/basin.f90 b/GSFLOW/src/prms/basin.f90
@@ -6,7 +6,7 @@ MODULE PRMS_BASIN
 !   Local Variables
       character(len=*), parameter :: MODDESC = 'Basin Definition'
       character(len=*), parameter :: MODNAME = 'basin'
-      character(len=*), parameter :: Version_basin = '2023-01-11'
+      character(len=*), parameter :: Version_basin = '2023-11-01'
       INTEGER, SAVE :: Numlake_hrus, Active_hrus, Active_gwrs, Numlakes_check
       INTEGER, SAVE :: Hemisphere, Dprst_clos_flag, Dprst_open_flag
       DOUBLE PRECISION, SAVE :: Land_area, Water_area, Ag_area_total

diff --git a/GSFLOW/src/prms/basin_sum.f90 b/GSFLOW/src/prms/basin_sum.f90
@@ -7,7 +7,7 @@ MODULE PRMS_BASINSUM
 !   Local Variables
       character(len=*), parameter :: MODDESC = 'Output Summary'
       character(len=9), parameter :: MODNAME = 'basin_sum'
-      character(len=*), parameter :: Version_basin_sum = '2022-09-01'
+      character(len=*), parameter :: Version_basin_sum = '2023-11-01'
 
       INTEGER, SAVE :: BALUNT, Totdays
       INTEGER, SAVE :: Header_prt, Endjday

diff --git a/GSFLOW/src/prms/basin_summary.f90 b/GSFLOW/src/prms/basin_summary.f90
@@ -7,7 +7,7 @@ MODULE PRMS_BASIN_SUMMARY
 ! Module Variables
       character(len=*), parameter :: MODDESC = 'Output Summary'
       character(len=*), parameter :: MODNAME = 'basin_summary'
-      character(len=*), parameter :: Version_basin_summary = '2021-11-19'
+      character(len=*), parameter :: Version_basin_summary = '2023-11-01'
       INTEGER, SAVE :: Begin_results, Begyr, Lastyear, Dailyunit, Monthlyunit, Yearlyunit, Basin_var_type
       INTEGER, SAVE, ALLOCATABLE :: Nc_vars(:)
       CHARACTER(LEN=48), SAVE :: Output_fmt, Output_fmt2, Output_fmt3

diff --git a/GSFLOW/src/prms/c_prms_time.f90 b/GSFLOW/src/prms/c_prms_time.f90
@@ -8,7 +8,7 @@ module PRMS_SET_TIME
   !   Local Variables
   character(len=*), parameter :: MODDESC = 'Timestep Control'
   character(len=*), parameter :: MODNAME = 'prms_time'
-  character(len=*), parameter :: Version_prms_time = '2022-04-21'
+  character(len=*), parameter :: Version_prms_time = '2023-11-01'
 
   integer, save :: Modays(MONTHS_PER_YEAR), Yrdays, Summer_flag, Jday, Jsol, Julwater
   integer, save :: Nowtime(6), Nowhour, Nowminute, Julian_day_absolute

diff --git a/GSFLOW/src/prms/cascade.f90 b/GSFLOW/src/prms/cascade.f90
@@ -7,7 +7,7 @@ MODULE PRMS_CASCADE
 !   Local Variables
       character(len=*), parameter :: MODDESC = 'Cascading Flow'
       character(len=*), parameter :: MODNAME = 'cascade'
-      character(len=*), parameter :: Version_cascade = '2021-11-19'
+      character(len=*), parameter :: Version_cascade = '2023-11-01'
       INTEGER, SAVE :: MSGUNT
       INTEGER, SAVE :: Iorder, Igworder, Ndown
 !   Computed Variables
@@ -209,7 +209,7 @@ INTEGER FUNCTION cascinit()
       cascinit = 0
 
       IF ( Cascade_flag==CASCADE_HRU_SEGMENT ) THEN
-        Cascade_tol = 5.0
+        Cascade_tol = 0.0
         Cascade_flg = 1
         Circle_switch = 0
       ELSE