diff --git a/cime_config/config_component_cesm.xml b/cime_config/config_component_cesm.xml index a1981482..4dd12e1e 100644 --- a/cime_config/config_component_cesm.xml +++ b/cime_config/config_component_cesm.xml @@ -141,6 +141,54 @@ + + logical + FALSE + TRUE,FALSE + run_coupling + env_run.xml + + Activates DMS fluxes to be sent from ocn to atm. + Currently this is only available with BLOM ocean component. + + + + + logical + FALSE + TRUE,FALSE + run_coupling + env_run.xml + + Activates Bromoform fluxes to be sent from ocn to atm. + Currently this is only available with BLOM ocean component. + + + + + logical + FALSE + TRUE,FALSE + run_coupling + env_run.xml + + Activates N2O fluxes to be sent from ocn to atm. + Currently this is only available with BLOM ocean component. + + + + + logical + FALSE + TRUE,FALSE + run_coupling + env_run.xml + + Activates NH3 fluxes to be sent from ocn to atm. + Currently this is only available with BLOM ocean component. + + + char @@ -190,14 +238,15 @@ 24 24 - - + 24 + 24 144 24 + 24 24 @@ -205,6 +254,7 @@ 24 48 48 + 48 @@ -279,6 +329,7 @@ $ATM_NCPL 24 + 24 1 24 24 @@ -303,6 +354,7 @@ $ATM_NCPL $ATM_NCPL 1 + 1 run_coupling env_run.xml @@ -336,11 +388,13 @@ 1 $ATM_NCPL + $ATM_NCPL $ATM_NCPL $ATM_NCPL 1 8 8 + 8 $ATM_NCPL 1 $ATM_NCPL @@ -372,13 +426,14 @@ TRUE TRUE + TRUE TRUE FALSE run_component_cpl env_run.xml - Only used for compsets with DATM and POP (currently C, G and J): + Only used for compsets with DATM and [POP or MOM] (currently C, G and J): If true, compute albedos to work with daily avg SW down If false (default), albedos are computed with the assumption that downward solar radiation from the atm component has a diurnal cycle and zenith-angle @@ -419,14 +474,15 @@ TIGHT,OPTION1,OPTION2 TIGHT - OPTION2 - OPTION2 - OPTION1 - OPTION1 - OPTION1 + OPTION2 + OPTION2 + OPTION1 + OPTION1 + OPTION1 + OPTION1 OPTION2 - OPTION2 - OPTION2 + OPTION2 + OPTION2 run_coupling env_run.xml @@ -482,7 +538,9 @@ TRUE TRUE + TRUE TRUE + TRUE TRUE TRUE diff --git a/cime_config/namelist_definition_drv.xml b/cime_config/namelist_definition_drv.xml index 165e34f4..222a15b2 100644 --- a/cime_config/namelist_definition_drv.xml +++ b/cime_config/namelist_definition_drv.xml @@ -2426,6 +2426,54 @@ + + logical + flds + ALLCOMP_attributes + + Pass DMS from OCN to ATM component + + + .false. + + + + + logical + flds + ALLCOMP_attributes + + Pass Bromoform from OCN to ATM component + + + .false. + + + + + logical + flds + ALLCOMP_attributes + + Pass N2O from OCN to ATM component + + + .false. + + + + + logical + flds + ALLCOMP_attributes + + Pass NH3 from OCN to ATM component + + + .false. + + + logical seq_flds diff --git a/mediator/esmFldsExchange_cesm_mod.F90 b/mediator/esmFldsExchange_cesm_mod.F90 index 7055fdf7..f6d98c22 100644 --- a/mediator/esmFldsExchange_cesm_mod.F90 +++ b/mediator/esmFldsExchange_cesm_mod.F90 @@ -3322,7 +3322,7 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc) !----------------------------- ! to glc: from ocn !----------------------------- - if (is_local%wrap%ocn2glc_coupling) then + if (ocn2glc_coupling) then if (phase == 'advertise') then call addfld_from(compocn, 'So_t_depth') call addfld_from(compocn, 'So_s_depth')