Add WW3 grid aliases and metis library

pgf · Aug 25, 2023 · dd67bb3 · dd67bb3
1 parent 2193ce2
commit dd67bb3
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 1 deletion.
diff --git a/component_grids_nuopc.xml b/component_grids_nuopc.xml
@@ -509,6 +509,18 @@
     <desc>wtx0.66v1 is tripole v1 0.66-deg WW3 grid based on MOM6 grid</desc>
     <support>MOM6 tx0.66v1-based WW3 grid where cells above 88N are masked</support>
   </domain>
+  <domain name="wtnx1v4">
+    <nx>360</nx> <ny>384</ny>
+    <mesh>$DIN_LOC_ROOT/share/meshes/wtnx1v4_20170601_cdf5_ESMFmesh.nc</mesh>
+    <desc>tnx1v4 is tripole v4 1-deg BLOM grid:</desc>
+    <support>Experimental for BLOM experiments</support>
+  </domain>
+  <domain name="w025">
+    <nx>1169869</nx> <ny>1</ny>
+    <mesh>$DIN_LOC_ROOT/share/meshes/w025_ESMFmesh_cdf5_c20230707.nc</mesh>
+    <desc>1/4 degree unstructured mesh</desc>
+    <support>Experimental for Making Waves experiments</support>
+  </domain>
 
   <!-- ======================================================== -->
   <!-- ATM/LND domains for single point cmeps driver -->

diff --git 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
@@ -2319,6 +2319,8 @@ This allows using a different mpirun command to launch unit tests
           <command name="load">intel-2021.6.0/libarchive/3.5.2-5bbgw</command>
 	  <command name="load">intel-2021.6.0/impi-2021.6.0/parallelio/2.6.0-tc4q3</command> 
           <command name="load">intel-2021.6.0/libuv/1.44.1-v7e5k</command>
+          <command name="load">intel-2021.6.0/metis/5.1.0-z5fvk</command>
+          <command name="load">intel-2021.6.0/impi-2021.6.0/parmetis/4.0.3-ocsgn</command>
       </modules>
       <modules compiler="intel" DEBUG="TRUE"> 
 	      <command name="load">intel-2021.6.0/impi-2021.6.0/esmf-dbg/8.4.2-pioext_2.6.0-o5yu4</command>  

diff --git a/modelgrid_aliases_nuopc.xml b/modelgrid_aliases_nuopc.xml
@@ -1418,4 +1418,44 @@
     <grid name="wav">ww3a</grid>
   </model_grid>
 
+  <model_grid alias="TL319_wtn14" not_compset="_CAM|_MOM|_POP|_NEMO">
+    <grid name="atm">TL319</grid>
+    <grid name="wav">wtnx1v4</grid>
+    <mask>wtnx1v4</mask>
+  </model_grid>  
+
+  <model_grid alias="TL319_w025" not_compset="_CAM|_MOM|_POP|_NEMO">
+    <grid name="atm">TL319</grid>
+    <grid name="wav">w025</grid>
+    <mask>w025</mask>
+  </model_grid>
+
+  <model_grid alias="TL639_w025" not_compset="_CAM|_MOM|_POP|_NEMO">
+    <grid name="atm">TL639</grid>
+    <grid name="wav">w025</grid>
+    <mask>w025</mask>
+  </model_grid>
+
+  <model_grid alias="T62_wtn14" not_compset="_CAM|_MOM|_POP|_NEMO">
+    <grid name="atm">T62</grid>
+    <grid name="wav">wtnx1v4</grid>
+    <mask>wtnx1v4</mask>
+  </model_grid>
+
+  <model_grid alias="T62_w025" not_compset="_CAM|_MOM|_POP|_NEMO">
+    <grid name="atm">T62</grid>
+    <grid name="wav">w025</grid>
+    <mask>w025</mask>
+  </model_grid>
+
+  <!-- CMCC-CM ww3 testing configurations WITH ocean-->
+
+  <model_grid alias="TL639_n0253_w025" not_compset="_CAM">
+    <grid name="atm">TL639</grid>
+    <grid name="ocnice">tn0.25v3</grid>
+    <grid name="wav">w025</grid>
+    <grid name="rof">JRA025</grid>
+    <mask>tn0.25v3</mask>
+  </model_grid>
+
 </grids>