Merge branch 'develop' into feature/sfcsub_ccpp

Fixes ufs-community#424.
GeorgeGayno-NOAA · Mar 23, 2022 · bdcdb38 · bdcdb38
2 parents 80f9224 + 4fdee55
commit bdcdb38
Show file tree

Hide file tree

Showing 18 changed files with 2,277 additions and 958 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -69,7 +69,7 @@ find_package(nemsio 2.5.0 REQUIRED)
 find_package(sigio 2.3.0 REQUIRED)
 find_package(sp 2.3.3 REQUIRED)
 find_package(ip 3.3.3 REQUIRED)
-find_package(g2 3.4.0 REQUIRED)
+find_package(g2 3.4.3 REQUIRED)
 find_package(wgrib2 2.0.8 REQUIRED)
 find_package(sigio 2.3.0 REQUIRED)
 

diff --git a/modulefiles/build.hera.gnu.lua b/modulefiles/build.hera.gnu.lua
@@ -28,7 +28,7 @@ load(pathJoin("esmf", esmf_ver))
 bacio_ver=os.getenv("bacio_ver") or "2.4.1"
 load(pathJoin("bacio", bacio_ver))
 
-g2_ver=os.getenv("g2_ver") or "3.4.1"
+g2_ver=os.getenv("g2_ver") or "3.4.3"
 load(pathJoin("g2", g2_ver))
 
 ip_ver=os.getenv("ip_ver") or "3.3.3"

diff --git a/modulefiles/build.hera.intel.lua b/modulefiles/build.hera.intel.lua
@@ -22,7 +22,7 @@ load(pathJoin("hpc-impi", impi_ver))
 bacio_ver=os.getenv("bacio_ver") or "2.4.1"
 load(pathJoin("bacio", bacio_ver))
 
-g2_ver=os.getenv("g2_ver") or "3.4.1"
+g2_ver=os.getenv("g2_ver") or "3.4.3"
 load(pathJoin("g2", g2_ver))
 
 ip_ver=os.getenv("ip_ver") or "3.3.3"

diff --git a/modulefiles/build.jet.intel.lua b/modulefiles/build.jet.intel.lua
@@ -52,7 +52,7 @@ load(pathJoin("sfcio", sfcio_ver))
 nemsio_ver=os.getenv("nemsio_ver") or "2.5.2"
 load(pathJoin("nemsio", nemsio_ver))
 
-g2_ver=os.getenv("g2_ver") or "3.4.1"
+g2_ver=os.getenv("g2_ver") or "3.4.3"
 load(pathJoin("g2", g2_ver))
 
 wgrib2_ver=os.getenv("wgrib2_ver") or "2.0.8"

diff --git a/modulefiles/build.orion.intel.lua b/modulefiles/build.orion.intel.lua
@@ -19,7 +19,7 @@ load(pathJoin("hpc-impi", impi_ver))
 bacio_ver=os.getenv("bacio_ver") or "2.4.1"
 load(pathJoin("bacio", bacio_ver))
 
-g2_ver=os.getenv("g2_ver") or "3.4.1"
+g2_ver=os.getenv("g2_ver") or "3.4.3"
 load(pathJoin("g2", g2_ver))
 
 ip_ver=os.getenv("ip_ver") or "3.3.3"

diff --git a/modulefiles/build.wcoss_cray.intel b/modulefiles/build.wcoss_cray.intel
@@ -18,7 +18,6 @@ module load cray-hdf5/1.8.14
 
 module use /usrx/local/nceplibs/NCEPLIBS/cmake/install/NCEPLIBS-v1.3.0/modules
 module load bacio/2.4.1
-module load g2/3.4.1
 module load ip/3.3.3
 module load nemsio/2.5.2
 module load sp/2.3.3
@@ -31,7 +30,11 @@ setenv ZLIB_ROOT /usrx/local/prod/zlib/1.2.7/intel/haswell
 setenv PNG_ROOT /usrx/local/prod/png/1.2.49/intel/haswell
 setenv Jasper_ROOT /usrx/local/prod/jasper/1.900.1/intel/haswell
 
+module use /usrx/local/nceplibs/NCEPLIBS/cmake/install/NCEPLIBS-v1.4.0/modules
+module load g2/3.4.5
+
 module load esmf/820
+
 setenv NETCDF /opt/cray/netcdf/4.3.3.1/INTEL/14.0
 module rm gcc
 module load gcc/6.3.0
diff --git a/modulefiles/build.wcoss_dell_p3.intel.lua b/modulefiles/build.wcoss_dell_p3.intel.lua
@@ -43,7 +43,7 @@ load(pathJoin("esmf", esmf_ver))
 bacio_ver=os.getenv("bacio_ver") or "2.4.1"
 load(pathJoin("bacio", bacio_ver))
 
-g2_ver=os.getenv("g2_ver") or "3.4.2"
+g2_ver=os.getenv("g2_ver") or "3.4.5"
 load(pathJoin("g2", g2_ver))
 
 ip_ver=os.getenv("ip_ver") or "3.3.3"

diff --git a/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh b/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh
@@ -76,7 +76,7 @@ bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J chgres01 -W 0:05 -x
 
 LOG_FILE=consistency.log02
 export OMP_NUM_THREADS=1
-bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J chgres02 -W 0:07 -x -n 6 \
+bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J chgres02 -W 0:10 -x -n 6 \
         -R "span[ptile=6]" -R "affinity[core(${OMP_NUM_THREADS}):distribute=balance]" "$PWD/3km.conus.hrrr.gfssdf.grib2.sh"
 
 #-----------------------------------------------------------------------------
@@ -103,7 +103,7 @@ bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J chgres04 -W 0:05 -x
 
 LOG_FILE=consistency.log05
 export OMP_NUM_THREADS=1
-bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J chgres05 -W 0:05 -x -n 6 \
+bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J chgres05 -W 0:10 -x -n 6 \
         -R "span[ptile=6]" -R "affinity[core(${OMP_NUM_THREADS}):distribute=balance]" "$PWD/13km.conus.rap.grib2.sh"
 
 #-----------------------------------------------------------------------------

diff --git a/sorc/chgres_cube.fd/CMakeLists.txt b/sorc/chgres_cube.fd/CMakeLists.txt
@@ -42,6 +42,7 @@ target_include_directories(chgres_cube_lib INTERFACE ${mod_dir})
 target_link_libraries(
   chgres_cube_lib
   PUBLIC
+  g2::g2_d
   nemsio::nemsio
   sfcio::sfcio
   sigio::sigio