From adc79a390942e0694acc71f747e11383dee5a218 Mon Sep 17 00:00:00 2001
From: "Shan.Sun" <shan.sun@noaa.gov>
Date: Thu, 2 Nov 2023 15:04:54 +0000
Subject: [PATCH] Improving the previous commit: change default values and
 comments

---
 driver_scripts/driver_grid.hera.sh           | 4 ++--
 driver_scripts/driver_grid.jet.sh            | 4 ++--
 driver_scripts/driver_grid.orion.sh          | 4 ++--
 driver_scripts/driver_grid.wcoss2.sh         | 4 ++--
 reg_tests/grid_gen/c96.uniform.sh            | 2 ++
 sorc/orog_mask_tools.fd/lake.fd/lakefrac.F90 | 4 ++--
 ush/fv3gfs_driver_grid.sh                    | 4 ++--
 7 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/driver_scripts/driver_grid.hera.sh b/driver_scripts/driver_grid.hera.sh
index e78db425b..6975857a3 100755
--- a/driver_scripts/driver_grid.hera.sh
+++ b/driver_scripts/driver_grid.hera.sh
@@ -113,8 +113,8 @@ export lake_data_srce=MODISP_GLDBV3
 if [ $gtype = uniform ]; then
   export res=96
   export add_lake=true         # Add lake frac and depth to orography data.
-  export lake_cutoff=0.50      # ignore lake_frac < lake_cutoff when add_lake=T
-  export binary_lake=1         # return '1 > lake_frac >= lake_cutoff' as 1/0 when binary_lake=1/0
+  export lake_cutoff=0.50      # return 0 if lake_frac <  lake_cutoff & add_lake=T
+  export binary_lake=1         # return 1 if lake_frac >= lake_cutoff & add_lake=T
 elif [ $gtype = stretch ]; then
   export res=96
   export stretch_fac=1.5       # Stretching factor for the grid
diff --git a/driver_scripts/driver_grid.jet.sh b/driver_scripts/driver_grid.jet.sh
index c8ebc51f4..8cfce4d89 100755
--- a/driver_scripts/driver_grid.jet.sh
+++ b/driver_scripts/driver_grid.jet.sh
@@ -111,8 +111,8 @@ export lake_data_srce=MODISP_GLDBV3
 if [ $gtype = uniform ]; then
   export res=96
   export add_lake=true         # Add lake frac and depth to orography data.
-  export lake_cutoff=0.50      # ignore lake_frac < lake_cutoff when add_lake=T
-  export binary_lake=1         # return '1 > lake_frac >= lake_cutoff' as 1/0 when binary_lake=1/0
+  export lake_cutoff=0.50      # return 0 if lake_frac <  lake_cutoff & add_lake=T
+  export binary_lake=1         # return 1 if lake_frac >= lake_cutoff & add_lake=T
 elif [ $gtype = stretch ]; then
   export res=96
   export stretch_fac=1.5       # Stretching factor for the grid
diff --git a/driver_scripts/driver_grid.orion.sh b/driver_scripts/driver_grid.orion.sh
index bd12e944e..458abc318 100755
--- a/driver_scripts/driver_grid.orion.sh
+++ b/driver_scripts/driver_grid.orion.sh
@@ -110,8 +110,8 @@ export lake_data_srce=MODISP_GLDBV3
 if [ $gtype = uniform ]; then
   export res=96
   export add_lake=true         # Add lake frac and depth to orography data.
-  export lake_cutoff=0.50      # ignore lake_frac < lake_cutoff when add_lake=T
-  export binary_lake=1         # return '1 > lake_frac >= lake_cutoff' as 1/0 when binary_lake=1/0
+  export lake_cutoff=0.50      # return 0 if lake_frac <  lake_cutoff & add_lake=T
+  export binary_lake=1         # return 1 if lake_frac >= lake_cutoff & add_lake=T
 elif [ $gtype = stretch ]; then
   export res=96
   export stretch_fac=1.5       # Stretching factor for the grid
diff --git a/driver_scripts/driver_grid.wcoss2.sh b/driver_scripts/driver_grid.wcoss2.sh
index 4d55efef5..c5bb48919 100755
--- a/driver_scripts/driver_grid.wcoss2.sh
+++ b/driver_scripts/driver_grid.wcoss2.sh
@@ -109,8 +109,8 @@ export lake_data_srce=MODISP_GLDBV3
 if [ $gtype = uniform ]; then
   export res=96
   export add_lake=true         # Add lake frac and depth to orography data.
-  export lake_cutoff=0.50      # ignore lake_frac < lake_cutoff when add_lake=T
-  export binary_lake=1         # return '1 > lake_frac >= lake_cutoff' as 1/0 when binary_lake=1/0
+  export lake_cutoff=0.50      # return 0 if lake_frac <  lake_cutoff & add_lake=T
+  export binary_lake=1         # return 1 if lake_frac >= lake_cutoff & add_lake=T
 elif [ $gtype = stretch ]; then
   export res=96
   export stretch_fac=1.5       # Stretching factor for the grid
diff --git a/reg_tests/grid_gen/c96.uniform.sh b/reg_tests/grid_gen/c96.uniform.sh
index d4f569d51..09e18c843 100755
--- a/reg_tests/grid_gen/c96.uniform.sh
+++ b/reg_tests/grid_gen/c96.uniform.sh
@@ -15,6 +15,8 @@ export res=96
 export gtype=uniform
 export add_lake=true
 export lake_data_srce=MODISP_GLDBV3
+export lake_cutoff=0.50
+export binary_lake=1
 
 NCCMP=${NCCMP:-$(which nccmp)}
 
diff --git a/sorc/orog_mask_tools.fd/lake.fd/lakefrac.F90 b/sorc/orog_mask_tools.fd/lake.fd/lakefrac.F90
index 7816e21ad..92ae4269c 100644
--- a/sorc/orog_mask_tools.fd/lake.fd/lakefrac.F90
+++ b/sorc/orog_mask_tools.fd/lake.fd/lakefrac.F90
@@ -65,8 +65,8 @@ PROGRAM lake_frac
     CALL getarg(5, lakedepth_srce)
 
     IF (iargc() == 5) THEN
-      lake_cutoff = 0.20
-      binary_lake = 0
+      lake_cutoff = 0.50
+      binary_lake = 1
     ELSE
       CALL getarg(6, arg)
       READ(arg,*,iostat=stat) lake_cutoff
diff --git a/ush/fv3gfs_driver_grid.sh b/ush/fv3gfs_driver_grid.sh
index c0d456ac7..81ac33551 100755
--- a/ush/fv3gfs_driver_grid.sh
+++ b/ush/fv3gfs_driver_grid.sh
@@ -48,8 +48,8 @@ export gtype=${gtype:-uniform}  # grid type: uniform, stretch, nest, regional_gf
                                 # or regional_esg
 
 export add_lake=${add_lake:-false}      # add lake fraction and depth. uniform only.
-export lake_cutoff=${lake_cutoff:-0.20} # ignore lake_frac < lake_cutoff when add_lake=T
-export binary_lake=${binary_lake:0}     # return '1 > lake_frac >= lake_cutoff' as 1/0 when binary_lake=1/0
+export lake_cutoff=${lake_cutoff:-0.50} # return 0 if lake_frac <  lake_cutoff & add_lake=T
+export binary_lake=${binary_lake:-1}    # return 1 if lake_frac >= lake_cutoff & add_lake=T
 
 export make_gsl_orog=${make_gsl_orog:-false} # when true, create GSL drag suite orog files.