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.

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

Port ice_shelf_2d test cases #158

Merged
merged 30 commits into from
Jul 17, 2024
Merged

Conversation

cbegeman
Copy link
Collaborator

@cbegeman cbegeman commented Dec 20, 2023

This is largely a direct port of the ice_shelf_2d test cases from compass. The main changes are the following:

  • Port does not include thin film and tidal forcing tests. Their utility remains unclear from my wetting-and-drying work.
  • [WIP I will increase time steps to their original values] Barotropic time step has been reduced from 15s to 5s for the 5km-resolution configuration. This is not necessary, but I thought that the ratio of baroclinic:barotropic time steps should be increased from 2 to 6 to be more representative of typical configurations.
  • The restart test now shares the forward step (the first run) with the default test. This is motivated mostly by computational efficiency.

Checklist

  • User's Guide has been updated
  • Developer's Guide has been updated
  • API documentation in the Developer's Guide (api.md) has any new or modified class, method and/or functions listed
  • Documentation has been built locally and changes look as expected
  • Testing comment in the PR documents testing used to verify the changes
  • New tests have been added to a test suite

@cbegeman cbegeman requested a review from xylar December 20, 2023 17:31
@cbegeman cbegeman self-assigned this Dec 20, 2023
@cbegeman cbegeman added in progress This PR is not ready for review or merging ocean Related to ocean tests or analysis labels Dec 20, 2023
@cbegeman
Copy link
Collaborator Author

@xylar This PR includes the ssh_adjustment framework I added. Please suggest changes if something different would be more convenient for isomip_plus.

@cbegeman
Copy link
Collaborator Author

@xylar Also, when you have a chance, let me know what you think of this restart test approach. I'd like to do something similar for the baroclinic channel test.

@xylar
Copy link
Collaborator

xylar commented Dec 21, 2023

@cbegeman, thanks so much for this work! I'll take a look as soon as I can.

Copy link
Collaborator

@xylar xylar left a comment

Choose a reason for hiding this comment

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

@cbegeman, what excellent work, as usual! I have some fairly minor suggestions focused on ssh adjustment for now, since I am interested in that shared functionality.

polaris/ocean/ice_shelf/__init__.py Outdated Show resolved Hide resolved
polaris/ocean/ice_shelf/__init__.py Outdated Show resolved Hide resolved
polaris/ocean/ice_shelf/__init__.py Outdated Show resolved Hide resolved
polaris/ocean/ice_shelf/__init__.py Outdated Show resolved Hide resolved
polaris/ocean/ice_shelf/__init__.py Outdated Show resolved Hide resolved
polaris/ocean/ice_shelf/ssh_adjustment.py Outdated Show resolved Hide resolved
polaris/ocean/ice_shelf/ssh_adjustment.py Outdated Show resolved Hide resolved
@cbegeman cbegeman force-pushed the ocn-port-ice-shelf-2d branch from 75721a6 to 77874a6 Compare January 8, 2024 22:22
@cbegeman
Copy link
Collaborator Author

cbegeman commented Jan 8, 2024

@xylar I think I've made all the changes you requested to the ssh_adjustment framework. Please let me know if there's anything else that is holding up your isomip_plus work. Otherwise, I'll move on to finishing up the rest of the tests in the group and docs and docstrings.

@xylar
Copy link
Collaborator

xylar commented Jan 9, 2024

@cbegeman, I haven't had a chance to look over the latest updates today but I do think I have what I need for isomip_plus and you can finalize the docs and anything else remaining for this development when you have time.

@cbegeman
Copy link
Collaborator Author

cbegeman commented Jan 9, 2024

@xylar Also, when you have a chance, let me know what you think of this restart test approach. I'd like to do something similar for the baroclinic channel test.

@xylar Whenever you have time

@xylar
Copy link
Collaborator

xylar commented Jan 9, 2024

Oh, thanks! I lost track of that one.

@xylar
Copy link
Collaborator

xylar commented Jan 9, 2024

The restart approach you have here looks great to me!

@cbegeman cbegeman force-pushed the ocn-port-ice-shelf-2d branch 2 times, most recently from c081067 to d017f7b Compare January 11, 2024 23:44
@cbegeman
Copy link
Collaborator Author

Testing

All new single_layer and z-star tests have been run on chrys with intel, impi.

@cbegeman cbegeman removed the in progress This PR is not ready for review or merging label Jan 16, 2024
@cbegeman
Copy link
Collaborator Author

@xylar I think this is all set to review. It took changing the number of vertical levels (from 20 to 50, though I didn't test values in between) to revive z-level (otherwise ssh_adjustment hangs).

Copy link
Collaborator

@xylar xylar left a comment

Choose a reason for hiding this comment

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

@cbegeman, I'm sorry for not doing a thorough enough review the last time through. I noticed another issue in the SSH-adjustment framework that will need to be addressed (and maybe one we should discuss).

I also started testing the ice_shelf_2d tasks themselves on Perlmutter but it's about to go down for maintenance.

polaris/ocean/ice_shelf/ssh_forward.py Outdated Show resolved Hide resolved
polaris/ocean/ice_shelf/ssh_adjustment.py Outdated Show resolved Hide resolved
polaris/ocean/ice_shelf/ssh_forward.py Outdated Show resolved Hide resolved
polaris/ocean/model/time.py Outdated Show resolved Hide resolved
polaris/ocean/ice_shelf/ssh_adjustment.py Outdated Show resolved Hide resolved
@cbegeman
Copy link
Collaborator Author

@xylar When you have a chance, you can try the new setup_ssh_adjustment_steps approach with an ssh_forward class and an overridden compute_cell_count method.

@cbegeman cbegeman force-pushed the ocn-port-ice-shelf-2d branch 2 times, most recently from 25ce071 to 7699544 Compare January 17, 2024 16:57
@xylar
Copy link
Collaborator

xylar commented Jan 17, 2024

@cbegeman, wow, that was fast work! I'll try this out again tomorrow.

Copy link
Collaborator

@xylar xylar left a comment

Choose a reason for hiding this comment

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

I'm back to working on SSH adjustment in ISOMIP+. I ran into a few more things for us to chat about.

polaris/ocean/ice_shelf/ssh_forward.py Outdated Show resolved Hide resolved
polaris/ocean/ice_shelf/ssh_forward.py Outdated Show resolved Hide resolved
polaris/ocean/ice_shelf/__init__.py Outdated Show resolved Hide resolved
polaris/ocean/ice_shelf/__init__.py Outdated Show resolved Hide resolved
polaris/ocean/ice_shelf/__init__.py Outdated Show resolved Hide resolved
polaris/ocean/ice_shelf/ssh_forward.py Outdated Show resolved Hide resolved
polaris/ocean/ice_shelf/ssh_forward.py Outdated Show resolved Hide resolved
polaris/ocean/ice_shelf/ssh_forward.py Outdated Show resolved Hide resolved
polaris/ocean/ice_shelf/ssh_forward.py Outdated Show resolved Hide resolved
polaris/ocean/ice_shelf/ssh_forward.py Outdated Show resolved Hide resolved
@cbegeman cbegeman force-pushed the ocn-port-ice-shelf-2d branch from f105fac to 8364eda Compare July 16, 2024 16:54
@cbegeman
Copy link
Collaborator Author

@xylar This is ready for your review. Thanks!

@xylar xylar added the enhancement New feature or request label Jul 17, 2024
Copy link
Collaborator

@xylar xylar left a comment

Choose a reason for hiding this comment

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

@cbegeman, very exciting to finally get this in!

I ran all the ice_shelf_2d test cases on Chrysalis:

/lcrc/group/e3sm/ac.xylar/polaris_0.3/chrysalis/test_20240717/ice_shelf_2d

@xylar xylar assigned xylar and unassigned cbegeman Jul 17, 2024
@xylar xylar merged commit e327086 into E3SM-Project:main Jul 17, 2024
4 checks passed
@xylar xylar deleted the ocn-port-ice-shelf-2d branch July 17, 2024 10:03
@cbegeman
Copy link
Collaborator Author

@xylar Thanks for your review and testing!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request ocean Related to ocean tests or analysis
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants