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

Remove orca grid #986

Merged
merged 5 commits into from
Nov 7, 2024
Merged

Conversation

anton-seaice
Copy link
Contributor

@anton-seaice anton-seaice commented Oct 24, 2024

PR checklist

  • Short (1 sentence) summary of your PR:
    Deprecate ORCA grid - closes Deprecate ORCA grid #983

  • Developer(s):
    @anton-seaice

  • Suggest PR reviewers from list in the column to the right.

  • Please copy the PR test results link or provide a summary of testing completed below.

  • How much do the PR code changes differ from the unmodified code?

    • bit for bit
    • different at roundoff level
    • more substantial
  • Does this PR create or have dependencies on Icepack or any other models?

    • Yes
    • No
  • Does this PR update the Icepack submodule? If so, the Icepack submodule must point to a hash on Icepack's main branch.

    • Yes
    • No
  • Does this PR add any new test cases?

    • Yes
    • No
  • Is the documentation being updated? ("Documentation" includes information on the wiki or in the .rst files from doc/source/, which are used to create the online technical docs at https://readthedocs.org/projects/cice-consortium-cice/. A test build of the technical docs will be performed as part of the PR testing.)

    • Yes
    • No, does the documentation need to be updated at a later time?
      • Yes
      • No

The wiki might need updating also ?

  • Please document the changes in detail, including why the changes are made. This will become part of the PR commit log.

Deprecate ORCA/CPOM grid functionality as it is not uses in CICE6. The model will abort if orca_halogrid = .true. or gridtype='cpom_grid' in the namelist.

Tidy compiler flags

extend a few tests

extend one more

tidy

fix gadi test submission

Tidy compiler flags

extend a few tests

longer again
@eclare108213
Copy link
Contributor

@phil-blain Please confirm that this PR does not interfere with NEMO in your systems.

@anton-seaice
Copy link
Contributor Author

I ran the base_suite and all tests pass with no regressions / results are BFB

Copy link
Member

@phil-blain phil-blain left a comment

Choose a reason for hiding this comment

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

I looked at the changes locally using git show --color-moved --color-moved-ws=allow-indentation-change and everything looks in order.

We do not use the orca_halogrid flag (nor the CPOM grid) so this does not impact us.

I appreciate the code simplification:) Thanks Anton.

cicecore/cicedyn/general/ice_init.F90 Outdated Show resolved Hide resolved
@apcraig
Copy link
Contributor

apcraig commented Oct 25, 2024

I am testing this and #985 on derecho. Just FYI, #985 and #986 have conflicts in

cicecore/cicedyn/infrastructure/ice_read_write.F90
configuration/scripts/tests/base_suite.ts

I have resolved them in my sandbox, but they will need to be resolved in the PRs before we merge. I suggest we merge one PR, then resolve the conflicts in the other PR before merging it. The conflicts are straight-forward, although we will need to decide whether we want "short" or "medium" runlength settings on some of the tests.

@anton-seaice
Copy link
Contributor Author

Thanks @apcraig - sounds good. Longer is better for the runlength.

@apcraig
Copy link
Contributor

apcraig commented Oct 28, 2024

Ran the quick suite on derecho with 6 compilers and all tests pass, tested done with #985. Will merge this week, trying to merge fsd mods first.

@apcraig
Copy link
Contributor

apcraig commented Nov 5, 2024

@anton-seaice, can you reconcile the conflicts with just merged #985 and update the PR. Thanks!

@anton-seaice
Copy link
Contributor Author

This is ready to go - thanks Tony :)

@apcraig apcraig merged commit 8707e16 into CICE-Consortium:main Nov 7, 2024
2 checks passed
@anton-seaice anton-seaice deleted the remove_orca_grid branch November 24, 2024 22:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Deprecate ORCA grid
4 participants