Skip to content

Commit

Permalink
fix bug in ocn2glc_coupling and add blom (#484)
Browse files Browse the repository at this point in the history 
* add new functionality for transferring dms,bfr,n2o and nh3 from ocn to atm (only valid for BLOM)
* added blom configurations
* fixed bug in that advertising for So_t_depth and So_s_depth was never happening
* addressed issues isn PR review
Co-authored-by: Mariana Vertenstein <[email protected]>
  • Loading branch information
@mvertens
mvertens authored Jul 12, 2024
1 parent e4a5e58 commit ce9cfe2
Show file tree
Hide file tree
Showing 3 changed files with 117 additions and 11 deletions.
78 changes: 68 additions & 10 deletions cime_config/config_component_cesm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,54 @@
</desc>
</entry>

<entry id="DMS_EMIS_OCN">
<type>logical</type>
<default_value>FALSE</default_value>
<valid_values>TRUE,FALSE</valid_values>
<group>run_coupling</group>
<file>env_run.xml</file>
<desc>
Activates DMS fluxes to be sent from ocn to atm.
Currently this is only available with BLOM ocean component.
</desc>
</entry>

<entry id="BRF_EMIS_OCN">
<type>logical</type>
<default_value>FALSE</default_value>
<valid_values>TRUE,FALSE</valid_values>
<group>run_coupling</group>
<file>env_run.xml</file>
<desc>
Activates Bromoform fluxes to be sent from ocn to atm.
Currently this is only available with BLOM ocean component.
</desc>
</entry>

<entry id="N2O_EMIS_OCN">
<type>logical</type>
<default_value>FALSE</default_value>
<valid_values>TRUE,FALSE</valid_values>
<group>run_coupling</group>
<file>env_run.xml</file>
<desc>
Activates N2O fluxes to be sent from ocn to atm.
Currently this is only available with BLOM ocean component.
</desc>
</entry>

<entry id="NH3_EMIS_OCN">
<type>logical</type>
<default_value>FALSE</default_value>
<valid_values>TRUE,FALSE</valid_values>
<group>run_coupling</group>
<file>env_run.xml</file>
<desc>
Activates NH3 fluxes to be sent from ocn to atm.
Currently this is only available with BLOM ocean component.
</desc>
</entry>

<entry id="CPL_USER_MODS">
<type>char</type>
<valid_values></valid_values>
Expand Down Expand Up @@ -190,21 +238,23 @@
<!-- =================================================== -->
<value compset="_DATM.*_DICE.*_POP2">24</value>
<value compset="_DATM.*_DICE.*_MOM6">24</value>
<!-- TODO: currently a NUOPC runseqence cannot be generated with the ATM_NCPL < OCN_NCPL - as is the case -->
<!-- with the POP2 C compset run sequence - for now will set these to be the same as MOM6 -->
<value compset="_DATM.*_DICE.*_BLOM">24</value>
<!-- NOTE: currently a NUOPC runseqence cannot be generated with the ATM_NCPL < OCN_NCPL -->
<!-- =================================================== -->
<!-- G compsets -->
<!-- =================================================== -->
<value compset="_DATM.*_SLND.*_CICE.*_POP2">24</value>
<value compset="_DATM.*_SLND.*_CICE.*_POP2" grid="oi%tx0.1v3">144</value>
<value compset="_DATM.*_SLND.*_CICE.*_MOM6">24</value>
<value compset="_DATM.*_SLND.*_CICE.*_BLOM">24</value>
<value compset="_DATM.*_CICE.*_DOCN">24</value>
<!-- =================================================== -->
<!-- C/G compsets -->
<!-- =================================================== -->
<value compset="_DATM.*_DOCN%US20">24</value>
<value compset="_DATM%CPLHIST.+POP\d">48</value>
<value compset="_DATM%CPLHIST.+MOM\d">48</value>
<value compset="_DATM%CPLHIST.+BLOM\d">48</value>
<!-- =================================================== -->
<!-- atm dependent resolutions (primarily CAM) -->
<!-- =================================================== -->
Expand Down Expand Up @@ -279,6 +329,7 @@
<default_value>$ATM_NCPL</default_value>
<values match="last">
<value compset="_MOM6">24</value>
<value compset="_BLOM">24</value>
<value compset="_POP2" grid="oi%gx3v7">1</value>
<value compset="_POP2" grid="oi%gx1v6">24</value>
<value compset="_POP2" grid="oi%gx1v7">24</value>
Expand All @@ -303,6 +354,7 @@
<value compset="_SGLC">$ATM_NCPL</value>
<value compset="_XGLC">$ATM_NCPL</value>
<value compset="_MOM6">1</value>
<value compset="_BLOM">1</value>
</values>
<group>run_coupling</group>
<file>env_run.xml</file>
Expand Down Expand Up @@ -336,11 +388,13 @@
<values match="last">
<value compset="_DATM.*_POP2.*_DROF" grid="oi%gx3v7">1</value>
<value compset="_DATM.*_MOM6.*_DROF" >$ATM_NCPL</value>
<value compset="_DATM.*_BLOM.*_DROF" >$ATM_NCPL</value>
<value compset="_DATM.*_DOCN%SOM" >$ATM_NCPL</value>
<value compset="_DATM.*_SLND.*_DICE.*_DOCN" >$ATM_NCPL</value>
<value compset="_MIZUROUTE_" >1</value>
<value compset="_DATM%CPLHIST.+POP\d" >8</value>
<value compset="_DATM%CPLHIST.+MOM\d" >8</value>
<value compset="_DATM%CPLHIST.+BLOM\d" >8</value>
<value compset="_XATM.*_XLND.*_XICE.*_XOCN" >$ATM_NCPL</value>
<value compset="_DLND.*_CISM\d" >1</value>
<value compset="_XROF" >$ATM_NCPL</value>
Expand Down Expand Up @@ -372,13 +426,14 @@
<values match="last">
<value compset="DATM.+POP\d">TRUE</value>
<value compset="DATM.+MOM\d">TRUE</value>
<value compset="DATM.+BLOM\d">TRUE</value>
<value compset="DATM.+DOCN%IAF">TRUE</value>
<value compset="DATM%CPLHIST.+POP\d">FALSE</value>
</values>
<group>run_component_cpl</group>
<file>env_run.xml</file>
<desc>
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
Expand Down Expand Up @@ -419,14 +474,15 @@
<valid_values>TIGHT,OPTION1,OPTION2</valid_values>
<default_value>TIGHT</default_value>
<values match="last">
<value compset="_DATM.*_DOCN%SOM" >OPTION2</value>
<value compset="_POP2" >OPTION2</value>
<value compset="_MOM6" >OPTION1</value>
<value compset="_POP2" grid="oi%gx1v6" >OPTION1</value>
<value compset="_POP2" grid="oi%gx1v7" >OPTION1</value>
<value compset="_DATM.*_DOCN%SOM" >OPTION2</value>
<value compset="_POP2" >OPTION2</value>
<value compset="_MOM6" >OPTION1</value>
<value compset="_BLOM" >OPTION1</value>
<value compset="_POP2" grid="oi%gx1v6" >OPTION1</value>
<value compset="_POP2" grid="oi%gx1v7" >OPTION1</value>
<value compset="_DATM%NYF.*_SLND.*_DICE.*_DOCN" >OPTION2</value>
<value compset="_XATM.*_XLND.*_XICE.*_XOCN" >OPTION2</value>
<value compset="_SOCN" >OPTION2</value>
<value compset="_XATM.*_XLND.*_XICE.*_XOCN" >OPTION2</value>
<value compset="_SOCN" >OPTION2</value>
</values>
<group>run_coupling</group>
<file>env_run.xml</file>
Expand Down Expand Up @@ -482,7 +538,9 @@
<values match="last">
<value compset="DATM.*_POP\d">TRUE</value>
<value compset="DATM.*_MOM\d">TRUE</value>
<value compset="DATM.*_BLOM\d">TRUE</value>
<value compset="CAM.*_MOM\d">TRUE</value>
<value compset="CAM.*_BLOM\d">TRUE</value>
<value compset="CAM.*_POP\d">TRUE</value>
<value compset="CAM.*_DOCN%SOM">TRUE</value>
</values>
Expand Down
48 changes: 48 additions & 0 deletions cime_config/namelist_definition_drv.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2426,6 +2426,54 @@
</values>
</entry>

<entry id="flds_dms" modify_via_xml="DMS_EMIS_OCN">
<type>logical</type>
<category>flds</category>
<group>ALLCOMP_attributes</group>
<desc>
Pass DMS from OCN to ATM component
</desc>
<values>
<value>.false.</value>
</values>
</entry>

<entry id="flds_brf" modify_via_xml="BRF_EMIS_OCN">
<type>logical</type>
<category>flds</category>
<group>ALLCOMP_attributes</group>
<desc>
Pass Bromoform from OCN to ATM component
</desc>
<values>
<value>.false.</value>
</values>
</entry>

<entry id="flds_n2o" modify_via_xml="N2O_EMIS_OCN">
<type>logical</type>
<category>flds</category>
<group>ALLCOMP_attributes</group>
<desc>
Pass N2O from OCN to ATM component
</desc>
<values>
<value>.false.</value>
</values>
</entry>

<entry id="flds_nh3" modify_via_xml="NH3_EMIS_OCN">
<type>logical</type>
<category>flds</category>
<group>ALLCOMP_attributes</group>
<desc>
Pass NH3 from OCN to ATM component
</desc>
<values>
<value>.false.</value>
</values>
</entry>

<entry id="flds_bgc_oi">
<type>logical</type>
<category>seq_flds</category>
Expand Down
2 changes: 1 addition & 1 deletion mediator/esmFldsExchange_cesm_mod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down

0 comments on commit ce9cfe2

Please sign in to comment.