Add CMEPS to ufs-s2s-model (#90)

* Add CMEPS submodule

* Add NEMS mediator equivalent regression tests for CMEPS (rt.sh only)

* Add restart reproducibility regression test for CMEPS




















Co-authored-by: Mariana Vertenstein <mvertens@ucar.edu>

Author: DeniseWorthen

.gitmodules

@@ -22,6 +22,10 @@
 	path = MOM6
 	url = https://github.com/NOAA-EMC/MOM6-interface
 	branch = develop
+[submodule "CMEPS"]
+	path = CMEPS
+	url = https://github.com/ESCOMP/CMEPS.git
+	branch = master
 [submodule "WW3"]
 	path = WW3
 	url = https://github.com/NOAA-EMC/WW3.git

CMEPS

@@ -110,7 +110,9 @@ test cpld_fv3_ccpp_mom6_cice_2d_atm_flux: fv3_ccpp_mom6_cice.exe {
                     DUMPFREQ="@[DUMPFREQ]",
                     DT_THERM="@[DT_THERM_MOM6]",
                     DT_DYNAM="@[DT_DYNAM_MOM6]",
-           MOM6_RIVER_RUNOFF="@[MOM6_RIVER_RUNOFF]")
+           MOM6_RIVER_RUNOFF="@[MOM6_RIVER_RUNOFF]",
+               MOM6_REPRO_LA="@[MOM6_REPRO_LA]",
+            MOM6_THERMO_SPAN="@[MOM6_THERMO_SPAN]")
 
     # Specify output files:
     criteria output {

NEMS

@@ -107,7 +107,9 @@ test cpld_fv3_ccpp_mom6_cice_cold_atm_flux: fv3_ccpp_mom6_cice.exe {
                     DUMPFREQ="@[DUMPFREQ]",
                     DT_THERM="@[DT_THERM_MOM6]",
                     DT_DYNAM="@[DT_DYNAM_MOM6]",
-           MOM6_RIVER_RUNOFF="@[MOM6_RIVER_RUNOFF]")
+           MOM6_RIVER_RUNOFF="@[MOM6_RIVER_RUNOFF]",
+               MOM6_REPRO_LA="@[MOM6_REPRO_LA]",
+            MOM6_THERMO_SPAN="@[MOM6_THERMO_SPAN]")
 
     # Specify output files:
     criteria output {

compsets/cpld_fv3_ccpp_mom6_cice_2d_atm_flux.input

@@ -119,8 +119,12 @@ cpl_defaults = {
     ocn_model="mom6"
     ice_model="cice"
     wav_model="ww3"
-# future use: for MOM6 river runoff 
+# MOM6 river runoff 
     MOM6_RIVER_RUNOFF='True'
+# set USE_LA_LI2016 to the current default; this must be set False for restart repro
+    MOM6_REPRO_LA='True'
+# set the THERMO_SPANS_COUPLING to the current default; according to Gustavo and Alper, the correct setting is "False"
+    MOM6_THERMO_SPAN='True'
     NPROC_ICE='48'
     DT_ATMOS='900' #needed for C96 cases
     DT_DYNAM_MOM6='900'
@@ -151,7 +155,7 @@ cpl_defaults = {
 # embeded bash script to create input files at prerun from specification 
 # in compset
 
-embed bash edit_inputs(CDATE,ATMRES,DT_CICE,NPROC_ICE,RUNTYPE,USE_RESTART_TIME,FRAZIL_FWSALT,RUNID,CICE_HIST_AVG,DUMPFREQ_N,DUMPFREQ,DT_THERM,DT_DYNAM,MOM6_RIVER_RUNOFF) [[[ 
+embed bash edit_inputs(CDATE,ATMRES,DT_CICE,NPROC_ICE,RUNTYPE,USE_RESTART_TIME,FRAZIL_FWSALT,RUNID,CICE_HIST_AVG,DUMPFREQ_N,DUMPFREQ,DT_THERM,DT_DYNAM,MOM6_RIVER_RUNOFF, MOM6_REPRO_LA, MOM6_THERMO_SPAN) [[[ 
 
 python <<EOT
 import os
@@ -206,7 +210,9 @@ with open("INPUT/MOM_input_template",'rt') as inf:
    for x in inf.readlines():
     newline=x.replace("DT_THERM_MOM6","@[DT_THERM]") \
              .replace("DT_DYNAM_MOM6","@[DT_DYNAM]") \
-             .replace("MOM6_RIVER_RUNOFF","@[MOM6_RIVER_RUNOFF]")
+             .replace("MOM6_RIVER_RUNOFF","@[MOM6_RIVER_RUNOFF]") \
+             .replace("MOM6_REPRO_LA","@[MOM6_REPRO_LA]") \
+             .replace("MOM6_THERMO_SPAN","@[MOM6_THERMO_SPAN]") 
     outf.write(newline)
 
 #diag_table

compsets/cpld_fv3_ccpp_mom6_cice_cold_atm_flux.input

@@ -198,6 +198,10 @@ endif
 
 LDFLAGS += $(LIBS)
 
+ifeq ($(CMEPS),Y)
+CPPDEFS += -DCMEPS
+endif
+
 ifdef InNemsMakefile
 FFLAGS += $(ESMF_INC)
 CPPFLAGS += -DFV3_CPLD -traditional

compsets/fv3mom6cice5_ccpp.input

@@ -121,7 +121,7 @@ endif
 
 FFLAGS_OPT = -O2 -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3
 FFLAGS_REPRO = -O2 -debug minimal -fp-model consistent -qoverride-limits -g -traceback
-FFLAGS_DEBUG = -g -O0 -check all -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -traceback -ftrapuv
+FFLAGS_DEBUG = -g -O0 -check all -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -traceback -ftrapuv -link_mpi=dbg
 
 TRANSCENDENTALS := -fast-transcendentals
 FFLAGS_OPENMP = -qopenmp
@@ -192,6 +192,10 @@ CFLAGS += $(SIONLIB_INC)
 FFLAGS += $(SIONLIB_INC)
 endif
 
+ifeq ($(CMEPS),Y)
+CPPDEFS += -DCMEPS
+endif
+
 LDFLAGS += $(LIBS)
 
 ifdef InNemsMakefile

conf/configure.fv3_coupled.cheyenne.intel

@@ -94,7 +94,7 @@ endif
 
 FFLAGS_OPT = -O2 -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3
 FFLAGS_REPRO = -O2 -debug minimal -fp-model consistent -qoverride-limits -g -traceback
-FFLAGS_DEBUG = -g -O0 -check all -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -traceback -ftrapuv
+FFLAGS_DEBUG = -g -O0 -check all -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -traceback -ftrapuv -link_mpi=dbg        
 
 TRANSCENDENTALS := -fast-transcendentals
 FFLAGS_OPENMP = -qopenmp
@@ -159,6 +159,10 @@ FFLAGS += -I$(PATH_CCPP)/include
 LDFLAGS += -L$(PATH_CCPP)/lib -lccppphys -lccpp $(NCEPLIBS) -lxml2
 endif
 
+ifeq ($(CMEPS),Y)
+CPPDEFS += -DCMEPS
+endif
+
 ifneq ($(findstring netcdf/4,$(LOADEDMODULES)),)
   LIBS += -lnetcdff -lnetcdf -L$(HDF5)/lib -lhdf5_hl -lhdf5 -lz
 else

conf/configure.fv3_coupled.cheyenne.intel-impi

@@ -168,6 +168,10 @@ FFLAGS += -I$(PATH_CCPP)/include
 LDFLAGS += -L$(PATH_CCPP)/lib -lccppphys -lccpp $(NCEPLIBS) -lxml2
 endif
 
+ifeq ($(CMEPS),Y)
+CPPDEFS += -DCMEPS
+endif
+
 LDFLAGS += $(LIBS)
 
 ifdef InNemsMakefile