ufs-community · DeniseWorthen · May 3, 2021 · Feb 8, 2021 · Feb 8, 2021 · Feb 12, 2021
diff --git a/.gitmodules b/.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

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -247,9 +247,6 @@ 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

diff --git a/NEMS b/NEMS
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -510,7 +510,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"
@@ -642,7 +642,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"

diff --git a/tests/parm/nems.configure.datm.IN b/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

diff --git a/tests/run_test.sh b/tests/run_test.sh
@@ -98,6 +98,9 @@ if [[ "Q${INPUT_NEST02_NML:-}" != Q ]] ; then
     atparse < ${PATHRT}/parm/${INPUT_NEST02_NML} > input_nest02.nml
 fi
 
+# Field Dictionary
+cp ${PATHRT}/parm/fd_nems.yaml fd_nems.yaml
+
 # Set up the run directory
 source ./fv3_run
 
@@ -106,8 +109,6 @@ if [[ $DATM = 'true' ]] || [[ $S2S = 'true' ]]; then
   edit_mom_input  < ${PATHRT}/parm/${MOM_INPUT:-MOM_input_template_$OCNRES} > INPUT/MOM_input
   edit_diag_table < ${PATHRT}/parm/${DIAG_TABLE:-diag_table_template} > diag_table
   edit_data_table < ${PATHRT}/parm/data_table_template > data_table
-  # CMEPS
-  cp ${PATHRT}/parm/fd_nems.yaml fd_nems.yaml
 fi
 if [[ $DATM = 'true' ]]; then
   cp ${PATHRT}/parm/datm_data_table.IN datm_data_table
+7 −19		src/MAIN_NEMS.F90
+163 −4,055		src/module_EARTH_GRID_COMP.F90
+0 −9,414		src/module_MEDIATOR.F90
+0 −1,534		src/module_MEDIATOR_SpaceWeather.F90
+0 −345		src/module_MEDIATOR_methods.F90
+3 −3		src/module_NEMS_GRID_COMP.F90
+2 −2		src/module_NEMS_Rusage.F90
+1 −89		src/module_NEMS_UTILS.F90