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

Fix evp 1d masking issues #17

Merged
merged 1 commit into from
Jul 17, 2021
Merged

Conversation

apcraig
Copy link

@apcraig apcraig commented Jul 17, 2021

PR checklist

  • Short (1 sentence) summary of your PR:
    Fix evp 1d masking issues, seems to be final fix to get 1d debug results bit-for-bit with 2d.

  • Developer(s):
    apcraig

  • 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.
    Full test suites run on cheyenne with intel, pgi, and gnu. Tested 1d evp debug vs 2d evp debug. Also tested standard test suite vs baseline. All results are as expected. alt04 results are different, 1x1 and 2x2 still broken, unit tests different, some tests time out in debug mode due to slower run times. There were partly run manually, but mostly just skipped. We have a large sample of positive results, so we shoudl be OK. https://github.com/CICE-Consortium/Test-Results/wiki/cice_by_hash_forks#126245535038576bb68746004754915fe96ee06c

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

    • bit for bit, except 1d evp which has a bug fix
    • different at roundoff level
    • more substantial
  • Does this PR create or have dependencies on Icepack or any other models?

    • 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
  • Please provide any additional information or relevant details below:

  • There are relatively rare cases/gridcells where stress (tmask) and stepu (umask) are advanced
    without the other. The 1d evp implementation was not addressing this issue, so skiptcell was added
    to the 1d evp (similar to skipucell) to mask out cells separately for stress and stepu. This
    fixed a few non bit-for-bit cases in testing.

  • Cleaned up some indentation and other minor issues in 1d evp.

  • Updated the evp_algorithm log output in ice_init.

- There are relatively rare cases/gridcells where stress (tmask) and stepu (umask) are advanced
without the other.  The 1d evp implementation was not addressing this issue, so skiptcell was added
to the 1d evp (similar to skipucell) to mask out cells separately for stress and stepu.  This
fixed a few non bit-for-bit cases in testing.

- Cleaned up some indentation and other minor issues in 1d evp.

- Updated the evp_algorithm log output in ice_init.
@apcraig apcraig mentioned this pull request Jul 17, 2021
12 tasks
@srethmeier
Copy link
Collaborator

Looks good to me. Will test in our end as well, but merging as is.

@srethmeier srethmeier merged commit 064bc47 into TillRasmussen:master Jul 17, 2021
TillRasmussen added a commit that referenced this pull request Nov 19, 2021
#17)

* Changes in ice_dyn* are interpolation of uvelE/vvelN to B grid. ice_transport files are changed in a way so that velocities are interpolated to b grid for depature point function and kept at E or N grid possible.

* changed according to comments. changed average from F to S and. commented out in vp and eap

* comment out grid_system, uvelE and vvelN
@apcraig apcraig deleted the evp1da branch August 17, 2022 20:58
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.

2 participants