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

Add test class for ACCESS-ESM1.6 #122

Merged
merged 1 commit into from
Mar 3, 2025
Merged

Conversation

dougiesquire
Copy link
Collaborator

Adds an ACCESS-ESM1.6 test class for use with the new ACCESS-ESM1.6 Payu driver. Closes #121

@dougiesquire
Copy link
Collaborator Author

I'll update the tests next week

@dougiesquire
Copy link
Collaborator Author

Also, do we want to address this first/now: #123

@blimlim
Copy link
Contributor

blimlim commented Mar 2, 2025

Also, do we want to address this first/now: #123
I think adding the test class first and then working out the repro tests after sounds good!

Copy link

codecov bot commented Mar 2, 2025

Codecov Report

Attention: Patch coverage is 82.35294% with 3 lines in your changes missing coverage. Please review.

Project coverage is 75.21%. Comparing base (87a8341) to head (b5e995f).
Report is 10 commits behind head on main.

Files with missing lines Patch % Lines
src/model_config_tests/models/accessesm1p5.py 66.66% 1 Missing ⚠️
src/model_config_tests/models/accessom2.py 66.66% 1 Missing ⚠️
src/model_config_tests/models/accessom3.py 66.66% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #122      +/-   ##
==========================================
+ Coverage   74.94%   75.21%   +0.27%     
==========================================
  Files          17       18       +1     
  Lines         906      916      +10     
==========================================
+ Hits          679      689      +10     
  Misses        227      227              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@dougiesquire
Copy link
Collaborator Author

I think adding the test class first and then working out the repro tests after sounds good!

Sounds good, thanks @blimlim. Tests fixed and ready for review then

jo-basevi
jo-basevi previously approved these changes Mar 3, 2025
Copy link
Collaborator

@jo-basevi jo-basevi left a comment

Choose a reason for hiding this comment

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

Looks good to me

All the test resources files might not be needed at the moment - were they added pre-emptively for future tests? For the tests for parsing checksums (tests/test_model_extract_checksums.py), I think it just requires the following test resources to work:

  • tests/resources/access-esm1.6/checksums/1-0-0.json
  • tests/resources/access-esm1.6/output000/access-esm1.6.out

Could add the dev-preindustrial+concentrations to this parametrised test? I think it would need just the config.yaml file as well.

@pytest.mark.parametrize(
"model_name, output_0, configuration",
[
("access", "output000", None),
("access", "output000", "release-preindustrial+concentrations"),
("access-om2", "output000", "release-1deg_jra55_ryf"),
("access-om3", "restart000", "om3-dev-1deg_jra55do_ryf"),
("access-om3", "restart000", "om3-wav-dev-1deg_jra55do_ryf"),
],
)
@pytest.mark.parametrize("fail", [False, True])
def test_test_bit_repro_historical(tmp_dir, model_name, output_0, configuration, fail):

blimlim
blimlim previously approved these changes Mar 3, 2025
Copy link
Contributor

@blimlim blimlim left a comment

Choose a reason for hiding this comment

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

Thanks @dougiesquire for fixing this up! Looks all good to me

@dougiesquire dougiesquire dismissed stale reviews from blimlim and jo-basevi via a768dc0 March 3, 2025 03:53
@dougiesquire dougiesquire force-pushed the 121-add-esm1.6-test-class branch from a768dc0 to b5e995f Compare March 3, 2025 03:57
@dougiesquire
Copy link
Collaborator Author

All the test resources files might not be needed at the moment - were they added pre-emptively for future tests?

Good point. I just copied the access-esm1.5 test config but didn't actually notice the access-esm1.6 qa check tests were commented out and not actually testing anything. I've removed the access-esm1.6 test configuration for now until we have a release- config to use (by that point we'll possibly have removed the tests/resources folder anyway)

Could add the dev-preindustrial+concentrations to this parametrised test? I think it would need just the config.yaml file as well.

As above, I've now remove the dev-preindustrial+concentrations test config, but access-esm1.6 is now being tested as part of test_test_bit_repro_historical.

Sorry, could I get a re-approval from one of you @jo-basevi, @blimlim

Copy link
Collaborator

@jo-basevi jo-basevi left a comment

Choose a reason for hiding this comment

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

Thanks @dougiesquire - LGTM

@dougiesquire dougiesquire merged commit ff89850 into main Mar 3, 2025
8 checks passed
@dougiesquire dougiesquire deleted the 121-add-esm1.6-test-class branch March 3, 2025 04:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add ACCESS-ESM1.6 test class
3 participants