testing with new fix locations

sanatcumar · Dec 7, 2023 · cefff38 · cefff38
1 parent c11ddcf
commit cefff38
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/sorc/ocean_merge.fd/merge_lake_ocnmsk.f90 b/sorc/ocean_merge.fd/merge_lake_ocnmsk.f90
@@ -19,7 +19,7 @@ program merge_lake_ocnmsk
 
   implicit none
 
-  character(len=120) :: pth1
+  character(len=220) :: pth1
   character(len=120) :: pth2,pth3
   character(len=10)  :: atmres,ocnres
   real, parameter    :: min_land=1.e-4, def_lakedp=10.
@@ -34,10 +34,8 @@ program merge_lake_ocnmsk
   integer :: lake_pt,vlat
   real, allocatable :: lake_frac(:,:),lake_depth(:,:),land_frac(:,:),ocn_frac(:,:),slmsk(:,:),lat2d(:,:)
 
-
 
   call read_nml(pth1, pth2, atmres, ocnres, pth3,binary_lake)
-
   nodp_pt=0
   lake_pt=0  
   do tile=1,6
@@ -167,7 +165,7 @@ 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=220), intent(out) :: ocean_mask_dir
   character(len=120), intent(out) :: lake_mask_dir
   character(len=120), intent(out) :: out_dir
   character(len=10),  intent(out) :: atmres,ocnres

diff --git a/ush/fv3gfs_driver_grid.sh b/ush/fv3gfs_driver_grid.sh
@@ -527,6 +527,8 @@ export SAVE_DIR=$out_dir/sfc
 export BASE_DIR=$home_dir
 export FIX_FV3=$out_dir
 export input_sfc_climo_dir=$home_dir/fix/sfc_climo
+export ocean_mask_dir=$home_dir/fix/orog
+
 
 if [ $gtype = regional_gfdl ] || [ $gtype = regional_esg ]; then
   export HALO=$halop1