Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix So_t for regional atm+docn configuration #415

Draft
wants to merge 15 commits into
base: main
Choose a base branch
from
Draft

Fix So_t for regional atm+docn configuration #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9e51b44
Merge pull request #1 from CMCC-Foundation/dev/cmcc-cm3
daniele-peano Dec 15, 2022
fd8e3bb
Merge tag 'cmeps0.14.2' into feature/cmcc-cm3
Jan 3, 2023
b99f989
Merge pull request #2 from mvertens/feature/cmcc-cm3
mvertens Jan 3, 2023
df70c5f
update default to correct nuopc.runseq in NEMO coupled cases
daniele-peano Jan 27, 2023
4d73342
Merge pull request #4 from daniele-peano/dev/runseq
daniele-peano Jan 30, 2023
1edcc38
Merge branch 'dev/cmeps-commit' into dev/ww3_forced
daniele-peano Feb 14, 2023
003d2a1
Comment out PostChildrenAdvertise call since it is not available in E…
daniele-peano Feb 14, 2023
1ffdf8f
Comment out InitializeIO due to use of ESMF v8.2.0
daniele-peano Mar 1, 2023
34f820c
Add call of driver_pio_component_init in esm.F90
daniele-peano Mar 1, 2023
a3d012b
Modify driver_pio_component_init to previous version
daniele-peano Mar 1, 2023
3e0af36
Merge pull request #5 from daniele-peano/dev/ww3_forced
daniele-peano Mar 9, 2023
0c30c0a
fix So_t and masking for atm+docn
uturuncoglu Oct 16, 2023
4465347
sync with escomp
uturuncoglu Oct 16, 2023
8d85e92
get updates from upstream
uturuncoglu Oct 16, 2023
8a03c6f
Merge remote-tracking branch 'upstream/main' into hotfix/cesm_so_t
uturuncoglu Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cime_config/config_component_cesm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@
<values match="last">
<value compset="_DATM.*_DOCN%SOM" >OPTION2</value>
<value compset="_POP2" >OPTION2</value>
<value compset="_NEMO" >OPTION2</value>
<value compset="_MOM6" >OPTION1</value>
<value compset="_POP2" grid="oi%gx1v6" >OPTION1</value>
<value compset="_POP2" grid="oi%gx1v7" >OPTION1</value>
Expand Down Expand Up @@ -483,6 +484,7 @@
<value compset="DATM.*_MOM\d">TRUE</value>
<value compset="CAM.*_MOM\d">TRUE</value>
<value compset="CAM.*_POP\d">TRUE</value>
<value compset="CAM.*_NEMO">FALSE</value>
<value compset="CAM.*_DOCN%SOM">TRUE</value>
</values>
<group>run_budgets</group>
Expand Down
1 change: 1 addition & 0 deletions mediator/esmFldsExchange_cesm_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1363,6 +1363,7 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
end if
end if
if (fldchk(is_local%wrap%FBexp(compatm), 'So_t', rc=rc)) then
call addmap_from(compocn, 'So_t', compatm, mapnstod_consf, 'ofrac', ocn2atm_map)
call addmrg_to(compatm, 'So_t', mrg_from=compocn, mrg_fld='So_t', mrg_type='copy')
end if
end if
Expand Down
10 changes: 7 additions & 3 deletions mediator/med_map_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,9 +404,13 @@ subroutine med_map_routehandles_initfrom_field(n1, n2, fldsrc, flddst, mapindex,
! override defaults for specific cases
if (trim(coupling_mode) == 'cesm') then
if (n1 == compwav .and. n2 == compocn) then
srcMaskValue = 0
dstMaskValue = ispval_mask
endif
srcMaskValue = 0
dstMaskValue = ispval_mask
endif
if (n1 == compocn .and. n2 == compatm) then
srcMaskValue = 0
dstMaskValue = 0
endif
end if
if (trim(coupling_mode(1:3)) == 'ufs') then
if (n1 == compatm .and. n2 == complnd) then
Expand Down
Loading