Merge branch 'CMS_v5.4.4.3'

Author: ERDC-mbrown

Intel_vs2022/CMS2D_V5.4.vfproj

@@ -33,11 +33,9 @@
 		</Filter>
 		<Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
 			<File RelativePath="..\source\CMakeLists.txt"/>
-			<File RelativePath="..\source\logsheet.txt">
-			</File>
+			<File RelativePath="..\source\logsheet.txt"/>
 			<File RelativePath="..\source\readme.txt"/>
-			<File RelativePath="..\docs\user\whatsnew.rst">
-			</File>
+			<File RelativePath="..\docs\user\whatsnew.rst"/>
 		</Filter>
 		<Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
 			<Filter Name="Explicit Scheme">

docs/user/whatsnew.rst

@@ -1,7 +1,7 @@
 What's New
 ==========
 
-v5.4.4.2 (09 April 2025)
+v5.4.4.3 (21 April 2025)
 -------------------------
 
 Changes
@@ -13,6 +13,7 @@ Changes
 * Added allocation for Observation and Nest points when using the newest format.
 * (5.4.4.1) Bug fix for mixing layer thickness error.
 * (5.4.4.2) Handles a '--non-interactive' flag as final argument to avoid the "Press any key to continue" message after errors.
+* (5.4.4.3) Bug fix for array out of bounds when nesting is used.
 
 
 v5.4.3 (18 March 2025)

source/logsheet.txt

@@ -1,11 +1,12 @@
-== Version 5.4.4 (04/07/2025) ==
+== Version 5.4.4 (04/21/2025) ==
 * Minor changes to wave code to initialize a few variables.
 * Added test to ensure initial mixing layer thickness is always less than thicknesses for bed layers.
 * Added test for met station wind data import.
 * Test fix for divide by zero in SHEARLUND routine.
 * Added allocation for Observation and Nest points when using the newest format.
 * (5.4.4.1) Bug fix for mixing layer thickness error.
 * (5.4.4.2) Handles a '--non-interactive' flag as final argument to avoid the "Press any key to continue" message after errors.
+* (5.4.4.3) Bug fix for array out of bounds when nesting is used.
 
 == Version 5.4.3 (03/20/2025) ==
 * Optimized ADAK and ADBK dot product routines

source/main/CMS2D_main.f90

@@ -48,8 +48,8 @@ character(len=20) function Int2Str(k)
     !NOTE: Change variables below to update CMS header information
     version  = 5.4           ! CMS version         !For interim version
     revision = 4             ! Revision number
-    bugfix   = 2             ! Bugfix number
-    rdate    = '04/09/2025'
+    bugfix   = 3             ! Bugfix number
+    rdate    = '04/21/2025'
 
     !Manipulate to get major and minor versions - MEB  09/15/20
     call split_real_to_integers (version, 2, major_version, minor_version)  !Convert version to two integer portions before and after the decimal considering 2 digits of precision.

source/waves/CMS-Wave_v3.4W_Jan2025.f90

@@ -1160,6 +1160,11 @@ Subroutine CMS_Wave_inline !(noptset,nsteer)     !Wu
 
       npf=nff+1                !Wu   
       mpd=mdd+1
+      
+      !Added by MBrown, 04/21/2025.  This was never assigned a value but then used to allocate space in some arrays.
+      ! Previous versions had MPD = 50 and MPD2 = 75.  I am just assigning (MPD + 1) to MPD2 for now just in case it needs to be larger than mpd.
+      mpd2 = mpd + 1  
+      
       allocate( ffcn(npf),dsfd(npf,mpd) )
 
       READ(8,*) (FFCN(NN),NN=1,NFF)
@@ -1330,12 +1335,15 @@ Subroutine CMS_Wave_inline !(noptset,nsteer)     !Wu
       allocate( df(npf),dfinp(npf),pl1e(npf),pl1t(npf) )
       allocate( scp(jgpx,mpd),si(jgpx,npf,mpd) )
       allocate( simax(jgpx,npf,mpd),sjj(jgpx) )
-      allocate( sop(koutnest,npf,mpd2),sr(2*ipmx,npf,mpd) )   
-      !allocate( sop(komx,npf,mpd2),sr(2*ipmx,npf,mpd) )   
+      allocate( sop(koutnest,npf,mpd2) )   
       allocate( sj(jgpx),sjf(jgpx,npf),fjf(jgpx) )
-      allocate( aa(5,mpmx),ia(5,mpmx),b(mpmx),x(mpmx) )
       allocate( sgma0(jgpx,mpd),sgma1(jgpx,mpd) )
       allocate( cwk(jpmx,2,mpd),cgk(jpmx,2,mpd) )           
+      
+      allocate ( sr(2*ipmx,npf,mpd),ia(5,mpmx) )
+      allocate ( aa(5,mpmx) )
+      allocate ( b(mpmx) )
+      allocate ( x(mpmx) )
       !End adding                      by Wu, Nov. 2024
 
       itms = 0 + n  !N is number of times that were skipped during hot start or 0 if cold start.

source/waves/wave_def_Jan2025.f90

@@ -96,10 +96,11 @@ module wave_def
     real(ikind),allocatable :: SIMAX(:,:,:),SJJ(:)     
     real(ikind),allocatable :: SOP(:,:,:),SR(:,:,:)     
     real(ikind),allocatable :: SJ(:),SJF(:,:),FJF(:)         
-    real(ikind),allocatable :: AA(:,:),B(:),X(:)        
+    real(ikind),allocatable :: AA(:,:),B(:),X(:) 
     real(ikind),allocatable :: sgma0(:,:),sgma1(:,:)       
     real(ikind),allocatable :: cwk(:,:,:),cgk(:,:,:)        
-    real(ikind),allocatable :: ex(:,:),ey(:,:)        
+    real(ikind),allocatable :: ex(:,:),ey(:,:)  
+
 
     integer,allocatable :: IJB(:,:)
     integer,allocatable :: KR(:,:)