Merge branch 'develop' into lowres_grids

Fixes ufs-community#1000.
GeorgeGayno-NOAA · Dec 9, 2024 · db7f7c2 · db7f7c2
2 parents c8dad11 + 4630b7d
commit db7f7c2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/sorc/ocean_merge.fd/merge_lake_ocnmsk.F90 b/sorc/ocean_merge.fd/merge_lake_ocnmsk.F90
@@ -18,8 +18,8 @@ program merge_lake_ocnmsk
 
   implicit none
 
-  character(len=120) :: pth1
-  character(len=120) :: pth2,pth3
+  character(len=200) :: pth1
+  character(len=200) :: pth2,pth3
   character(len=10)  :: atmres,ocnres
 
   integer :: binary_lake

diff --git a/sorc/ocean_merge.fd/namelist.F90 b/sorc/ocean_merge.fd/namelist.F90
@@ -16,9 +16,9 @@ subroutine read_nml(ocean_mask_dir, lake_mask_dir, atmres,ocnres,out_dir,binary_
 
   integer :: unit=7, io_status
 
-  character(len=120), intent(out) :: ocean_mask_dir
-  character(len=120), intent(out) :: lake_mask_dir
-  character(len=120), intent(out) :: out_dir
+  character(len=200), intent(out) :: ocean_mask_dir
+  character(len=200), intent(out) :: lake_mask_dir
+  character(len=200), intent(out) :: out_dir
   character(len=10),  intent(out) :: atmres,ocnres
   integer, intent(out):: binary_lake
 

diff --git a/tests/ocean_merge/ftst_read_nml.F90 b/tests/ocean_merge/ftst_read_nml.F90
@@ -7,9 +7,9 @@ program read_namelist
 
  implicit none
 
- character(len=120) :: ocean_mask_dir
- character(len=120) :: lake_mask_dir
- character(len=120) :: out_dir
+ character(len=200) :: ocean_mask_dir
+ character(len=200) :: lake_mask_dir
+ character(len=200) :: out_dir
  character(len=10)  :: atmres,ocnres
 
  integer            :: binary_lake