Merge branch 'develop' into feature/new_ip

Fixes ufs-community#242.
GeorgeGayno-NOAA · Dec 1, 2022 · 36b5592 · 36b5592
2 parents 37787b4 + e0260ab
commit 36b5592
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 11 deletions.
diff --git a/docs/source/ufs_utils.rst b/docs/source/ufs_utils.rst
@@ -530,6 +530,8 @@ The surface climatological data is located here `./fix/fix_sfc_climo <https://no
              * 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.05-degree - vegetation_type.modis.igbp.0.05.nc
              * MODIS-based global 0.03-degree - vegetation_type.modis.igbp.0.03.nc

diff --git a/driver_scripts/driver_grid.hera.sh b/driver_scripts/driver_grid.hera.sh
@@ -76,7 +76,8 @@ export gtype=uniform           # 'uniform', 'stretch', 'nest',
                                # '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" #  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.1" for global 0.10-deg data
                                 # 2) "viirs.igbp.0.05" for global 0.05-deg data
@@ -91,12 +92,15 @@ export veg_type_src="modis.igbp.0.05" #  veg type 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. Choices are:
+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
@@ -74,9 +74,11 @@ module list
 
 export gtype=uniform           # 'uniform', 'stretch', 'nest', 
                                # '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" #  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.1" for global 0.10-deg data
                                 # 2) "viirs.igbp.0.05" for global 0.05-deg data
@@ -91,12 +93,15 @@ export veg_type_src="modis.igbp.0.05" #  veg type 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. Choices are:
+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
@@ -77,7 +77,7 @@ export gtype=regional_esg      # 'uniform', 'stretch', 'nest',
 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.1" for global 0.10-deg data
                                 # 2) "viirs.igbp.0.05" for global 0.05-deg data
@@ -92,12 +92,15 @@ export veg_type_src="modis.igbp.0.05" #  veg type 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. Choices are:
+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.
@@ -70,11 +70,13 @@ 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     # 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.1" for global 0.10-deg data
                                 # 2) "viirs.igbp.0.05" for global 0.05-deg data
@@ -89,12 +91,15 @@ export veg_type_src="modis.igbp.0.05" #  veg type 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. Choices are:
+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/util/sfc_climo_gen/run.wcoss2.sh b/util/sfc_climo_gen/run.wcoss2.sh
@@ -64,12 +64,15 @@ export FIX_FV3=${BASE_DIR}/fix/orog/C${res}
 #   4) "modis.igbp.nh.30s" for NH 30s data
 #   5) "modis.igbp.30s" for global 30s data
 #
-# Soil type data
+# For STATSGO soil type 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. soil type data
+#   1) "bnu.30s" for global 30s data
 #-------------------------------------------------------------
 
 export veg_type_src="modis.igbp.0.05"