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

Make xgrid the default aoflux_grid when atm and ocn are running on different grids #515

Merged
merged 3 commits into from
Oct 24, 2024
Merged

Make xgrid the default aoflux_grid when atm and ocn are running on different grids #515

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15a480e
Use xgrid for aoflux calculation unless atm & ocn are on the same grid
billsacks Oct 16, 2024
e649244
Add a test with aoflux_grid = ogrid
billsacks Oct 16, 2024
aa7f5c1
Merge branch 'main' into xgrid_default
billsacks Oct 24, 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
5 changes: 4 additions & 1 deletion cime_config/namelist_definition_drv.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,7 +925,10 @@
default: ogrid
</desc>
<values>
<value>ogrid</value>
<value>xgrid</value>
<!-- xgrid introduces unnecessary cost and complexity if atm & ocn are on the same
grid, so fall back to ogrid in that case -->
<value samegrid_atm_ocn='true'>ogrid</value>
</values>
</entry>
<entry id="ocn_surface_flux_scheme">
Expand Down
10 changes: 10 additions & 0 deletions cime_config/testdefs/testlist_drv.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,16 @@
</options>
</test>

<test compset="X" grid="f19_g17" name="ERS_D_Ln9" testmods="drv/aoflux_ogrid">
<machines>
<machine name="derecho" compiler="intel" category="aux_cmeps"/>
Comment on lines +68 to +70
Copy link
Member Author

Choose a reason for hiding this comment

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

I felt like it would be good to have at least one test that still covers doing the aoflux calculation on the ogrid to ensure that that configuration continues to work. It felt right to add this to aux_cmeps since this is about testing cmeps code, but I'm not sure how often aux_cmeps is actually run. @jedwards4b do you have feelings on whether aux_cmeps is reasonable or if we should add this to prealpha or prebeta (instead or in addition)?

Also, I wasn't positive if an X compset actually covers the atm-ocn flux calculation, and so if this X compset test is sufficient for exercising aoflux_grid=ogrid. @jedwards4b or @mvertens do you know? If you aren't sure, I can try to confirm that we're covering relevant code with this test, or just change it to a B compset.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I agree that retaining at least one ogrid case is a good idea.

</machines>
<options>
<option name="wallclock"> 00:40:00 </option>
<option name="comment">The default aoflux_grid is now xgrid; include a debug test with different atm/ocn grids with aoflux_grid=ogrid to make sure that option continues to work.</option>
</options>
</test>

<!-- ======================================= -->
<!-- B compsets -->
<!-- ======================================= -->
Expand Down
1 change: 1 addition & 0 deletions cime_config/testdefs/testmods_dirs/drv/aoflux_ogrid/user_nl_cpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
aoflux_grid = "ogrid"
Loading