diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 438a2f450..f3d2d933a 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -11,39 +11,6 @@ Are changes expected to change answers? (specify if bfb, different at roundoff,
Any User Interface Changes (namelist or namelist defaults changes)?
### Testing performed
+Please describe the tests along with the target model and machine(s)
+If possible, please also added hashes that were used in the testing
-Testing performed if application target is CESM:
-- [ ] (recommended) CIME_DRIVER=nuopc scripts_regression_tests.py
- - machines:
- - details (e.g. failed tests):
-- [ ] (recommended) CESM testlist_drv.xml
- - machines and compilers:
- - details (e.g. failed tests):
-- [ ] (optional) CESM prealpha test
- - machines and compilers
- - details (e.g. failed tests):
-- [ ] (other) please described in detail
- - machines and compilers
- - details (e.g. failed tests):
-
-Testing performed if application target is UFS-coupled:
-- [ ] (recommended) UFS-coupled testing
- - description:
- - details (e.g. failed tests):
-
-Testing performed if application target is UFS-HAFS:
-- [ ] (recommended) UFS-HAFS testing
- - description:
- - details (e.g. failed tests):
-
-### Hashes used for testing:
-
-- [ ] CESM:
- - repository to check out: https://github.com/ESCOMP/CESM.git
- - branch/hash:
-- [ ] UFS-coupled, then umbrella repostiory to check out and associated hash:
- - repository to check out:
- - branch/hash:
-- [ ] UFS-HAFS, then umbrella repostiory to check out and associated hash:
- - repository to check out:
- - branch/hash:
diff --git a/cesm/driver/esm.F90 b/cesm/driver/esm.F90
index a98976f21..b5207955a 100644
--- a/cesm/driver/esm.F90
+++ b/cesm/driver/esm.F90
@@ -796,7 +796,7 @@ subroutine esm_init_pelayout(driver, maxthreads, rc)
#ifndef NO_MPI2
use mpi , only : MPI_COMM_NULL, mpi_comm_size
#endif
- use mct_mod , only : mct_world_init
+ use m_MCTWorld , only : mct_world_init => init
#ifdef MED_PRESENT
use med_internalstate_mod , only : med_id
diff --git a/cime_config/buildnml b/cime_config/buildnml
index 6b76da004..f093b44e6 100755
--- a/cime_config/buildnml
+++ b/cime_config/buildnml
@@ -125,17 +125,13 @@ def _create_drv_namelists(case, infile, confdir, nmlgen, files):
elif case.get_value("RUN_TYPE") == "branch":
config["run_type"] = "branch"
+ config['wav_ice_coupling'] = config['COMP_WAV'] == 'ww3dev' and config['COMP_ICE'] == 'cice'
+
# ----------------------------------------------------
# Initialize namelist defaults
# ----------------------------------------------------
nmlgen.init_defaults(infile, config, skip_default_for_groups=["modelio"])
- # --------------------------------
- # Set default wav-ice coupling (assumes cice6 as the ice component
- # --------------------------------
- if case.get_value("COMP_WAV") == "ww3dev" and case.get_value("COMP_ICE") == "cice":
- nmlgen.add_default("wavice_coupling", value=".true.")
-
# --------------------------------
# Overwrite: set brnch_retain_casename
# --------------------------------
diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 7f9bac96e..f986cfad2 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -1361,87 +1361,6 @@
-
-
-
- char
- idmap
- run_domain
- env_run.xml
- atm2ocn flux mapping file
-
-
-
- char
- idmap
- run_domain
- env_run.xml
- atm2ocn state mapping file
-
-
-
- char
- idmap
- run_domain
- env_run.xml
- atm2ocn vector mapping file
-
-
-
- char
- idmap
- run_domain
- env_run.xml
- atm2lnd flux mapping file
-
-
-
- char
- idmap
- run_domain
- env_run.xml
- atm2lnd state mapping file
-
-
-
- char
- idmap
- run_domain
- env_run.xml
- atm2wav state mapping file
-
-
-
- char
- idmap
- run_domain
- env_run.xml
- ocn2atm flux mapping file
-
-
-
- char
- idmap
- run_domain
- env_run.xml
- ocn2atm state mapping file
-
-
-
- char
- idmap
- run_domain
- env_run.xml
- lnd2atm flux mapping file
-
-
-
- char
- idmap
- run_domain
- env_run.xml
- lnd2atm state mapping file
-
char
diff --git a/cime_config/config_component_cesm.xml b/cime_config/config_component_cesm.xml
index c2b795f73..dbf3b11e3 100644
--- a/cime_config/config_component_cesm.xml
+++ b/cime_config/config_component_cesm.xml
@@ -108,12 +108,15 @@
CO2A
none
CO2A
+ CO2A
CO2A
CO2A
CO2A
CO2A
CO2C
CO2C
+ CO2A
+ CO2A
run_coupling
env_run.xml
@@ -232,6 +235,11 @@
1
+
+
+
+ 24
+ 48
run_coupling
env_run.xml
diff --git a/cime_config/namelist_definition_drv.xml b/cime_config/namelist_definition_drv.xml
index d403caad1..6f0874210 100644
--- a/cime_config/namelist_definition_drv.xml
+++ b/cime_config/namelist_definition_drv.xml
@@ -2371,6 +2371,7 @@
4
+ 4
0
@@ -3899,7 +3900,7 @@
-
+
logical
expdef
ALLCOMP_attributes
@@ -3908,6 +3909,8 @@
.false.
+
+
diff --git a/mediator/esmFldsExchange_cesm_mod.F90 b/mediator/esmFldsExchange_cesm_mod.F90
index 11e45f4c8..69cd4391a 100644
--- a/mediator/esmFldsExchange_cesm_mod.F90
+++ b/mediator/esmFldsExchange_cesm_mod.F90
@@ -96,16 +96,16 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
type(InternalState) :: is_local
integer :: n, ns
character(len=CL) :: cvalue
- logical :: wavice_coupling
+ logical :: wav_coupling_to_cice
logical :: ocn2glc_coupling
character(len=*) , parameter :: subname=' (esmFldsExchange_cesm) '
!--------------------------------------
rc = ESMF_SUCCESS
- call NUOPC_CompAttributeGet(gcomp, name='wavice_coupling', value=cvalue, rc=rc)
+ call NUOPC_CompAttributeGet(gcomp, name='wav_coupling_to_cice', value=cvalue, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
- read(cvalue,*) wavice_coupling
+ read(cvalue,*) wav_coupling_to_cice
call NUOPC_CompAttributeGet(gcomp, name='ocn2glc_coupling', value=cvalue, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
@@ -2831,7 +2831,7 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
! ---------------------------------------------------------------------
! to ice: wave elevation spectrum (field with ungridded dimensions)
! ---------------------------------------------------------------------
- if (wavice_coupling) then
+ if (wav_coupling_to_cice) then
if (phase == 'advertise') then
call addfld_from(compwav, 'Sw_elevation_spectrum')
call addfld_to(compice, 'Sw_elevation_spectrum')
@@ -2866,7 +2866,7 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
!----------------------------------------------------------
! to wav: ice thickness from ice
!----------------------------------------------------------
- if (wavice_coupling) then
+ if (wav_coupling_to_cice) then
if (phase == 'advertise') then
call addfld_from(compice, 'Si_thick')
call addfld_to(compwav, 'Si_thick')
@@ -2881,7 +2881,7 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
!----------------------------------------------------------
! to wav: ice floe diameter from ice
!----------------------------------------------------------
- if (wavice_coupling) then
+ if (wav_coupling_to_cice) then
if (phase == 'advertise') then
call addfld_from(compice, 'Si_floediam')
call addfld_to(compwav, 'Si_floediam')