Merge branch 'develop' into feature/new_ip

Fixes ufs-community#242.
GeorgeGayno-NOAA · Oct 19, 2022 · 363871c · 363871c
2 parents 794304d + b67f487
commit 363871c
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 # UFS_UTILS
 
 Utilities for the NCEP models. This is part of the
-[NCEPLIBS](https://github.com/NOAA-EMC/NCEPLIBS) project.
+[Unified Forecast System](https://github.com/ufs-community) project.
 
 Documentation for chgres_cube and other utilities can be found at
 https://noaa-emcufs-utils.readthedocs.io/en/latest/.
@@ -22,14 +22,14 @@ fre-nctools | GFDL progammer
 fvcom_tools | David Wright, University of Michigan, Ming Hu, GSD/AMB
 gblevents | Hang Lei
 gdas_init | George Gayno
-global_cycle | George Gayno, Shrinivas Moorthi, Mark Iredell, Xu Li, Hang Lei
-grid_tools | R. J. Purser (regional_esg_grid), Tom Black/Ben Blake (shave.fd), Gerard Ketefian (global_equiv_resol), Tsukasa Fujita, JMA (pmat2), GFDL programmer (topo filtering code).
+global_cycle | George Gayno, Shrinivas Moorthi, Xu Li
+grid_tools | R. J. Purser (regional_esg_grid), Ben Blake (shave.fd), Gerard Ketefian (global_equiv_resol), Tsukasa Fujita, JMA (pmat2), GFDL programmer (topo filtering code).
 orog_mask_tools | Ning Wang, Jordan Alpert, Shan Sun and Ning Wang
 sfc_climo_gen | George Gayno
-vcoord_gen | Fanglin Yang, Mark Iredell
+vcoord_gen | Fanglin Yang
 weight_gen | George Gayno
 
-UFS_UTILS Code managers: George Gayno, Kyle Gerheiser, Jeff Beck, Larissa Reames
+UFS_UTILS Code managers: George Gayno, Jeff Beck, Larissa Reames
 
 ## Prerequisites
 

diff --git a/docs/source/ufs_utils.rst b/docs/source/ufs_utils.rst
@@ -532,10 +532,12 @@ The surface climatological data is located here `./fix/fix_sfc_climo <https://no
              * 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
              * 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 CONUS 0.01-degree - vegetation_type.viirs.igbp.conus.0.01.nc
+             * NESDIS VIIRS-based N HEMIS 30-second - vegetation_type.viirs.igbp.nh.30s.nc
+             * NESDIS VIIRS-based CONUS 30-second - vegetation_type.viirs.igbp.conus.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
@@ -80,11 +80,13 @@ export veg_type_src="modis.igbp.0.05" #  veg type data.
                                 # 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.conus.0.01" for regional 1km 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
                                 # 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.0.01" for regional 1km data
+                                # 3) "modis.igbp.conus.30s" for regional 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
@@ -80,11 +80,13 @@ export veg_type_src="modis.igbp.0.05" #  veg type data.
                                 # 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.conus.0.01" for regional 1km 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
                                 # 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.0.01" for regional 1km data
+                                # 3) "modis.igbp.conus.30s" for regional 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
@@ -81,11 +81,13 @@ export veg_type_src="modis.igbp.0.05" #  veg type data.
                                 # 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.conus.0.01" for regional 1km 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
                                 # 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.0.01" for regional 1km data
+                                # 3) "modis.igbp.conus.30s" for regional 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=100GB
+#PBS -l select=1:ncpus=24:mem=200GB
 
 #-----------------------------------------------------------------------
 # Driver script to create a cubic-sphere based model grid on WCOSS2.
@@ -69,7 +69,7 @@ module list
 # Set grid specs here.
 #-----------------------------------------------------------------------
 
-export gtype=uniform           # '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
@@ -78,11 +78,13 @@ export veg_type_src="modis.igbp.0.05" #  veg type data.
                                 # 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.conus.0.01" for regional 1km 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
                                 # 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.0.01" for regional 1km data
+                                # 3) "modis.igbp.conus.30s" for regional 30s data
 
 if [ $gtype = uniform ]; then
   export res=96
@@ -109,7 +111,7 @@ elif [ $gtype = nest ] || [ $gtype = regional_gfdl ]; then
 elif [ $gtype = regional_esg ] ; then
   export res=-999              # equivalent resolution is computed
   export target_lon=-97.5      # Center longitude of grid
-  export target_lat=35.5       # Center latitude of grid
+  export target_lat=35.0       # Center latitude of grid
   export idim=301              # Dimension of grid in 'i' direction
   export jdim=200              # Dimension of grid in 'j' direction
   export delx=0.0585           # Grid spacing (in degrees) in the 'i' direction

diff --git a/fix/link_fixdirs.sh b/fix/link_fixdirs.sh
@@ -50,7 +50,7 @@ fi
 
 am_ver=${am_ver:-20220805}
 orog_ver=${orog_ver:-20220805}
-sfc_climo_ver=${sfc_climo_ver:-20220805}
+sfc_climo_ver=${sfc_climo_ver:-20221017}
 
 for dir in am orog sfc_climo; do
     if [ -d $dir ]; then

diff --git a/util/sfc_climo_gen/run.wcoss2.sh b/util/sfc_climo_gen/run.wcoss2.sh
@@ -53,8 +53,11 @@ export FIX_FV3=${BASE_DIR}/fix/orog/C${res}
 export veg_type_src="viirs.igbp.0.05"    # Use global 0.05-degree viirs data
 #export veg_type_src="viirs.igbp.0.1"     # Use global 0.1-degree viirs data
 #export veg_type_src="viirs.igbp.0.03"   # Use global 0.03-degree viirs data
-#export veg_type_src="viirs.igbp.conus.0.01"   # Use CONUS 0.01-degree virrs data. Do not
-                                               # use for global grids.
+#export veg_type_src="viirs.igbp.30s"   # Use global 30s viirs data
+#export veg_type_src="viirs.igbp.nh.30s"     # Use NH 30s virrs data. Do not
+                                              # use for global grids.
+#export veg_type_src="viirs.igbp.conus.30s"   # Use CONUS 30s virrs data. Do not
+                                               # use for global grids or N Amer grids.
 
 #-------------------------------------
 # Set working directory and directory where output files will be saved.