Add mesh based cap for use by S2SW and HAFSW

.gitmodules

@@ -40,5 +40,5 @@
   branch = develop
 [submodule "AQM"]
   path = AQM
-  url = https://github.com/NOAA-EMC/AQM 
+  url = https://github.com/NOAA-EMC/AQM
   branch = develop

CMakeLists.txt

@@ -164,9 +164,15 @@ endif()
 ### Wave components [WW3]
 ###############################################################################
 if(WW3)
-  # Set options for WW3 build
-  set(SWITCH "multi_esmf" CACHE STRING "Default to switch_multi_esmf")
-  set(MULTI_ESMF ON CACHE BOOL "Enable ESMF for WW3")
+  if(APP MATCHES "^(ATMW)$")
+    set(SWITCH "multi_esmf" CACHE STRING "ESMF cap")
+    set(UFS_CAP "MULTI_ESMF" CACHE STRING "Build with MULTI_ESMF cap")
+    list(APPEND _ufs_defs_private FRONT_WW3=WMESMFMD)
+  else()
+    set(SWITCH "meshcap" CACHE STRING "NUOPC mesh cap")
+    set(UFS_CAP "NUOPC_MESH" CACHE STRING "Build with NUOPC_MESH cap")
+    list(APPEND _ufs_defs_private FRONT_WW3=wav_comp_nuopc)
+  endif()
   add_subdirectory(WW3)
 endif()
 
@@ -225,7 +231,6 @@ if(UFS_GOCART)
 endif()
 
 if(WW3)
-  list(APPEND _ufs_defs_private FRONT_WW3=WMESMFMD)
   target_link_libraries(ufs PUBLIC WW3::WW3)
 endif()
 

tests/OpnReqTests_cpld_bmark_p8_hera.intel.log

@@ -1,15 +1,14 @@
-Fri Jan  7 16:13:28 UTC 2022
+Thu May 26 16:42:22 UTC 2022
 Start Operation Requirement Test
 
-Compile std elapsed time 431 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_p7_rrtmgp,FV3_GFS_v16_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile std elapsed time 549 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_bmark_p8_std_base
-working dir  = /scratch1/NCEPDEV/stmp2/Denise.Worthen/FV3_OPNREQ_TEST/opnReqTest_21817/cpld_bmark_p8_dcp
+baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_bmark_p8_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_11070/cpld_bmark_p8_dcp
 Checking test dcp cpld_bmark_p8 results ....
  Comparing sfcf006.nc .........OK
  Comparing atmf006.nc .........OK
- Comparing 20130401.060000.out_grd.gwes_30m .........OK
- Comparing 20130401.060000.out_pnt.points .........OK
+ Comparing gocart.inst_aod.20130401_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -48,21 +47,75 @@ Checking test dcp cpld_bmark_p8 results ....
  Comparing RESTART/MOM.res_3.nc .........OK
  Comparing RESTART/iced.2013-04-01-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
+ Comparing 20130401.060000.out_pnt.ww3 .........OK
+ Comparing 20130401.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 1061.233846
-  0: The maximum resident set size (KB)                   = 1396392
+  0: The total amount of wall time                        = 1212.457555
+  0: The maximum resident set size (KB)                   = 5658120
 
 Test dcp cpld_bmark_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_bmark_p8_std_base
-working dir  = /scratch1/NCEPDEV/stmp2/Denise.Worthen/FV3_OPNREQ_TEST/opnReqTest_21817/cpld_bmark_p8_std_base
+baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_bmark_p8_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_11070/cpld_bmark_p8_rst
+Checking test rst cpld_bmark_p8 results ....
+ Comparing 20130401.060000.out_grd.ww3 .........OK
+ Comparing 20130401.060000.out_pnt.ww3 .........OK
+ Comparing atmf006.nc .........OK
+ Comparing gocart.inst_aod.20130401_0600z.nc4 .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc .........OK
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/iced.2013-04-01-21600.nc .........OK
+ Comparing RESTART/MOM.res_1.nc .........OK
+ Comparing RESTART/MOM.res_2.nc .........OK
+ Comparing RESTART/MOM.res_3.nc .........OK
+ Comparing RESTART/MOM.res.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
+ Comparing sfcf006.nc .........OK
+
+  0: The total amount of wall time                        = 757.420850
+  0: The maximum resident set size (KB)                   = 5615572
+
+Test rst cpld_bmark_p8 PASS
+
+
+baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_bmark_p8_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_11070/cpld_bmark_p8_std_base
 Checking test std_base cpld_bmark_p8 results ....
 Moving baseline std_base cpld_bmark_p8 files ....
  Moving sfcf006.nc .........OK
  Moving atmf006.nc .........OK
- Moving 20130401.060000.out_grd.gwes_30m .........OK
- Moving 20130401.060000.out_pnt.points .........OK
+ Moving gocart.inst_aod.20130401_0600z.nc4 .........OK
  Moving RESTART/coupler.res .........OK
  Moving RESTART/fv_core.res.nc .........OK
  Moving RESTART/fv_core.res.tile1.nc .........OK
@@ -101,20 +154,21 @@ Moving baseline std_base cpld_bmark_p8 files ....
  Moving RESTART/MOM.res_3.nc .........OK
  Moving RESTART/iced.2013-04-01-21600.nc .........OK
  Moving RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
+ Moving 20130401.060000.out_pnt.ww3 .........OK
+ Moving 20130401.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 1081.300718
-  0: The maximum resident set size (KB)                   = 1401732
+  0: The total amount of wall time                        = 1206.188040
+  0: The maximum resident set size (KB)                   = 5654532
 
 Test std_base cpld_bmark_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_bmark_p8_std_base
-working dir  = /scratch1/NCEPDEV/stmp2/Denise.Worthen/FV3_OPNREQ_TEST/opnReqTest_21817/cpld_bmark_p8_thr
+baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_bmark_p8_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_11070/cpld_bmark_p8_thr
 Checking test thr cpld_bmark_p8 results ....
  Comparing sfcf006.nc .........OK
  Comparing atmf006.nc .........OK
- Comparing 20130401.060000.out_grd.gwes_30m .........OK
- Comparing 20130401.060000.out_pnt.points .........OK
+ Comparing gocart.inst_aod.20130401_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -153,12 +207,14 @@ Checking test thr cpld_bmark_p8 results ....
  Comparing RESTART/MOM.res_3.nc .........OK
  Comparing RESTART/iced.2013-04-01-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
+ Comparing 20130401.060000.out_pnt.ww3 .........OK
+ Comparing 20130401.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 865.097270
-  0: The maximum resident set size (KB)                   = 1378960
+  0: The total amount of wall time                        = 1140.976795
+  0: The maximum resident set size (KB)                   = 5940432
 
 Test thr cpld_bmark_p8 PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Fri Jan  7 17:32:38 UTC 2022
-Elapsed time: 01h:19m:11s. Have a nice day!
+Thu May 26 18:03:46 UTC 2022
+Elapsed time: 01h:21m:25s. Have a nice day!