Merge pull request #2 from ESCOMP/master

Author: DeniseWorthen

Makefile

@@ -39,7 +39,7 @@ 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 $(INSTALLDIR)/libgptl.a $(INSTALLDIR)/libpiof.a $(INSTALLDIR)/libpioc.a $(INSTALLDIR)/libgptl.a $(PNETCDF_LD_OPTS)" >> cmeps.mk.install
+	@echo "ESMF_DEP_LINK_OBJS = $(INSTALLDIR)/libcmeps.a $(INSTALLDIR)/libcmeps_util.a $(INSTALLDIR)/libpiof.a $(INSTALLDIR)/libpioc.a $(PNETCDF_LD_OPTS)" >> cmeps.mk.install
 	mkdir -p $(INSTALLDIR)
 	mkdir -p $(INSTALLDIR)/include
 	cp -f $(PIO_INSTALL_DIR)/lib/*.a $(INSTALLDIR)

cime_config/buildnml

@@ -476,11 +476,15 @@ def buildnml(case, caseroot, component):
     for filename in glob.glob(os.path.join(confdir, "*modelio*")):
         shutil.copy(filename, rundir)
 
-    # copy fd.yaml to rundir
+    # copy fd_cesm.yaml to rundir
     cimeroot = case.get_value("CIMEROOT")
     fd_dir = os.path.join(cimeroot, "src","drivers","nuopc","mediator")
-    filename = os.path.join(fd_dir,"fd.yaml")
-    shutil.copy(filename, rundir)
+    coupling_mode = case.get_value('COUPLING_MODE')
+    if coupling_mode == 'cesm':
+        filename = os.path.join(fd_dir,"fd_cesm.yaml")
+    else:
+        filename = os.path.join(fd_dir,"fd_nems.yaml")
+    shutil.copy(filename, os.path.join(rundir, "fd.yaml"))
 
 ###############################################################################
 def _main_func():

cime_config/config_component.xml

@@ -26,6 +26,15 @@
     <desc>Name of coupling component</desc>
   </entry>
 
+  <entry id="COUPLING_MODE">
+    <type>char</type>
+    <valid_values>cesm,nems_orig_active,nems_orig_data,nems_frac</valid_values>
+    <default_value>cesm</default_value>
+    <group>run_coupling</group>
+    <file>env_run.xml</file>
+    <desc>coupling mode</desc>
+  </entry>
+
   <!-- ===================================================================== -->
   <!-- master configuration file that specifies all relevant filenames and -->
   <!-- and directories to configure a case -->

cime_config/namelist_definition_drv.xml

@@ -796,6 +796,18 @@
   <!-- MED general attributes                      -->
   <!-- =========================================== -->
 
+  <entry id="coupling_mode" modify_via_xml="COUPLING_MODE">
+    <type>char</type>
+    <category>control</category>
+    <group>MED_attributes</group>
+    <desc>
+      Type of coupling mode to use in the mediator
+    </desc>
+    <values>
+      <value>$COUPLING_MODE</value>
+    </values>
+  </entry>
+
   <entry id="glc_renormalize_smb">
     <type>char</type>
     <category>control</category>

drivers/cime/ensemble_driver.F90

@@ -11,6 +11,7 @@ module Ensemble_driver
   use med_utils_mod         , only : chkerr => med_utils_ChkErr
   use med_constants_mod     , only : dbug_flag => med_constants_dbug_flag
   use med_internalstate_mod , only : mastertask
+  use med_internalstate_mod , only : logunit  ! initialized here
 
   implicit none
   private
@@ -87,8 +88,7 @@ subroutine SetModelServices(ensemble_driver, rc)
     use NUOPC_Driver          , only : NUOPC_DriverAddComp
     use esm                   , only : ESMSetServices => SetServices, ReadAttributes
    !use pio_interface         , only : PIOSetServices => SetServices
-    use med_time_mod          , only : med_time_clockInit
-    use med_internalstate_mod , only : logunit  ! initialized here
+    use esm_time_mod          , only : esm_time_clockInit
     use shr_log_mod           , only : shrloglev=>shr_log_level, shrlogunit=> shr_log_unit
     use shr_file_mod          , only : shr_file_getUnit, shr_file_getLoglevel
     use shr_file_mod          , only : shr_file_setloglevel, shr_file_setlogunit
@@ -259,7 +259,7 @@ subroutine SetModelServices(ensemble_driver, rc)
           call shr_file_setLogUnit (logunit)
        endif
     enddo
-    call med_time_clockInit(ensemble_driver, driver, logunit, rc)
+    call esm_time_clockInit(ensemble_driver, driver, logunit, rc)
     if (chkerr(rc,__LINE__,u_FILE_u)) return
 
     deallocate(petList)