Sync WW3 develop with dev/ufs-weather-model, Oct 12th 2022 (ufs-commu…

…nity#1454) * Sync WW3 develop with dev/ufs-weather-model, Oct 12th 2022 * fix needed for cheyenne lmod update * Update fv3_qsub.IN_cheyenne * acorn intel lua cray-mpich update * acorn intel debug lua cray mpich update Co-authored-by: Brian Curtis <[email protected]> Co-authored-by: jkbk2004 <[email protected]>
Qingfu-Liu · Oct 26, 2022 · 5ac19d4 · 5ac19d4
1 parent 6b73f5d
commit 5ac19d4
Show file tree

Hide file tree

Showing 14 changed files with 5,221 additions and 5,067 deletions.
diff --git a/WW3 b/WW3
diff --git a/modulefiles/ufs_acorn.intel.lua b/modulefiles/ufs_acorn.intel.lua
@@ -11,7 +11,7 @@ load(pathJoin("intel", intel_ver))
 craype_ver=os.getenv("craype_ver") or "2.7.13"
 load(pathJoin("craype", craype_ver))
 
-cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.7"
+cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.9"
 load(pathJoin("cray-mpich", cray_mpich_ver))
 
 cmake_ver=os.getenv("cmake_ver") or "3.20.2"
@@ -21,7 +21,7 @@ prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/hpc-stack/libs/hpc-stac
 
 hpc_ver=os.getenv("hpc_ver") or "1.2.0"
 hpc_intel_ver=os.getenv("hpc_intel_ver") or "19.1.3.304"
-hpc_cray_mpich_ver=os.getenv("hpc_cray_mpich_ver") or "8.1.7"
+hpc_cray_mpich_ver=os.getenv("hpc_cray_mpich_ver") or "8.1.9"
 load(pathJoin("hpc", hpc_ver))
 load(pathJoin("hpc-intel", hpc_intel_ver))
 load(pathJoin("hpc-cray-mpich", hpc_cray_mpich_ver))

diff --git a/modulefiles/ufs_acorn.intel_debug.lua b/modulefiles/ufs_acorn.intel_debug.lua
@@ -11,7 +11,7 @@ load(pathJoin("intel", intel_ver))
 craype_ver=os.getenv("craype_ver") or "2.7.13"
 load(pathJoin("craype", craype_ver))
 
-cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.7"
+cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.9"
 load(pathJoin("cray-mpich", cray_mpich_ver))
 
 cmake_ver=os.getenv("cmake_ver") or "3.20.2"
@@ -21,7 +21,7 @@ prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/hpc-stack/libs/hpc-stac
 
 hpc_ver=os.getenv("hpc_ver") or "1.2.0"
 hpc_intel_ver=os.getenv("hpc_intel_ver") or "19.1.3.304"
-hpc_cray_mpich_ver=os.getenv("hpc_cray_mpich_ver") or "8.1.7"
+hpc_cray_mpich_ver=os.getenv("hpc_cray_mpich_ver") or "8.1.9"
 load(pathJoin("hpc", hpc_ver))
 load(pathJoin("hpc-intel", hpc_intel_ver))
 load(pathJoin("hpc-cray-mpich", hpc_cray_mpich_ver))

diff --git a/tests/RegressionTests_acorn.intel.log b/tests/RegressionTests_acorn.intel.log
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss2.intel.log b/tests/RegressionTests_wcoss2.intel.log
diff --git a/tests/fv3_conf/fv3_qsub.IN_cheyenne b/tests/fv3_conf/fv3_qsub.IN_cheyenne
@@ -13,7 +13,11 @@ echo -n " $( date +%s )," >  job_timestamp.txt
 set +x
 MACHINE_ID=cheyenne
 source ./module-setup.sh
-module use $( pwd -P )
+if [[ ! -d modulefiles ]]; then
+  mkdir modulefiles
+  mv *.lua modulefiles
+fi
+module use modulefiles
 module load modules.fv3
 module list
 set -x

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -443,7 +443,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20221017
+BL_DATE=20221024
 
 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
+1 −1		.github/workflows/gnu.yml
+1 −1		.github/workflows/intel.yml
+718 −42		docs/ww3_doxy_tmpl.md
+3 −3		manual/run/ww3_uprstr.tex
+2 −2		model/src/PDLIB/yowelementpool.F90
+2 −2		model/src/PDLIB/yowerr.F90
+10 −10		model/src/PDLIB/yowexchangeModule.F90
+4 −4		model/src/PDLIB/yowfunction.F90
+6 −6		model/src/PDLIB/yownodepool.F90
+9 −9		model/src/PDLIB/yowpdlibmain.F90
+6 −6		model/src/PDLIB/yowrankModule.F90
+3 −3		model/src/cmake/switches.json
+131 −94		model/src/constants.F90
+1 −1		model/src/ctest.F90
+1 −1		model/src/gx_outf.F90
+0 −3		model/src/gx_outp.F90
+33 −14		model/src/mod_constants.f90
+93 −36		model/src/mod_fileio.f90
+958 −354		model/src/mod_xnl4v5.f90
+4 −241		model/src/pdlib_field_vec.F90
+103 −46		model/src/w3adatmd.F90
+40 −0		model/src/w3agcmmd.F90
+44 −0		model/src/w3bullmd.F90
+43 −0		model/src/w3cspcmd.F90
+8 −49		model/src/w3fldsmd.F90
+32 −0		model/src/w3flx1md.F90
+34 −0		model/src/w3flx2md.F90
+38 −0		model/src/w3flx3md.F90
+43 −0		model/src/w3flx4md.F90
+54 −0		model/src/w3flx5md.F90
+2 −4		model/src/w3gdatmd.F90
+31 −137		model/src/w3gridmd.F90
+48 −0		model/src/w3idatmd.F90
+28 −0		model/src/w3igcmmd.F90
+90 −332		model/src/w3initmd.F90
+31 −4		model/src/w3iobcmd.F90
+166 −234		model/src/w3iogomd.F90
+1 −1		model/src/w3iogoncdmd.F90
+33 −176		model/src/w3iogrmd.F90
+51 −0		model/src/w3iopomd.F90
+46 −172		model/src/w3iorsmd.F90
+34 −0		model/src/w3iosfmd.F90
+35 −0		model/src/w3iotrmd.F90
+6 −6		model/src/w3meminfo.F90
+18 −113		model/src/w3parall.F90
+3 −3		model/src/w3partmd.F90
+198 −198		model/src/w3profsmd.F90
+302 −971		model/src/w3profsmd_pdlib.F90
+0 −7		model/src/w3psmcmd.F90
+49 −0		model/src/w3sbs1md.F90
+0 −10		model/src/w3sdb1md.F90
+8 −28		model/src/w3servmd.F90
+1 −1		model/src/w3sic3md.F90
+0 −7		model/src/w3snl1md.F90
+115 −130		model/src/w3snl4md.F90
+25 −0		model/src/w3src0md.F90
+51 −0		model/src/w3src1md.F90
+100 −0		model/src/w3src2md.F90
+2 −2		model/src/w3src3md.F90
+2 −2		model/src/w3srcemd.F90
+77 −0		model/src/w3str1md.F90
+39 −0		model/src/w3str2md.F90
+5 −0		model/src/w3strkmd.F90
+64 −0		model/src/w3swldmd.F90
+83 −81		model/src/w3tidemd.F90
+11 −106		model/src/w3triamd.F90
+89 −7		model/src/w3uno2md.F90
+4 −60		model/src/w3updtmd.F90
+110 −0		model/src/w3uqckmd.F90
+140 −596		model/src/w3wavemd.F90
+340 −49		model/src/w3wavset.F90
+46 −0		model/src/w3wdasmd.F90
+50 −110		model/src/w3wdatmd.F90
+4 −12		model/src/wminiomd.F90
+17 −42		model/src/wminitmd.F90
+2 −2		model/src/wmscrpmd.F90
+61 −58		model/src/wmwavemd.F90
+3 −1		model/src/ww3_gspl.F90
+0 −48		model/src/ww3_ounf.F90
+13 −7		model/src/ww3_ounp.F90
+1 −1		model/src/ww3_outf.F90
+16 −8		model/src/ww3_outp.F90
+5 −2		model/src/ww3_prtide.F90
+0 −174		model/src/ww3_shel.F90
+0 −33		model/src/ww3_strt.F90
+1 −1		model/src/ww3_trnc.F90
+1 −1		regtests/ww3_tnc1/input/switch
+1 −1		regtests/ww3_tp2.16/input/switch_MPI
+1 −1		regtests/ww3_tp2.16/input/switch_MPI_OMPH
+1 −1		regtests/ww3_tp2.16/input/ww3_ounf.nml
+1 −1		regtests/ww3_ts4/input_rg_multi/switch_MPI