Combined PR: NEMS Driver cleanup (#533), Wave update (#542), add CPLD&DATM tests on Jet (#545)

.gitmodules

@@ -4,8 +4,10 @@
   branch = develop
 [submodule "NEMS"]
   path = NEMS
-  url = https://github.com/NOAA-EMC/NEMS
-  branch = develop
+  #url = https://github.com/NOAA-EMC/NEMS
+  #branch = develop
+  url = https://github.com/DeniseWorthen/NEMS
+  branch = feature/nemsdriver_cleanup
 [submodule "FMS"]
   path = FMS
   url = https://github.com/NOAA-GFDL/FMS

CMakeLists.txt

@@ -247,12 +247,7 @@ endif()
 ### UFS Library [NEMS]
 ###############################################################################
 list(APPEND _nems_srcs NEMS/src/module_NEMS_UTILS.F90
-                       NEMS/src/module_MEDIATOR_methods.F90
-                       NEMS/src/module_MEDIATOR.F90
-                       NEMS/src/module_MEDIATOR_SpaceWeather.F90
-                       NEMS/src/module_EARTH_INTERNAL_STATE.F90
                        NEMS/src/module_EARTH_GRID_COMP.F90
-                       NEMS/src/module_NEMS_INTERNAL_STATE.F90
                        NEMS/src/module_NEMS_GRID_COMP.F90
                        NEMS/src/module_NEMS_Rusage.F90
                        NEMS/src/nems_c_rusage.c)

modulefiles/ufs_gaea.intel

@@ -22,6 +22,9 @@ setenv CMAKE_CXX_COMPILER CC
 setenv CMAKE_Fortran_COMPILER ftn
 setenv CMAKE_Platform gaea.intel
 
+#needed for WW3 build
+module load gcc/8.3.0
+
 module use /lustre/f2/pdata/esrl/gsd/ufs/hpc-stack-v1.1.0/modulefiles/stack
 
 module load hpc/1.1.0

tests/default_vars.sh

@@ -161,6 +161,42 @@ elif [[ $MACHINE_ID = jet.* ]]; then
   TASKS_stretch=48 ; TPN_stretch=12 ; INPES_stretch=2 ; JNPES_stretch=4
   TASKS_strnest=96 ; TPN_strnest=12 ; INPES_strnest=2 ; JNPES_strnest=4
 
+  TASKS_cpl_dflt=192; TPN_cpl_dflt=24; INPES_cpl_dflt=3; JNPES_cpl_dflt=8
+  THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
+  OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
+
+  TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=24; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6;  MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149"
+  OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203"
+
+  TASKS_cpl_thrd=120; TPN_cpl_thrd=18; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
+  THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
+  OPB_cpl_thrd="78 107";  IPB_cpl_thrd="108 119"
+
+  TASKS_cpl_bmrk=480; TPN_cpl_bmrk=24; INPES_cpl_bmrk=6; JNPES_cpl_bmrk=8
+  THRD_cpl_bmrk=1; WPG_cpl_bmrk=24; MPB_cpl_bmrk="0 287"; APB_cpl_bmrk="0 311"
+  OPB_cpl_bmrk="312 431"; IPB_cpl_bmrk="432 479"
+
+  TASKS_cpl_wwav=520; TPN_cpl_wwav=24; INPES_cpl_wwav=6; JNPES_cpl_wwav=8
+  THRD_cpl_wwav=1; WPG_cpl_wwav=24; MPB_cpl_wwav="0 287"; APB_cpl_wwav="0 311"
+  OPB_cpl_wwav="312 431"; IPB_cpl_wwav="432 479"; WPB_cpl_wwav="480 519"
+
+  TASKS_cpl_c192=288; TPN_cpl_c192=24; INPES_cpl_c192=4; JNPES_cpl_c192=8
+  THRD_cpl_c192=1; WPG_cpl_c192=12;  MPB_cpl_c192="0 191"; APB_cpl_c192="0 203"
+  OPB_cpl_c192="204 263"; IPB_cpl_c192="264 287"
+
+  TASKS_cpl_c384=480; TPN_cpl_c384=24; INPES_cpl_c384=6; JNPES_cpl_c384=8
+  THRD_cpl_c384=1; WPG_cpl_c384=24;  MPB_cpl_c384="0 287"; APB_cpl_c384="0 311"
+  OPB_cpl_c384="312 431"; IPB_cpl_c384="432 479"
+
+  TASKS_datm_100=120; TPN_datm_100=24
+  MPB_datm_100="16 77"; APB_datm_100="0 15"
+  OPB_datm_100="78 107"; IPB_datm_100="108 119"
+
+  TASKS_datm_025=208; TPN_datm_025=24
+  MPB_datm_025="0 39"; APB_datm_025="0 39"
+  OPB_datm_025="40 159"; IPB_datm_025="160 207"
+
 elif [[ $MACHINE_ID = gaea.* ]]; then
 
   TASKS_dflt=150 ; TPN_dflt=36 ; INPES_dflt=3 ; JNPES_dflt=8
@@ -510,7 +546,7 @@ export CPL_FAST=${DT_ATMOS}
 
 # nems.configure defaults
 export NEMS_CONFIGURE="nems.configure.cpld.IN"
-export med_model="nems"
+export med_model="cmeps"
 export atm_model="fv3"
 export ocn_model="mom6"
 export ice_model="cice6"
@@ -619,6 +655,7 @@ export_datm ()
 {
 export FV3=false
 export S2S=false
+export CPLWAV=.F.
 export DATM=true
 export DAYS=1
 export FHMAX=24
@@ -642,7 +679,7 @@ export NY_GLB=320
 
 # nems.configure
 export NEMS_CONFIGURE="nems.configure.datm.IN"
-export med_model="nems"
+export med_model="cmeps"
 export atm_model="datm"
 export ocn_model="mom6"
 export ice_model="cice6"

tests/parm/nems.configure.datm.IN

@@ -79,9 +79,9 @@ DRIVER_attributes::
       mediator_read_restart = @[use_coldstart]
 ::
 MED_attributes::
-      ATM_model = datm
-      ICE_model = cice6
-      OCN_model = mom
+      ATM_model = @[atm_model]
+      ICE_model = @[ice_model]
+      OCN_model = @[ocn_model]
       history_n = 1
       history_option = nhours
       history_ymd = -999