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

add BLOM specific settings #6

Merged
merged 75 commits into from
May 26, 2023
Merged

add BLOM specific settings #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
4cf3e05
Added Fwxx_taux and Fwxx_tauy, based on Foxx_taux and Foxx_tauy
phall-brown Apr 12, 2023
e68d9bc
Trying simpler form of sharing Foxx to compwav
phall-brown Apr 14, 2023
eb18694
Turning off Foxx export to waves for testing
phall-brown Apr 14, 2023
c791efc
Adding Fwxx_taux to get wind stress to pass to wave model
phall-brown Apr 17, 2023
8db2449
Adding Fwxx_taux, using Foxx_taux as a model
phall-brown Apr 17, 2023
a599c2f
Comment out unnecessary line
phall-brown Apr 17, 2023
f126b9f
update the minimum esmf version requirement
jedwards4b Apr 19, 2023
17fa9d5
Adding custom field subroutine for waves with cesm, based on equivale…
phall-brown Apr 25, 2023
5712122
Passing So_ofrac to wav component
phall-brown Apr 25, 2023
e6451a4
Changing merge to Fwxx_taux to copy
phall-brown Apr 25, 2023
bdd726a
Fixed syntax of addmrg_to call for Fwxx_taux
phall-brown Apr 25, 2023
dec4bfb
Reverted earlier modifications
phall-brown Apr 25, 2023
d4b8441
Substituting Foxx_taux for Faox_taux
phall-brown Apr 25, 2023
d666f83
Revert "Substituting Foxx_taux for Faox_taux"
phall-brown Apr 26, 2023
3925710
Removed export of So_ofrac to wav component (unnecessary), and other …
phall-brown Apr 26, 2023
e142b2d
Cleaning up earlier, temporary code
phall-brown Apr 26, 2023
14bd205
Removed unnecessary fldList variable
phall-brown Apr 26, 2023
abc5658
Adding stress from ice to Fwxx_taux
phall-brown Apr 26, 2023
cb585c5
Removed mrg_fracname from Fwxx merges
phall-brown Apr 26, 2023
95c5188
Added ifrac and ofrac to FBFrac for wave component
phall-brown Apr 26, 2023
5633ff2
Using ifrac and ofrac weights for Fbww merge
phall-brown Apr 26, 2023
a3c13d2
Updated comments to include wave component
phall-brown Apr 26, 2023
962646a
improves the readability of salt budget
jedwards4b Apr 28, 2023
f80e7d7
undo accidental commit
jedwards4b Apr 28, 2023
68baf9f
Added new fractions (ifrac, ofrac) for wave component
phall-brown Apr 28, 2023
04296bd
Added compwav declaration to med_fraction_set subroutine
phall-brown Apr 28, 2023
5bc4403
Corrected two typos where compice was being passed instead of compwav
phall-brown Apr 28, 2023
69317cb
Removing previous additions for wavcomp
phall-brown Apr 29, 2023
baaf12c
Removing stress from compice from Fwxx_taux
phall-brown Apr 29, 2023
24f419c
turn off HierarchyProtocol, not used in cesm this is a memory and ini…
jedwards4b Apr 29, 2023
9c43424
correct comment delimiter
jedwards4b May 1, 2023
fcc45ff
Merge pull request #369 from jedwards4b/Turn_OFF_HierarchyProtocol
jedwards4b May 1, 2023
cf7ec4f
Merge pull request #368 from jedwards4b/improve_diag_salt_format
jedwards4b May 1, 2023
7bb5053
check for nans
mvertens May 5, 2023
284137f
Merge pull request #376 from NorESMhub/noresm
jedwards4b May 5, 2023
9ee4d83
refactored logic
mvertens May 5, 2023
3ad7f1f
updated med_diag_mod with recent changes from escomp
mvertens May 5, 2023
311582c
This fails to enable writing of 'daily' files from forecasts shorter …
kdraeder May 6, 2023
0d2a0c8
Merge branch 'aux_cpl_hist_daily' of github.com:kdraeder/CMEPS into a…
kdraeder May 6, 2023
83bba42
updated counters for nans
mvertens May 8, 2023
0b59db6
consistent alias of use statements for check_for_nans
mvertens May 8, 2023
64439f7
fixed compilation bug
mvertens May 8, 2023
5e02def
add ability to compile without needed shr_infnan - as is the case for…
mvertens May 8, 2023
f1dedf5
Changed Fwxx_taux merge to use 'wfrac'
phall-brown May 9, 2023
22b6278
Merge pull request #377 from mvertens/feature/check_for_nans
jedwards4b May 10, 2023
2685626
Adding merge to wave component Fwxx_taux based on Foxx_taux
phall-brown May 10, 2023
9d4e81c
Fixed a compocn that should have been compwav
phall-brown May 10, 2023
3ca2795
Adding ifrac and ofrac to fraclist_w
phall-brown May 10, 2023
7ac3ca9
make history_n integer variables
jedwards4b May 10, 2023
b22ae22
sames should be samples
jedwards4b May 10, 2023
cca94e4
wopen should return rc
jedwards4b May 10, 2023
a936f7e
Merge pull request #365 from jedwards4b/update_esmf_min_version
jedwards4b May 11, 2023
a316646
major refactor of med_io_mod to handle multiple files
jedwards4b May 11, 2023
4490cff
ntperfile should be type integer
jedwards4b May 11, 2023
57e1970
remove unused variable
jedwards4b May 11, 2023
1aab35a
Merge pull request #1 from jedwards4b/history_n
kdraeder May 11, 2023
5d7470d
CESM_COUPLED should be CESMCOUPLED
jedwards4b May 11, 2023
b60c9d7
Candidate fixes of descriptions and comments
kdraeder May 11, 2023
106a99d
Merge pull request #380 from jedwards4b/cesmcoupledfix
jedwards4b May 11, 2023
42a5fd5
remove dead code
jedwards4b May 11, 2023
96206b6
adjust indentation
jedwards4b May 12, 2023
f2cbf27
Merge pull request #378 from kdraeder/aux_cpl_hist_daily
jedwards4b May 15, 2023
a587023
updates for new stresses sent to wave
May 16, 2023
3dbbda3
merged to head of escomp/main
May 16, 2023
ca8ca8b
udpates needed to pass taux and tauxy to wave
May 16, 2023
d64ffe9
fixed compile bugs
May 16, 2023
488b8d9
fixed compile bugs
May 16, 2023
09d1e08
Merge pull request #382 from mvertens/feature/theorywaves
jedwards4b May 17, 2023
dabe6d3
make xgrid default (should have been in alpha12c) and fix sw flux to …
jedwards4b May 23, 2023
e94015a
slight change in logic
jedwards4b May 23, 2023
b7bc64e
Merge pull request #387 from jedwards4b/fix_aoflux_and_swtoocn
jedwards4b May 24, 2023
97ed1fe
addition of BLOM logic to key XML settings like CPL_SEQ_OPTION
mvertens May 25, 2023
1912caf
Merge commit '97ed1fe' into feature/add_blom_settings
mvertens May 25, 2023
6563613
Merge tag 'cmeps0.14.32' into feature/add_blom_settings
mvertens May 25, 2023
48c247f
made ogrid default for aoflux calculation - since xgrid crashes for f…
mvertens May 25, 2023
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
3 changes: 3 additions & 0 deletions cesm/driver/ensemble_driver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,9 @@ subroutine SetModelServices(ensemble_driver, rc)
else
inst_suffix = ''
endif
! CESM does not use this ESMF feature and at large processor counts it can be expensive to have it on.
call NUOPC_CompAttributeSet(driver, name="HierarchyProtocol", value="off", rc=rc)
if (chkerr(rc,__LINE__,u_FILE_u)) return

! Set the driver instance attributes
call NUOPC_CompAttributeAdd(driver, attrList=(/'read_restart'/), rc=rc)
Expand Down
9 changes: 1 addition & 8 deletions cime_config/buildnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,14 +616,7 @@ def buildnml(case, caseroot, component):
major = line[-2] if "MAJOR" in line else major
minor = line[-2] if "MINOR" in line else minor
logger.debug("ESMF version major {} minor {}".format(major, minor))
expect(int(major) >= 8, "ESMF version should be 8.1 or newer")
if esmf_aware_threading:
expect(
int(minor) >= 2,
"ESMF version should be 8.2.0 or newer when using ESMF_AWARE_THREADING",
)
else:
expect(int(minor) >= 1, "ESMF version should be 8.1.0 or newer")
expect(int(major) >= 8 and int(minor) >=4, "ESMF version should be 8.4.1 or newer")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This logic only works for int(major) == 8. EMF 9.1 or 9.3 would fail. I would prefer:

Suggested change
expect(int(major) >= 8 and int(minor) >=4, "ESMF version should be 8.4.1 or newer")
expect(int(major) >= 8, "ESMF version should be 8.4.1 or newer")
expect(int(major) > 8 or int(minor) >=4, "ESMF version should be 8.4.1 or newer")

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gold2718 - the above did not work for ESMF 8.4.1 - so I'm happy to look at this later - but I'd like to get this PR merged.


confdir = os.path.join(case.get_value("CASEBUILD"), "cplconf")
if not os.path.isdir(confdir):
Expand Down
11 changes: 8 additions & 3 deletions cime_config/config_component_cesm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@
<!-- =================================================== -->
<value compset="_DATM.*_DICE.*_POP2">24</value>
<value compset="_DATM.*_DICE.*_MOM6">24</value>
<value compset="_DATM.*_DICE.*_BLOM">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 -->
<!-- =================================================== -->
Expand All @@ -198,6 +199,7 @@
<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 -->
Expand Down Expand Up @@ -236,9 +238,8 @@
<!-- TODO: why is this here? -->
<value compset="_DLND.*_CISM\d">1</value>
<!-- =================================================== -->
<!-- N compsets -->
<!-- High res BLOM -->
<!-- =================================================== -->
<value compset="_DATM.*_BLOM">24</value>
<value compset="_BLOM" grid="oi%tnx0.25v">48</value>
</values>
<group>run_coupling</group>
Expand Down Expand Up @@ -286,6 +287,8 @@
<value compset="_POP2" grid="oi%tx0.1v3">48</value>
<value compset="_DLND.*_CISM\d">1</value>
<value compset="_NEMO">24</value>
<value compset="_BLOM">24</value>
<value compset="_BLOM" grid="oi%tnx0.25v">48</value>
</values>
<group>run_coupling</group>
<file>env_run.xml</file>
Expand Down Expand Up @@ -335,11 +338,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 All @@ -361,7 +366,6 @@
where basedt is equal to NCPL_BASE_PERIOD in seconds.</desc>
</entry>


<!-- Logic for CPL_ALBAV should be reworked to depend on datm forcing rather
than compset: see https://github.com/ESMCI/cime/issues/120 -->
<entry id="CPL_ALBAV">
Expand Down Expand Up @@ -421,6 +425,7 @@
<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>
Expand Down
Loading