Updating COMPASS ocean test cases based on mpas_tools reorg#577
Updating COMPASS ocean test cases based on mpas_tools reorg#577mark-petersen merged 23 commits intoMPAS-Dev:ocean/developfrom
Conversation
TestingMy testing for now is only to run the A check mark in the list above indicates that |
c2605a5 to
ab4a6f9
Compare
ab4a6f9 to
cec9409
Compare
cec9409 to
5f8842f
Compare
Testing on GrizzlyVerification that results are bit-for-bit in
|
5f8842f to
98f4d94
Compare
|
@mark-petersen and @sbrus89, I have a test compass environment, This new environment includes some new geometric features so you will not be able to sue your old tests as a baseline. (These new features are included in the release version of |
98b0a5e to
a467503
Compare
|
@mark-petersen and @sbrus89, I'm starting to test this now. Just a heads up. |
|
@mark-petersen and @sbrus89, I realized that my tests for this PR are non-bit-for-bit because I changed the Earth radius in MPAS-Dev/MPAS-Tools#314. I'm going to pull that change out of MPAS-Dev/MPAS-Tools#314 for now and make a new test environment without that change. Then, we can have a separate PR to MPAS-Tools just for that non-bit-for-bit change before we do the next |
|
I would like to keep |
177a0a5 to
83d114c
Compare
|
@sbrus89 and @mark-petersen, all my testing has now passed bit-for-bit. I tested all the cases listed above through I also tested forward mode on the QU240 and QU240wISC runs, comparing the current Getting this tested and merged is somewhat of a priority because it is holding up #668, #669 and #671. Also, I will do a second PR related to changing the Earth radius. That one is not bit-for-bit so testing will be trickier, and we should discuss how to do it. Please let me know what the schedule would be for testing and merging this. I understand that there are also other high priority items at the moment, but the EC30to60km meshes are needed as soon as possible so they can be tested and approved for the v2 release at the end of this month. |
There was a problem hiding this comment.
Merged #577 and #680 locally. Ran nightly regression suite with test_compass_0.1.10, was bfb with ocean/develop on all tests. Then ran with test2_compass_0.1.10 and init for QU240 was not bfb with previous, as expected.
I then ran EC60to30 and EC60to30wISC. All ran fine. EC60to30 prep-spinup1 was within 1% global kinetic energy after 6 days as previous ocean/develop. EC60to30wISC ran through ssh iterations and test. I cherry-picked #676 on the before and after on all spin-ups.
sbrus89
left a comment
There was a problem hiding this comment.
Approved, based on inspection of hurricane/USDEQU240at60cr20rr4WD case.
|
Thanks for your work on this @xylar! |
|
Thanks very much @sbrus89 and @mark-petersen for the review and for your testing. |


This merge updates COMPASS ocean test cases to make them compatible with MPAS-Dev/MPAS-Tools#314. This includes:
define_base_mesh.pytobuild_base_mesh.py, which callsbuild_spherical_mesh()explicitly (whereas the oldbuild_meshcalled thecellWidthVsLatLon()fromdefine_base_mesh, which created a problematic import of a local module withinbuild_mesh).coastal_tools(other thansigned_distancefunctions),inject_bathymetry,inject_meshDensityandinject_preserve_floodplaintompas_tools.oceanAffected test cases are (check mark indicates they have been updated):
Gaussian_hump/USDEQU120cr10rr2/build_mesh/coastal/Maine/initcoastal/USDEQU120cr10rr2/build_meshglobal_ocean/ARM60to10/initglobal_ocean/CA120to3/build_meshglobal_ocean/EC60to30/initglobal_ocean/EC60to30wISC/initglobal_ocean/HI120to12/build_meshglobal_ocean/QU240/initglobal_ocean/QU240wISC/initglobal_ocean/SO60to10wISC/initglobal_ocean/WC12/initglobal_ocean/WC14/inithurricane/USDEQU120at30cr10rr2/build_meshhurricane/USDEQU120at30cr10rr2WD/build_meshhurricane/USDEQU120at30cr10rr2WD_veg/build_meshhurricane/USDEQU240at60cr20rr4/build_meshhurricane/USDEQU240at60cr20rr4WD/build_meshhurricane/USDEQU240at60cr20rr4WD_veg/build_meshhurricane/USDEQU60at15cr5rr1/build_meshhurricane/USDEQU60at15cr5rr100WD/build_meshhurricane/USDEQU60at15cr5rr1WD/build_meshhurricane/USDEQU60at15cr5rr1WD_veg/build_meshhurricane/USDEQU60at15cr5rr250WD/build_meshhurricane/USDEQU60at15cr5rr500WD/build_meshtides/USDEQU120at30cr10/build_mesh