Merge branch 'develop' into bug_fix/chgres_memory

Fixes ufs-community#633.
GeorgeGayno-NOAA · Dec 7, 2022 · cbd36c4 · cbd36c4
2 parents e268f8c + 2c88329
commit cbd36c4
Show file tree

Hide file tree

Showing 9 changed files with 234 additions and 111 deletions.
diff --git a/docs/source/ufs_utils.rst b/docs/source/ufs_utils.rst
@@ -525,19 +525,25 @@ The surface climatological data is located here `./fix/fix_sfc_climo <https://no
       * Global 0.05-degree four component monthly snow-free albedo - snowfree_albedo.4comp.0.05.nc
       * Global 1.0-degree categorical slope type - slope_type.1.0.nc
       * Categorical STATSGO soil type
-             * Global 0.03-degree - soil_type.statsgo.0.03.nc
              * Global 0.05-degree - soil_type.statsgo.0.05.nc
-             * CONUS 0.01-degree - soil_type.statsgo.conus.0.01.nc
+             * Global 0.03-degree - soil_type.statsgo.0.03.nc
+             * CONUS 30 sec - soil_type.statsgo.conus.30s.nc
+             * N Hemis 30 sec - soil_type.statsgo.nh.30s.nc
+             * Global 30 sec - soil_type.statsgo.30s.nc
+      * Categorical BNU soil type
+             * Global 30-second - soil_type.bnu.30s.nc
       * Categorical IGBP vegetation type
-             * MODIS-based global 0.03-degree - vegetation_type.modis.igbp.0.03.nc
              * MODIS-based global 0.05-degree - vegetation_type.modis.igbp.0.05.nc
-             * MODIS-based CONUS 0.01-degree - vegetation_type.modis.igbp.conus.0.01.nc
-             * NESDIS VIIRS-based global 30-second - vegetation_type.viirs.igbp.30s.nc
-             * NESDIS VIIRS-based global 0.03-degree - vegetation_type.viirs.igbp.0.03.nc
+             * MODIS-based global 0.03-degree - vegetation_type.modis.igbp.0.03.nc
+             * MODIS-based CONUS 30 sec - vegetation_type.modis.igbp.conus.30s.nc
+             * MODIS-based N Hemis 30 sec - vegetation_type.modis.igbp.nh.30s.nc
+             * MODIS-based global 30 sec - vegetation_type.modis.igbp.30s.nc
+             * NESDIS VIIRS-based global 0.10-degree - vegetation_type.viirs.igbp.0.1.nc
              * NESDIS VIIRS-based global 0.05-degree - vegetation_type.viirs.igbp.0.05.nc
-             * NESDIS VIIRS-based global 0.1-degree - vegetation_type.viirs.igbp.0.1.nc
-             * NESDIS VIIRS-based N HEMIS 30-second - vegetation_type.viirs.igbp.nh.30s.nc
+             * NESDIS VIIRS-based global 0.03-degree - vegetation_type.viirs.igbp.0.03.nc
              * NESDIS VIIRS-based CONUS 30-second - vegetation_type.viirs.igbp.conus.30s.nc
+             * NESDIS VIIRS-based N HEMIS 30-second - vegetation_type.viirs.igbp.nh.30s.nc
+             * NESDIS VIIRS-based global 30-second - vegetation_type.viirs.igbp.30s.nc
       * Global 0.144-degree monthly vegetation greenness in percent - vegetation_greenness.0.144.nc
 
 The files that define the model grid. All NetCDF.

diff --git a/driver_scripts/driver_grid.hera.sh b/driver_scripts/driver_grid.hera.sh
@@ -52,10 +52,11 @@
 #      x/y grid spacing - "delx/y", and halo.
 #   8) Set working directory - TEMP_DIR - and path to the repository
 #      clone - home_dir.
-#   9) Check settings for 'make_gsl_orog' and 'veg_type_src'
-#      below.
-#  10) Submit script: "sbatch $script".
-#  11) All files will be placed in "out_dir".
+#   9) To use the GSL orographic drag suite, set 'make_gsl_orog' to true.
+#  10) Set 'soil_veg_src' and 'veg_type_src' to choose the 
+#      soil type and vegetation type data.
+#  11) Submit script: "sbatch $script".
+#  12) All files will be placed in "out_dir".
 #
 #-----------------------------------------------------------------------
 
@@ -72,21 +73,34 @@ module list
 #-----------------------------------------------------------------------
 
 export gtype=uniform           # 'uniform', 'stretch', 'nest', 
-                               # 'regional_gfdl', 'regional_esg'
-export make_gsl_orog=false     # 'true' if user needs 'oro' files for GSL
-                               # orographic drag suite
-export veg_type_src="modis.igbp.0.05" #  veg type data.
+                               # 'regional_gfdl', 'regional_esg'.
+export make_gsl_orog=false     # When 'true' will output 'oro' files for
+                               # the GSL orographic drag suite.
+
+export veg_type_src="modis.igbp.0.05" #  Vegetation type data.
                                 # For viirs-based vegetation type data, set to:
-                                # 1) "viirs.igbp.0.05" for global 5km data
-                                # 2) "viirs.igbp.0.1" for global 10km data
-                                # 3) "viirs.igbp.0.03" for global 3km data
-                                # 4) "viirs.igbp.30s" for global 30s data
-                                # 5) "viirs.igbp.conus.30s" for CONUS 30s data
-                                # 6) "viirs.igbp.nh.30s" for NH 30s data
+                                # 1) "viirs.igbp.0.1" for global 0.10-deg data
+                                # 2) "viirs.igbp.0.05" for global 0.05-deg data
+                                # 3) "viirs.igbp.0.03" for global 0.03-deg data
+                                # 4) "viirs.igbp.conus.30s" for CONUS 30s data
+                                # 5) "viirs.igbp.nh.30s" for NH 30s data
+                                # 6) "viirs.igbp.30s" for global 30s data
                                 # For the modis-based data, set to:
-                                # 1) "modis.igbp.0.05" for global 5km data
-                                # 2) "modis.igbp.0.03" for global 3km data
-                                # 3) "modis.igbp.conus.30s" for regional 30s data
+                                # 1) "modis.igbp.0.05" for global 0.05-deg data
+                                # 2) "modis.igbp.0.03" for global 0.03-deg data
+                                # 3) "modis.igbp.conus.30s" for CONUS 30s data
+                                # 4) "modis.igbp.nh.30s" for N Hemis 30s data
+                                # 5) "modis.igbp.30s" for global 30s data
+
+export soil_type_src="statsgo.0.05" #  Soil type data. 
+                                # For STATSGO data
+                                # 1) "statsgo.0.05" for global 0.05-deg data
+                                # 2) "statsgo.0.03" for global 0.03-deg data
+                                # 3) "statsgo.conus.30s" for CONUS 30s data
+                                # 4) "statsgo.nh.30s" for NH 30s data
+                                # 5) "statsgo.30s" for global 30s data
+                                # For Beijing Norm. Univ. data
+                                # 1) "bnu.30s" for global 30s data.
 
 if [ $gtype = uniform ]; then
   export res=96

diff --git a/driver_scripts/driver_grid.jet.sh b/driver_scripts/driver_grid.jet.sh
@@ -53,10 +53,11 @@
 #      x/y grid spacing - "delx/y", and halo.
 #   8) Set working directory - TEMP_DIR - and path to the repository
 #      clone - home_dir.
-#   9) Check settings for 'make_gsl_orog' and 'veg_type_src'
-#      below.
-#  10) Submit script: "sbatch $script".
-#  11) All files will be placed in "out_dir".
+#   9) To use the GSL orographic drag suite, set 'make_gsl_orog' to true.
+#  10) Set 'soil_veg_src' and 'veg_type_src' to choose the
+#      soil type and vegetation type data.
+#  11) Submit script: "sbatch $script".
+#  12) All files will be placed in "out_dir".
 #
 #-----------------------------------------------------------------------
 
@@ -73,20 +74,34 @@ module list
 
 export gtype=uniform           # 'uniform', 'stretch', 'nest', 
                                # 'regional_gfdl', 'regional_esg'
-export make_gsl_orog=false     # 'true' if user needs 'oro' files for GSL
-                               # orographic drag suite
-export veg_type_src="modis.igbp.0.05" #  veg type data.
+
+export make_gsl_orog=false     # When 'true' will output 'oro' files for
+                               # the GSL orographic drag suite.
+
+export veg_type_src="modis.igbp.0.05" #  Vegetation type data.
                                 # For viirs-based vegetation type data, set to:
-                                # 1) "viirs.igbp.0.05" for global 5km data
-                                # 2) "viirs.igbp.0.1" for global 10km data
-                                # 3) "viirs.igbp.0.03" for global 3km data
-                                # 4) "viirs.igbp.30s" for global 30s data
-                                # 5) "viirs.igbp.conus.30s" for CONUS 30s data
-                                # 6) "viirs.igbp.nh.30s" for NH 30s data
+                                # 1) "viirs.igbp.0.1" for global 0.10-deg data
+                                # 2) "viirs.igbp.0.05" for global 0.05-deg data
+                                # 3) "viirs.igbp.0.03" for global 0.03-deg data
+                                # 4) "viirs.igbp.conus.30s" for CONUS 30s data
+                                # 5) "viirs.igbp.nh.30s" for NH 30s data
+                                # 6) "viirs.igbp.30s" for global 30s data
                                 # For the modis-based data, set to:
-                                # 1) "modis.igbp.0.05" for global 5km data
-                                # 2) "modis.igbp.0.03" for global 3km data
-                                # 3) "modis.igbp.conus.30s" for regional 30s data
+                                # 1) "modis.igbp.0.05" for global 0.05-deg data
+                                # 2) "modis.igbp.0.03" for global 0.03-deg data
+                                # 3) "modis.igbp.conus.30s" for CONUS 30s data
+                                # 4) "modis.igbp.nh.30s" for N Hemis 30s data
+                                # 5) "modis.igbp.30s" for global 30s data
+
+export soil_type_src="statsgo.0.05" # Soil type data.
+                                # For STATSGO soil type data, set to:
+                                # 1) "statsgo.0.05" for global 0.05-deg data
+                                # 2) "statsgo.0.03" for global 0.03-deg data
+                                # 3) "statsgo.conus.30s" for CONUS 30s data
+                                # 4) "statsgo.nh.30s" for NH 30s data
+                                # 5) "statsgo.30s" for global 30s data
+                                # For Beijing Normal Univ. data, set to:
+                                # 1) "bnu.30s" for global 30s data.
 
 if [ $gtype = uniform ]; then
   export res=96

diff --git a/driver_scripts/driver_grid.orion.sh b/driver_scripts/driver_grid.orion.sh
@@ -52,10 +52,11 @@
 #      x/y grid spacing - "delx/y", and halo.
 #   8) Set working directory - TEMP_DIR - and path to the repository
 #      clone - home_dir.
-#   9) Check settings for 'make_gsl_orog' and 'veg_type_src'
-#      below.
-#  10) Submit script: "sbatch $script".
-#  11) All files will be placed in "out_dir".
+#   9) To use the GSL orographic drag suite, set 'make_gsl_orog' to true.
+#  10) Set 'soil_veg_src' and 'veg_type_src' to choose the
+#      soil type and vegetation type data.
+#  11) Submit script: "sbatch $script".
+#  12) All files will be placed in "out_dir".
 #
 #-----------------------------------------------------------------------
 
@@ -73,21 +74,33 @@ module list
 export gtype=regional_esg      # 'uniform', 'stretch', 'nest', 
                                # 'regional_gfdl', 'regional_esg'
 
-export make_gsl_orog=false     # 'true' if user needs 'oro' files for GSL
-                               # orographic drag suite
+export make_gsl_orog=false    # When 'true' will output 'oro' files for 
+                              # the GSL orographic drag suite.
 
-export veg_type_src="modis.igbp.0.05" #  veg type data.
+export veg_type_src="modis.igbp.0.05" #  Vegetation type data.
                                 # For viirs-based vegetation type data, set to:
-                                # 1) "viirs.igbp.0.05" for global 5km data
-                                # 2) "viirs.igbp.0.1" for global 10km data
-                                # 3) "viirs.igbp.0.03" for global 3km data
-                                # 4) "viirs.igbp.30s" for global 30s data
-                                # 5) "viirs.igbp.conus.30s" for CONUS 30s data
-                                # 6) "viirs.igbp.nh.30s" for NH 30s data
+                                # 1) "viirs.igbp.0.1" for global 0.10-deg data
+                                # 2) "viirs.igbp.0.05" for global 0.05-deg data
+                                # 3) "viirs.igbp.0.03" for global 0.03-deg data
+                                # 4) "viirs.igbp.conus.30s" for CONUS 30s data
+                                # 5) "viirs.igbp.nh.30s" for NH 30s data
+                                # 6) "viirs.igbp.30s" for global 30s data
                                 # For the modis-based data, set to:
-                                # 1) "modis.igbp.0.05" for global 5km data
-                                # 2) "modis.igbp.0.03" for global 3km data
-                                # 3) "modis.igbp.conus.30s" for regional 30s data
+                                # 1) "modis.igbp.0.05" for global 0.05-deg data
+                                # 2) "modis.igbp.0.03" for global 0.03-deg data
+                                # 3) "modis.igbp.conus.30s" for CONUS 30s data
+                                # 4) "modis.igbp.nh.30s" for N Hemis 30s data
+                                # 5) "modis.igbp.30s" for global 30s data
+
+export soil_type_src="statsgo.0.05" #  Soil type data.
+                                # For STATSGO soil type data, set to:
+                                # 1) "statsgo.0.05" for global 0.05-deg data
+                                # 2) "statsgo.0.03" for global 0.03-deg data
+                                # 3) "statsgo.conus.30s" for CONUS 30s data
+                                # 4) "statsgo.nh.30s" for NH 30s data
+                                # 5) "statsgo.30s" for global 30s data
+                                # For Beijing Normal Univ. data, set to:
+                                # 1) "bnu.30s" for global 30s data.
 
 if [ $gtype = uniform ]; then
   export res=96

diff --git a/driver_scripts/driver_grid.wcoss2.sh b/driver_scripts/driver_grid.wcoss2.sh
@@ -6,7 +6,7 @@
 #PBS -A GFS-DEV
 #PBS -l walltime=00:15:00
 #PBS -N make_grid
-#PBS -l select=1:ncpus=24:mem=200GB
+#PBS -l select=1:ncpus=24:mem=500GB
 
 #-----------------------------------------------------------------------
 # Driver script to create a cubic-sphere based model grid on WCOSS2.
@@ -51,10 +51,11 @@
 #      x/y grid spacing - "delx/y", and halo.
 #   8) Set working directory - TEMP_DIR - and path to the repository
 #      clone - home_dir.
-#   9) Check settings for 'make_gsl_orog' and 'veg_type_src'
-#      below.
-#  10) Submit script: "cat $script | bsub".
-#  11) All files will be placed in "out_dir".
+#   9) To use the GSL orographic drag suite, set 'make_gsl_orog' to true.
+#  10) Set 'soil_veg_src' and 'veg_type_src' to choose the
+#      soil type and vegetation type data.
+#  11) Submit script: "qsub $script".
+#  12) All files will be placed in "out_dir".
 #
 #-----------------------------------------------------------------------
 
@@ -69,22 +70,36 @@ module list
 # Set grid specs here.
 #-----------------------------------------------------------------------
 
-export gtype=regional_esg           # 'uniform', 'stretch', 'nest', 
+export gtype=regional_esg      # 'uniform', 'stretch', 'nest', 
                                # 'regional_gfdl', 'regional_esg'
-export make_gsl_orog=false     # 'true' if user needs 'oro' files for GSL
-                               # orographic drag suite
-export veg_type_src="modis.igbp.0.05" #  veg type data.
+
+export make_gsl_orog=false     # When 'true' will output 'oro' files for
+                               # the GSL orographic drag suite.
+
+export veg_type_src="modis.igbp.0.05" #  Vegetation type data.
                                 # For viirs-based vegetation type data, set to:
-                                # 1) "viirs.igbp.0.05" for global 5km data
-                                # 2) "viirs.igbp.0.1" for global 10km data
-                                # 3) "viirs.igbp.0.03" for global 3km data
-                                # 4) "viirs.igbp.30s" for global 30s data
-                                # 5) "viirs.igbp.conus.30s" for CONUS 30s data
-                                # 6) "viirs.igbp.nh.30s" for NH 30s data
+                                # 1) "viirs.igbp.0.1" for global 0.10-deg data
+                                # 2) "viirs.igbp.0.05" for global 0.05-deg data
+                                # 3) "viirs.igbp.0.03" for global 0.03-deg data
+                                # 4) "viirs.igbp.conus.30s" for CONUS 30s data
+                                # 5) "viirs.igbp.nh.30s" for NH 30s data
+                                # 6) "viirs.igbp.30s" for global 30s data
                                 # For the modis-based data, set to:
-                                # 1) "modis.igbp.0.05" for global 5km data
-                                # 2) "modis.igbp.0.03" for global 3km data
-                                # 3) "modis.igbp.conus.30s" for regional 30s data
+                                # 1) "modis.igbp.0.05" for global 0.05-deg data
+                                # 2) "modis.igbp.0.03" for global 0.03-deg data
+                                # 3) "modis.igbp.conus.30s" for CONUS 30s data
+                                # 4) "modis.igbp.nh.30s" for N Hemis 30s data
+                                # 5) "modis.igbp.30s" for global 30s data
+
+export soil_type_src="statsgo.0.05"  # Soil type data
+                                # For STATSGO soil type data, set to:
+                                # 1) "statsgo.0.05" for global 0.05-deg data
+                                # 2) "statsgo.0.03" for global 0.03-deg data
+                                # 3) "statsgo.conus.30s" for CONUS 30s data
+                                # 4) "statsgo.nh.30s" for NH 30s data
+                                # 5) "statsgo.30s" for global 30s data
+                                # For Beijing Normal Univ. data, set to:
+                                # 1) "bnu.30s" for global 30s data.
 
 if [ $gtype = uniform ]; then
   export res=96