diff --git a/component_grids_nuopc.xml b/component_grids_nuopc.xml index 7f86f782..d5f17bf6 100644 --- a/component_grids_nuopc.xml +++ b/component_grids_nuopc.xml @@ -509,6 +509,18 @@ wtx0.66v1 is tripole v1 0.66-deg WW3 grid based on MOM6 grid MOM6 tx0.66v1-based WW3 grid where cells above 88N are masked + + 360 384 + $DIN_LOC_ROOT/share/meshes/wtnx1v4_20170601_cdf5_ESMFmesh.nc + tnx1v4 is tripole v4 1-deg BLOM grid: + Experimental for BLOM experiments + + + 1169869 1 + $DIN_LOC_ROOT/share/meshes/w025_ESMFmesh_cdf5_c20230707.nc + 1/4 degree unstructured mesh + Experimental for Making Waves experiments + diff --git a/machines/cmake_macros/intel_juno.cmake b/machines/cmake_macros/intel_juno.cmake index a3ca2d4a..cd90c25e 100644 --- a/machines/cmake_macros/intel_juno.cmake +++ b/machines/cmake_macros/intel_juno.cmake @@ -4,7 +4,7 @@ if (MPILIB STREQUAL impi) string(APPEND FFLAGS " -qmkl=cluster -march=icelake-client -mtune=icelake-client -qopt-zmm-usage=high -no-fma ") string(APPEND CFLAGS " -qmkl=cluster -march=icelake-client -mtune=icelake-client -qopt-zmm-usage=high -no-fma ") string(APPEND LDFLAGS " -L/juno/opt/spacks/0.20.0/opt/spack/linux-rhel8-icelake/intel-2021.6.0/xerces-c/3.2.3-witntw6kh77tp7mqhlrvpk2ezimigecm/lib/ -lxerces-c ") - string(APPEND SLIBS " -qmkl=cluster -lstdc++") + string(APPEND SLIBS " -qmkl=cluster -lstdc++ -l:libparmetis.a -l:libmetis.a ") endif() set(MPICC "mpiicc") set(MPICXX "mpiicpc") diff --git a/machines/config_machines.xml b/machines/config_machines.xml index e272504f..b8db632c 100644 --- a/machines/config_machines.xml +++ b/machines/config_machines.xml @@ -2319,6 +2319,8 @@ This allows using a different mpirun command to launch unit tests intel-2021.6.0/libarchive/3.5.2-5bbgw intel-2021.6.0/impi-2021.6.0/parallelio/2.6.0-tc4q3 intel-2021.6.0/libuv/1.44.1-v7e5k + intel-2021.6.0/metis/5.1.0-z5fvk + intel-2021.6.0/impi-2021.6.0/parmetis/4.0.3-ocsgn intel-2021.6.0/impi-2021.6.0/esmf-dbg/8.4.2-pioext_2.6.0-o5yu4 diff --git a/modelgrid_aliases_nuopc.xml b/modelgrid_aliases_nuopc.xml index 2accc7c5..210e949b 100644 --- a/modelgrid_aliases_nuopc.xml +++ b/modelgrid_aliases_nuopc.xml @@ -1418,4 +1418,44 @@ ww3a + + TL319 + wtnx1v4 + wtnx1v4 + + + + TL319 + w025 + w025 + + + + TL639 + w025 + w025 + + + + T62 + wtnx1v4 + wtnx1v4 + + + + T62 + w025 + w025 + + + + + + TL639 + tn0.25v3 + w025 + JRA025 + tn0.25v3 + +