add_lake_20200810 Update grid generation driver scripts.

Issue ufs-community#111.

driver_scripts/driver_grid.cray.sh

@@ -59,7 +59,8 @@ module list
 
 export res=96
 export gtype=uniform   # 'uniform', 'stretch', 'nest', or 'regional'
-export add_lake=true
+export add_lake=false   # add lake frac and depth to orography data
+export lake_cutoff=0.20 # lake frac less than lake_cutoff is ignored
 
 if [ $gtype = stretch ]; then
   export stretch_fac=1.5       # Stretching factor for the grid
@@ -88,6 +89,19 @@ export home_dir=$LS_SUBCWD/..
 export TMPDIR=/gpfs/hps3/stmp/$LOGNAME/fv3_grid.$gtype
 export out_dir=/gpfs/hps3/stmp/$LOGNAME/C${res}
 
+#-----------------------------------------------------------------------
+# Should not need to change anything below here.
+#-----------------------------------------------------------------------
+
+if [ $add_lake = true ]; then
+  if  [ $gtype != uniform ]; then
+    set +x
+    echo "Adding lake data to orography data is only available"
+    echo "for uniform grids."
+    exit 1
+  fi
+fi
+
 export NODES=1
 export APRUN="aprun -n 1 -N 1 -j 1 -d 1 -cc depth"
 export APRUN_SFC="aprun -j 1 -n 24 -N 24"

driver_scripts/driver_grid.dell.sh

@@ -60,7 +60,9 @@ module list
 #-----------------------------------------------------------------------
 
 export res=96
-export gtype=regional  # 'uniform', 'stretch', 'nest', or 'regional'
+export gtype=uniform  # 'uniform', 'stretch', 'nest', or 'regional'
+export add_lake=false   # add lake frac and depth to orography data
+export lake_cutoff=0.20 # lake frac less than lake_cutoff is ignored
 
 if [ $gtype = stretch ]; then
   export stretch_fac=1.5       # Stretching factor for the grid
@@ -93,6 +95,15 @@ export out_dir=/gpfs/dell1/stmp/$LOGNAME/C${res}
 # Should not need to change anything below here.
 #-----------------------------------------------------------------------
 
+if [ $add_lake = true ]; then
+  if  [ $gtype != uniform ]; then
+    set +x
+    echo "Adding lake data to orography data is only available"
+    echo "for uniform grids."
+    exit 1
+  fi
+fi
+
 export APRUN=time
 export APRUN_SFC="mpirun -l"
 export OMP_NUM_THREADS=24 # orog code worked best with 24 threads.

driver_scripts/driver_grid.hera.sh

@@ -61,7 +61,7 @@ module list
 
 export res=96
 export gtype=uniform    # 'uniform', 'stretch', 'nest', or 'regional'
-export add_lake=true    # add lake frac and depth to orography data
+export add_lake=false   # add lake frac and depth to orography data
 export lake_cutoff=0.20 # lake frac less than lake_cutoff is ignored
 
 if [ $gtype = stretch ]; then
@@ -91,19 +91,19 @@ export home_dir=$SLURM_SUBMIT_DIR/..
 export TMPDIR=/scratch2/NCEPDEV/stmp1/$LOGNAME/fv3_grid.$gtype
 export out_dir=/scratch2/NCEPDEV/stmp1/$LOGNAME/C${res}
 
+#-----------------------------------------------------------------------
+# Should not need to change anything below here.
+#-----------------------------------------------------------------------
+
 if [ $add_lake = true ]; then
-  if  [ $gtype = stretch ] || [ $gtype = nest ] || [ $gtype = regional ]; then
+  if  [ $gtype != uniform ]; then
     set +x
-    echo "Adding lake data to orography data is not available"
-    echo "for 'stretch', 'nest' and 'regional' grid type; set add_lake=false."
+    echo "Adding lake data to orography data is only available"
+    echo "for uniform grids."
     exit 1
   fi
 fi
 
-#-----------------------------------------------------------------------
-# Should not need to change anything below here.
-#-----------------------------------------------------------------------
-
 export APRUN=time
 export APRUN_SFC=srun
 export OMP_NUM_THREADS=24

driver_scripts/driver_grid.jet.sh

@@ -62,6 +62,8 @@ module list
 
 export res=96
 export gtype=regional  # 'uniform', 'stretch', 'nest', or 'regional'
+export add_lake=false   # add lake frac and depth to orography data
+export lake_cutoff=0.20 # lake frac less than lake_cutoff is ignored
 
 if [ $gtype = stretch ]; then
   export stretch_fac=1.5       # Stretching factor for the grid
@@ -94,6 +96,15 @@ export out_dir=/lfs4/HFIP/emcda/$LOGNAME/stmp/C${res}
 # Should not need to change anything below here.
 #-----------------------------------------------------------------------
 
+if [ $add_lake = true ]; then
+  if  [ $gtype != uniform ]; then
+    set +x
+    echo "Adding lake data to orography data is only available"
+    echo "for uniform grids."
+    exit 1
+  fi
+fi
+
 export APRUN=time
 export APRUN_SFC=srun
 export OMP_NUM_THREADS=24