Support for HAFS UFSATM-HYCOM and DATM-HYCOM coupling.

Makefile

@@ -19,14 +19,22 @@ ifndef CXX
 $(error CXX not defined)
 endif
 
+ifndef PIO_LIBDIR
+$(error PIO_LIBDIR should point to PIO library directory.)
+endif
+
+ifndef PIO_INC
+$(error PIO_INC should point to PIO include directory.)
+endif
+
 ifndef INTERNAL_PIO_INIT
 INTERNAL_PIO_INIT := 1
 endif
 $(info INTERNAL_PIO_INIT is set to $(INTERNAL_PIO_INIT))
 
 MEDIATOR_DIR := $(BASE_DIR)/mediator
 LIBRARY_MEDIATOR := $(MEDIATOR_DIR)/libcmeps.a
-LIBRARY_UTIL := $(BASE_DIR)/nems/util/libcmeps_util.a
+LIBRARY_UTIL := $(BASE_DIR)/util/libcmeps_util.a
 
 all default: install
 
@@ -41,28 +49,29 @@ else
 	@echo "ESMF_DEP_FRONT     = MED" >> cmeps.mk.install
 	@echo "ESMF_DEP_INCPATH   = $(INSTALLDIR)/include" >> cmeps.mk.install
 	@echo "ESMF_DEP_CMPL_OBJS = " >> cmeps.mk.install
-	@echo "ESMF_DEP_LINK_OBJS = $(INSTALLDIR)/libcmeps.a $(INSTALLDIR)/libcmeps_util.a $(PIO_ROOT)/lib/libpiof.a $(PIO_ROOT)/lib/libpioc.a $(PNETCDF_LD_OPTS)" >> cmeps.mk.install
+	@echo "ESMF_DEP_LINK_OBJS = $(INSTALLDIR)/libcmeps.a $(INSTALLDIR)/libcmeps_util.a $(PIO_LIBDIR)/libpiof.a $(PIO_LIBDIR)/libpioc.a $(PNETCDF_LD_OPTS)" >> cmeps.mk.install
 	mkdir -p $(INSTALLDIR)
 	mkdir -p $(INSTALLDIR)/include
 	cp -f $(LIBRARY_UTIL) $(INSTALLDIR)
 	cp -f $(LIBRARY_MEDIATOR) $(INSTALLDIR)
 	cp -f mediator/*.mod $(INSTALLDIR)/include
-	cp -f nems/util/*.mod $(INSTALLDIR)/include
+	cp -f util/*.mod $(INSTALLDIR)/include
 	cp -f cmeps.mk.install $(INSTALLDIR)/cmeps.mk
 endif
 
 $(LIBRARY_MEDIATOR): $(LIBRARY_UTIL) .FORCE
 	cd mediator ;\
-	exec $(MAKE) PIO_INCLUDE_DIR=$(PIO_INCLUDE_DIR) INTERNAL_PIO_INIT=$(INTERNAL_PIO_INIT)
+	exec $(MAKE) PIO_INC=$(PIO_INC) INTERNAL_PIO_INIT=$(INTERNAL_PIO_INIT)
 
 $(LIBRARY_UTIL): .FORCE
-	cd nems/util ;\
-	exec $(MAKE)
+	cd util ;\
+	exec $(MAKE) PIO_INC=$(PIO_INC)
 
 .FORCE:
 
 clean:
 	cd mediator; \
 	exec $(MAKE) clean
-	cd nems/util; \
+	cd util; \
 	exec $(MAKE) clean
+

cime_config/buildnml

@@ -572,8 +572,8 @@ def buildnml(case, caseroot, component):
     coupling_mode = case.get_value('COUPLING_MODE')
     if coupling_mode == 'cesm':
         filename = os.path.join(fd_dir,"fd_cesm.yaml")
-    elif coupling_mode == 'hafs':
-        filename = os.path.join(fd_dir,"fd_hafs.yaml")
+    elif 'nems' in coupling_mode or coupling_mode == 'hafs':
+        filename = os.path.join(fd_dir,"fd_nems.yaml")
     else:
         expect(False, "coupling mode currently only supports cesm")
     shutil.copy(filename, os.path.join(rundir, "fd.yaml"))

doc/source/field_naming_convention.rst

@@ -17,7 +17,6 @@ field dictionaries are supported::
 
   fd_cesm.yaml
   fd_nems.yaml
-  fd_hafs.yaml
 
 The CMEPS field name convention in these YAML files is independent of the model components.
 The convention differentiates between variables that are state fields versus flux fields.

mediator/Makefile

@@ -7,8 +7,8 @@ ESMF_VERSION_MAJOR ?= 0
 ESMF_VERSION_MINOR ?= 0
 CPPDEFS += -DESMF_VERSION_MAJOR=$(ESMF_VERSION_MAJOR) -DESMF_VERSION_MINOR=$(ESMF_VERSION_MINOR)
 
-ifndef PIO_INCLUDE_DIR
-$(error PIO_INCLUDE_DIR not set)
+ifndef PIO_INC
+$(error PIO_INC should point to PIO include directory.)
 endif
 
 ifeq ($(INTERNAL_PIO_INIT),1)
@@ -25,7 +25,7 @@ $(LIBRARY): $(OBJ)
         $(AR) $(ARFLAGS) $@ $?
 
 %.o: %.F90
-	$(ESMF_F90COMPILER) -c $(ESMF_F90COMPILEOPTS) $(ESMF_F90COMPILEPATHS) $(CPPDEFS) -I$(PIO_ROOT)/include -I../nems/util $*.F90
+	$(ESMF_F90COMPILER) -c $(ESMF_F90COMPILEOPTS) $(ESMF_F90COMPILEPATHS) $(CPPDEFS) -I${PIO_INC} -I../util $*.F90
 
 clean:
         $(RM) -f $(LIBRARY) *.i90 *.o *.mod

mediator/esmFlds.F90

@@ -52,7 +52,8 @@ module esmflds
   integer , public, parameter :: map_rof2ocn_liq   = 11 ! custom smoothing map to map liq from rof->ocn (cesm only)
   integer , public, parameter :: map_glc2ocn_liq   = 12 ! custom smoothing map to map liq from glc->ocn (cesm only)
   integer , public, parameter :: map_glc2ocn_ice   = 13 ! custom smoothing map to map ice from glc->ocn (cesm only)
-  integer , public, parameter :: nmappers          = 13
+  integer , public, parameter :: mapfillv_bilnr    = 14 ! fill value followed by bilinear
+  integer , public, parameter :: nmappers          = 14
 
   character(len=*) , public, parameter :: mapnames(nmappers) = &
        (/'bilnr      ',&
@@ -67,14 +68,28 @@ module esmflds
          'rof2ocn_ice',&
          'rof2ocn_liq',&
          'glc2ocn_ice',&
-         'glc2ocn_liq'/)
+         'glc2ocn_liq',&
+         'fillv_bilnr'/)
 
   !-----------------------------------------------
   ! Set coupling mode
   !-----------------------------------------------
 
   character(len=CS), public :: coupling_mode ! valid values are [cesm,nems_orig,nems_frac,nems_orig_data,hafs]
 
+  !-----------------------------------------------
+  ! Name of model components
+  !-----------------------------------------------
+
+  character(len=CS), public :: med_name = ''
+  character(len=CS), public :: atm_name = ''
+  character(len=CS), public :: lnd_name = ''
+  character(len=CS), public :: ocn_name = ''
+  character(len=CS), public :: ice_name = ''
+  character(len=CS), public :: rof_name = ''
+  character(len=CS), public :: wav_name = ''
+  character(len=CS), public :: glc_name = ''
+
   !-----------------------------------------------
   ! PUblic methods
   !-----------------------------------------------