From c42f9253e5534898fb1a338ce8475441928e0969 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Wed, 26 Jun 2024 07:00:03 -0600 Subject: [PATCH 1/5] new dms and bromo from ocn to atm --- cime_config/config_component_cesm.xml | 18 ++++++++++++++++++ cime_config/namelist_definition_drv.xml | 24 ++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/cime_config/config_component_cesm.xml b/cime_config/config_component_cesm.xml index a1981482..9105d189 100644 --- a/cime_config/config_component_cesm.xml +++ b/cime_config/config_component_cesm.xml @@ -141,6 +141,24 @@ + + logical + FALSE + TRUE,FALSE + run_coupling + env_run.xml + Activates DMS fluxes to be sent from ocn to atm + + + + logical + FALSE + TRUE,FALSE + run_coupling + env_run.xml + Activates Bromoform fluxes to be sent from ocn to atm + + char diff --git a/cime_config/namelist_definition_drv.xml b/cime_config/namelist_definition_drv.xml index 0f8622af..0e043c01 100644 --- a/cime_config/namelist_definition_drv.xml +++ b/cime_config/namelist_definition_drv.xml @@ -2415,6 +2415,30 @@ + + 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 seq_flds From 580ac59a269f017ae2371f02a225b2bec42c4027 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Thu, 27 Jun 2024 06:30:32 -0600 Subject: [PATCH 2/5] add new functionality for transferring dms,bfr,n2o and nh3 from ocn to atm --- cime_config/config_component_cesm.xml | 22 +++++++++++++++++-- cime_config/namelist_definition_drv.xml | 28 +++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/cime_config/config_component_cesm.xml b/cime_config/config_component_cesm.xml index 9105d189..be8b40e7 100644 --- a/cime_config/config_component_cesm.xml +++ b/cime_config/config_component_cesm.xml @@ -141,7 +141,7 @@ - + logical FALSE TRUE,FALSE @@ -150,7 +150,7 @@ Activates DMS fluxes to be sent from ocn to atm - + logical FALSE TRUE,FALSE @@ -159,6 +159,24 @@ Activates Bromoform fluxes to be sent from ocn to atm + + logical + FALSE + TRUE,FALSE + run_coupling + env_run.xml + Activates N2O fluxes to be sent from ocn to atm + + + + logical + FALSE + TRUE,FALSE + run_coupling + env_run.xml + Activates NH3 fluxes to be sent from ocn to atm + + char diff --git a/cime_config/namelist_definition_drv.xml b/cime_config/namelist_definition_drv.xml index 0e043c01..c6aa7200 100644 --- a/cime_config/namelist_definition_drv.xml +++ b/cime_config/namelist_definition_drv.xml @@ -2415,7 +2415,7 @@ - + logical flds ALLCOMP_attributes @@ -2427,7 +2427,7 @@ - + logical flds ALLCOMP_attributes @@ -2439,6 +2439,30 @@ + + 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 From ee184f748bb060a1bed08c3e04b270155b4fa7d6 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Wed, 3 Jul 2024 12:39:57 +0200 Subject: [PATCH 3/5] added blom configurations --- cime_config/config_component_cesm.xml | 30 ++++++++++++++++++--------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/cime_config/config_component_cesm.xml b/cime_config/config_component_cesm.xml index be8b40e7..e3d9a5d2 100644 --- a/cime_config/config_component_cesm.xml +++ b/cime_config/config_component_cesm.xml @@ -226,14 +226,15 @@ 24 24 - - + 24 + 24 144 24 + 24 24 @@ -241,6 +242,7 @@ 24 48 48 + 48 @@ -315,6 +317,7 @@ $ATM_NCPL 24 + 24 1 24 24 @@ -339,6 +342,7 @@ $ATM_NCPL $ATM_NCPL 1 + 1 run_coupling env_run.xml @@ -372,11 +376,13 @@ 1 $ATM_NCPL + $ATM_NCPL $ATM_NCPL $ATM_NCPL 1 8 8 + 8 $ATM_NCPL 1 $ATM_NCPL @@ -408,13 +414,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 @@ -455,14 +462,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 @@ -518,7 +526,9 @@ TRUE TRUE + TRUE TRUE + TRUE TRUE TRUE From 5bf3de09c757543e064360a7d6fab4b50ba1ef0b Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Tue, 9 Jul 2024 03:47:28 -0600 Subject: [PATCH 4/5] fixed bug in that advertising for So_t_depth and So_s_depth was never happening --- mediator/esmFldsExchange_cesm_mod.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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') From 625ca2800d49f85a1be37677875c5982d9783c52 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Fri, 12 Jul 2024 09:33:02 +0200 Subject: [PATCH 5/5] addressed issues isn PR review --- cime_config/config_component_cesm.xml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/cime_config/config_component_cesm.xml b/cime_config/config_component_cesm.xml index e3d9a5d2..4dd12e1e 100644 --- a/cime_config/config_component_cesm.xml +++ b/cime_config/config_component_cesm.xml @@ -147,7 +147,10 @@ TRUE,FALSE run_coupling env_run.xml - Activates DMS fluxes to be sent from ocn to atm + + Activates DMS fluxes to be sent from ocn to atm. + Currently this is only available with BLOM ocean component. + @@ -156,7 +159,10 @@ TRUE,FALSE run_coupling env_run.xml - Activates Bromoform fluxes to be sent from ocn to atm + + Activates Bromoform fluxes to be sent from ocn to atm. + Currently this is only available with BLOM ocean component. + @@ -165,7 +171,10 @@ TRUE,FALSE run_coupling env_run.xml - Activates N2O fluxes to be sent from ocn to atm + + Activates N2O fluxes to be sent from ocn to atm. + Currently this is only available with BLOM ocean component. + @@ -174,7 +183,10 @@ TRUE,FALSE run_coupling env_run.xml - Activates NH3 fluxes to be sent from ocn to atm + + Activates NH3 fluxes to be sent from ocn to atm. + Currently this is only available with BLOM ocean component. + @@ -227,7 +239,7 @@ 24 24 24 - +