Merge branch 'develop' into feature/stack

Fixes ufs-community#253
GeorgeGayno-NOAA · Apr 1, 2021 · 35eb1ab · 35eb1ab
2 parents 0c05c88 + 7466d6a
commit 35eb1ab
Show file tree

Hide file tree

Showing 26 changed files with 5,644 additions and 2,859 deletions.
diff --git a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml
@@ -143,6 +143,8 @@ jobs:
     - name: build-ufs-utils
       run: |
         set -x
+        mpicc --version
+        mpifort --version
         pwd
         export ESMFMKFILE=~/esmf/lib/esmf.mk
         cd ufs_utils

diff --git a/README.md b/README.md
@@ -17,12 +17,12 @@ Utility | Programmer(s)
 chgres_cube | George Gayno, Jeff Beck, Larissa Reames
 emcsfc_ice_blend | George Gayno
 emcsfc_snow2mdl | George Gayno
-fvcom_tools | David Wright, University of Michigan
-global_cycle | George Gayno, Shrinivas Moorthi
-grid_tools | R. J. Purser (regional_esg_grid), Tom Black/Ben Blake (shave.fd), Gerard Ketefian (global_equiv_resol), GFDL programmer (topo filtering code).
+fvcom_tools | David Wright, University of Michigan, Ming Hu, GSD/AMB
+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).
 orog_mask_tools | Ning Wang, Jordan Alpert, Shan Sun and Ning Wang
 sfc_climo_gen | George Gayno
-vcoord_gen | Fanglin Yang
+vcoord_gen | Fanglin Yang, Mark Iredell
 
 UFS_UTILS Code managers: George Gayno, Kyle Gerheiser
 

diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in
diff --git a/sorc/chgres_cube.fd/docs/Doxyfile.in b/sorc/chgres_cube.fd/docs/Doxyfile.in
diff --git a/sorc/chgres_cube.fd/docs/user_guide.md b/sorc/chgres_cube.fd/docs/user_guide.md
@@ -2,18 +2,18 @@
 
 # Introduction
 
-The chgres_cube program creates initial condition files to “coldstart”
+The program chgres.F90 creates initial condition files to “coldstart”
 the forecast model. The initial conditions are created from either
 Global Forecast System (GFS) gridded binary version 2 (GRIB2), NOAA
 Environmental Modeling System Input/Output (NEMSIO) data, or Network
 Common Data Form (NetCDF) data.
 
-This is part of the [NCEPLIBS
-UFS_UTILS](https://github.com/NOAA-EMC/UFS_UTILS) project.
-
-This user guide is part of the <a href="../index.html">UFS_UTILS
+This document is part of the <a href="../index.html">UFS_UTILS
 documentation</a>.
 
+The chgres_cube program is part of the [NCEPLIBS
+UFS_UTILS](https://github.com/NOAA-EMC/UFS_UTILS) project.
+
 ## Where to find GFS GRIB2, NEMSIO and NetCDF data
 
 ### GRIB2

diff --git a/sorc/emcsfc_ice_blend.fd/docs/Doxyfile.in b/sorc/emcsfc_ice_blend.fd/docs/Doxyfile.in
diff --git a/sorc/emcsfc_ice_blend.fd/docs/user_guide.md b/sorc/emcsfc_ice_blend.fd/docs/user_guide.md
@@ -3,15 +3,16 @@
 
 # Introduction
 
-Blends National Ice Center sea ice cover and EMC sea ice concentration
-data to create a global sea ice analysis used to update the GFS once
-per day.
+The emcsfc_ice_blend.f90 program blends National Ice Center sea ice
+cover and EMC sea ice concentration data to create a global sea ice
+analysis used to update the GFS once per day.
 
-This is part of the [NCEPLIBS
+This document is part of the <a href="../index.html">UFS_UTILS
+documentation</a>.
+
+The emcsfc_ice_blend program is part of the [NCEPLIBS
 UFS_UTILS](https://github.com/NOAA-EMC/UFS_UTILS) project.
 
-This is part of the <a href="../index.html">UFS_UTILS documentation</a>.
 
-The emcsfc_ice_blend code can be found here:
-https://github.com/NOAA-EMC/UFS_UTILS/tree/develop/sorc/emcsfc_ice_blend.fd.
+