Merge branch 'ufs-community:develop' into csps-rocky8

ufs-community · Oct 2, 2024 · 16cdf5e · 16cdf5e
2 parents 64b4d59 + 0c2c4b3
commit 16cdf5e
Show file tree

Hide file tree

Showing 14 changed files with 3,022 additions and 4,521 deletions.
diff --git a/docs/source/chgres_cube.rst b/docs/source/chgres_cube.rst
@@ -55,7 +55,7 @@ Program inputs and outputs for global applications
 
 **Inputs**
 
-Users may create their own global grids, or use the pre-defined files located in the `./CRES directories <https://noaa-nws-global-pds.s3.amazonaws.com/index.html#fix/orog/20231027/>`_. (where CRES is the atmospheric resolution and mxRES is the ocean resolution).
+Users may create their own global grids, or use the pre-defined files located in the `./CRES directories <https://noaa-nws-global-pds.s3.amazonaws.com/index.html#fix/orog/20240917/>`_. (where CRES is the atmospheric resolution and mxRES is the ocean resolution).
 
       * FV3 mosaic file - (NetCDF format)
 	      * CRES_mosaic.nc
@@ -76,7 +76,7 @@ Users may create their own global grids, or use the pre-defined files located in
 	      * CRES.mxRES_oro_data.tile5.nc
 	      * CRES.mxRES_oro_data.tile6.nc
 
-      * FV3 surface climatological files - Located under the `./CRES/sfc <https://noaa-nws-global-pds.s3.amazonaws.com/index.html#fix/orog/20231027/>`_ subdirectories. One file for each tile.  NetCDF format.
+      * FV3 surface climatological files - Located under the `./CRES/sfc <https://noaa-nws-global-pds.s3.amazonaws.com/index.html#fix/orog/20240917/>`_ subdirectories. One file for each tile.  NetCDF format.
 	      * CRES.mxRES.facsf.tileX.nc (fractional coverage for strong/weak zenith angle dependent albedo)
 	      * CRES.mxRES.maximum_snow_albedo.tileX.nc (maximum snow albedo)
 	      * CRES.mxRES.slope_type.tileX.nc (slope type)
@@ -86,7 +86,7 @@ Users may create their own global grids, or use the pre-defined files located in
 	      * CRES.mxRES.vegetation_greenness.tileX.nc (vegetation greenness)
 	      * CRES.mxRES.vegetation_type.tileX.nc (vegetation type)
 
-      * FV3 vertical coordinate file.  Text file.  `Located here <https://noaa-ufs-srw-pds.s3.amazonaws.com/index.html#fix/fix_am/>`_.
+      * FV3 vertical coordinate file.  Text file.  `Located here <https://noaa-nws-global-pds.s3.amazonaws.com/index.html#fix/am/20220805/>`_.
 	      * global_hyblev.l$LEVS.txt
 
       * Input data files.  GRIB2, NEMSIO or NetCDF.  See the next section for how to find this data.
@@ -257,7 +257,7 @@ The following four sets of files/directories should all be located in the same d
 	      * CRES.vegetation_greenness.tile7.halo4.nc (vegetation greenness)
 	      * CRES.vegetation_type.tile7.halo4.nc (vegetation type)
 
-      * FV3 vertical coordinate file.  Text file.  `Located here <https://noaa-ufs-srw-pds.s3.amazonaws.com/index.html#fix/fix_am/>`_.
+      * FV3 vertical coordinate file.  Text file.  `Located here <https://noaa-nws-global-pds.s3.amazonaws.com/index.html#fix/am/20220805/>`_.
 	      * global_hyblev.l$LEVS.txt
 
       * Input data files. GRIB2 only.  See the next section for how to find this data.

diff --git a/docs/source/ufs_utils.rst b/docs/source/ufs_utils.rst
@@ -240,11 +240,11 @@ Program inputs and outputs
 
       * The "grid" files (CRES_grid.tile#.nc) containing the geo-reference records for the grid - (NetCDF).  Created by the make_hgrid or regional_esg_grid programs.
       * Global 30-arc-second University of Maryland land cover data.  Used to create the land-sea mask.
-             * landcover.umd.30s.nc (NetCDF). Located here `./fix/fix_orog <https://noaa-ufs-srw-pds.s3.amazonaws.com/index.html#fix/fix_orog/>`_.
+             * landcover.umd.30s.nc (NetCDF). Located here `./fix/orog <https://noaa-nws-global-pds.s3.amazonaws.com/index.html#fix/orog/20240917/>`_.
       * Global 30-arc-second USGS GMTED2010 orography data.
-             * topography.gmted2010.30s.nc (NetCDF). Located here `./fix/fix_orog <https://noaa-ufs-srw-pds.s3.amazonaws.com/index.html#fix/fix_orog/>`_.
+             * topography.gmted2010.30s.nc (NetCDF). Located here `./fix/orog <https://noaa-nws-global-pds.s3.amazonaws.com/index.html#fix/orog/20240917/>`_.
       * 30-arc-second RAMP Antarctic terrain data (Radarsat Antarctic Mapping Project)
-             * topography.antarctica.ramp.30s.nc (NetCDF). Located here `./fix/fix_orog <https://noaa-ufs-srw-pds.s3.amazonaws.com/index.html#fix/fix_orog/>`_.
+             * topography.antarctica.ramp.30s.nc (NetCDF). Located here `./fix/orog <https://noaa-nws-global-pds.s3.amazonaws.com/index.html#fix/orog/20240917/>`_.
 
 **Output data:**  
 
@@ -288,8 +288,8 @@ The program reads the tile number (1-6 for global, 7 for stand-alone regional) a
 All in NetCDF.
 
       * The tiled "grid" files (CRES_grid.tile#.nc) created by the make_hgrid or regional_esg_grid programs.
-      * geo_em.d01.lat-lon.2.5m.HGT_M.nc - global topographic data on 2.5-minute lat-lon grid (interpolated from GMTED2010 30-second topographic data). `Located here <https://noaa-ufs-srw-pds.s3.amazonaws.com/index.html#fix/fix_am/>`_.
-      * HGT.Beljaars_filtered.lat-lon.30s_res.nc - global topographic data on 30-second lat-lon grid (GMTED2010 data smoothed according to Beljaars et al. (QJRMS, 2004)). `Located here <https://noaa-ufs-srw-pds.s3.amazonaws.com/index.html#fix/fix_am/>`_.
+      * geo_em.d01.lat-lon.2.5m.HGT_M.nc - global topographic data on 2.5-minute lat-lon grid (interpolated from GMTED2010 30-second topographic data). `Located here <https://noaa-nws-global-pds.s3.amazonaws.com/index.html#fix/orog/20240917/>`_.
+      * HGT.Beljaars_filtered.lat-lon.30s_res.nc - global topographic data on 30-second lat-lon grid (GMTED2010 data smoothed according to Beljaars et al. (QJRMS, 2004)). `Located here <https://noaa-nws-global-pds.s3.amazonaws.com/index.html#fix/orog/20240917/>`_.
 
 **Output data:**
 
@@ -375,11 +375,11 @@ Program inputs and outputs
 
       * grid file - the "grid" file from the make_hgrid or regional_esg programs  - CRES_grid.tile#.nc - (NetCDF)
       * orography file - the orography file including the 'inland' flag record from the inland program - oro.CRES.tile#.nc (NetCDF)
-      * lake status code file - One of the following files. (located in `./fix/fix_orog <https://noaa-ufs-srw-pds.s3.amazonaws.com/index.html#fix/fix_orog/>`_). See GlobalLakeStatus.txt for a description of the file format.
+      * lake status code file - One of the following files. (located in `./fix/orog <https://noaa-nws-global-pds.s3.amazonaws.com/index.html#fix/orog/20240917/>`_).
           * GlobalLakeStatus_MOSISp.dat
           * GlobalLakeStatus_GLDBv3release.dat
           * GlobalLakeStatus_VIIRS.dat
-      * lake depth file - One of the following files. (located in `./fix/fix_orog <https://noaa-ufs-srw-pds.s3.amazonaws.com/index.html#fix/fix_orog/>`_). See GlobalLakeDepth.txt for a description of this file.
+      * lake depth file - One of the following files. (located in `./fix/orog <https://noaa-nws-global-pds.s3.amazonaws.com/index.html#fix/orog/20240917/>`_).
           * GlobalLakeDepth_GLDBv3release.dat
           * GlobalLakeDepth_GLOBathy.dat
 
@@ -529,7 +529,7 @@ Program inputs and outputs
 
 **Input data:** 
 
-The surface climatological data is located here `./fix/fix_sfc_climo <https://noaa-ufs-srw-pds.s3.amazonaws.com/index.html#fix/fix_sfc_climo/>`_.  All NetCDF.
+The surface climatological data is located here `./fix/sfc_climo <https://noaa-nws-global-pds.s3.amazonaws.com/index.html#fix/sfc_climo/20230925/>`_.  All NetCDF.
 
       * Global 1-degree fractional coverage strong/weak zenith angle albedo - facsf.1.0.nc
       * Global 0.05-degree maximum snow albedo - maximum_snow_albedo.0.05.nc
@@ -697,7 +697,7 @@ Invoke the build script from the root directory:
 
   ./build_all.sh
 
-Set the 'fixed' directories using the script in the './fix' subdirectory (where $MACHINE is 'hera', 'jet', 'wcoss2', or 's4'):
+Set the 'fixed' directories using the script in the './fix' subdirectory (where $MACHINE is 'hera', 'jet', 'orion', 'hercules', 'gaea', 'wcoss2', or 's4'):
 
 ::
 

diff --git a/fix/link_fixdirs.sh b/fix/link_fixdirs.sh
@@ -59,20 +59,16 @@ elif [ $machine = "gaea" ]; then
 fi
 
 am_ver=${am_ver:-20220805}
-orog_ver=${orog_ver:-20231027}
+orog_ver=${orog_ver:-20240917}
 sfc_climo_ver=${sfc_climo_ver:-20230925}
 
-for dir in am orog orog_raw sfc_climo; do
+for dir in am orog sfc_climo; do
     if [ -d $dir ]; then
       [[ $RUN_ENVIR = nco ]] && chmod -R 755 $dir
       rm -rf $dir
     fi
-    if [ $dir = "orog_raw" ]; then
-      $LINK $FIX_DIR/raw/orog ${dir}
-    else
-      fix_ver="${dir}_ver"
-      $LINK $FIX_DIR/$dir/${!fix_ver} ${dir}
-    fi
+    fix_ver="${dir}_ver"
+    $LINK $FIX_DIR/$dir/${!fix_ver} ${dir}
 done
 
 exit 0
diff --git a/sorc/orog_mask_tools.fd/orog.fd/CMakeLists.txt b/sorc/orog_mask_tools.fd/orog.fd/CMakeLists.txt
@@ -1,5 +1,5 @@
-set(lib_src netcdf_io.F90)
-set(exe_src mtnlm7_oclsm.F)
+set(lib_src io_utils.F90 orog_utils.F90)
+set(exe_src mtnlm7_oclsm.F90)
 
 if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -r8 -convert big_endian -assume byterecl")
@@ -9,14 +9,11 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$")
     set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-invalid-boz")
   endif()
 endif()
-if(ip_VERSION GREATER_EQUAL 4.0.0)
-  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -DIP_V4")
-endif()
 
 set(exe_name orog)
 
 add_library(orog_lib STATIC ${lib_src})
-add_executable(${exe_name} mtnlm7_oclsm.F)
+add_executable(${exe_name} mtnlm7_oclsm.F90)
 
 set(mod_dir "${CMAKE_CURRENT_BINARY_DIR}/mod")
 set_target_properties(orog_lib PROPERTIES Fortran_MODULE_DIRECTORY ${mod_dir})
@@ -27,13 +24,8 @@ target_link_libraries(
   PUBLIC
   bacio::bacio_4
   w3emc::w3emc_d
-  ip::ip_d
   NetCDF::NetCDF_Fortran)
 
-if(sp_FOUND)
-  target_link_libraries(orog_lib PUBLIC sp::sp_d)
-endif()
-
 if(OpenMP_Fortran_FOUND)
   target_link_libraries(orog_lib PUBLIC OpenMP::OpenMP_Fortran)
 endif()