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

solve_zsal bug fix and update zsal test option #549

Merged
merged 2 commits into from
Jan 18, 2021

Conversation

eclare108213
Copy link
Contributor

@eclare108213 eclare108213 commented Dec 30, 2020

  • Short (1 sentence) summary of your PR:
  1. activate nltrcr when solve_zsal=T
  2. set z_tracers=F in zsal test
  3. add salinity profile to print_state for debugging
  4. clean up and sync the regular and debug RunMod modules
  • Developer(s):
    @eclare108213
  • 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.

see comments 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 add any new test cases?
    • Yes
    • No, but it modifies the zsal option
  • 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:

The bug fix is simply to set nltrcr=1 when solve_zsal=T.
The z_tracers flag turns on vertical biogeochemistry, which is not needed to test the zsalinity capability.
Testing is underway.

Icepack PR#346 is related but independent of these changes.

@eclare108213
Copy link
Contributor Author

I don't entirely understand the test results:
https://github.com/CICE-Consortium/Test-Results/wiki/dd6e38f84d.badger.intel.20-12-30.213751.0

268 measured results of 268 total results
242 of 268 tests PASSED
0 of 268 tests PENDING
13 of 268 tests MISSING data
13 of 268 tests FAILED

The failures are the usual 40-proc configurations that always fail on badger and a bunch of decomp tests, which weren't run in the CICE v6.1.4 base_suite. I don't understand why they were run in the new code, since the base_suite script is identical. @apcraig Do you know what is causing the decomp tests to run in my new code?

consortium master:

[eclare@ba-fe1 cice.v6.1.4]$ cice.setup -m badger --suite base_suite --testid cbase1 --bgen cbase1

my fork:

[eclare@ba-fe1 cice.zsal2]$ cice.setup -m badger --suite base_suite --testid zsal3 --bcmp cbase1

Regardless, I think the zsal tests are okay for now, though probably still not bug-free. @apcraig please check whether this fixes the problem on cheyenne noted in #548. Thanks!

Should we merge Icepack PR#346 first then update Icepack in CICE as part of this PR?

@eclare108213
Copy link
Contributor Author

Also, travis seems to be hung for both this PR and the icepack one.

@phil-blain
Copy link
Member

Regarding Travis: indeed I don't see either PR at https://travis-ci.com/github/CICE-Consortium/CICE/pull_requests (CICE) or https://travis-ci.com/github/CICE-Consortium/Icepack/pull_requests (Icepack).

I know that Travis changed their plan recently, and free plans now have a maximum "credits", i.e. build minutes. The announcement blog post says the 10K credit for free plans is equivalent to around 1000 minutes, so maybe we have run out... It also says as an open-source project we can apply for more free credits... or we could consider switching to GitHub Actions instead.

@apcraig
Copy link
Contributor

apcraig commented Jan 3, 2021

travis-ci is currently disabled for us. See #550.

@apcraig
Copy link
Contributor

apcraig commented Jan 7, 2021

I have verified that this change in addition tested with the Icepack change CICE-Consortium/Icepack#346 fixes the zsal failing test (although I think Icepack changes have no role). I am now running a full test suite with both sets of changes. If all goes well, I propose we merge CICE-Consortium/Icepack#346 and as well as this PR. This PR could also be updated to include the newer Icepack as well, or that could come via a separate PR.

@apcraig
Copy link
Contributor

apcraig commented Jan 8, 2021

Full test suite results on cheyenne with 3 compilers is here, https://github.com/CICE-Consortium/Test-Results/wiki/cice_by_hash_forks#dd6e38f84da340b7956dd8a10af04627a1725334. Everything looks good.

@eclare108213, if you want to change this PR from a draft and update Icepack after merging the Icepack zsal PR there, that would be fine. Alternatively, we can just merge this if it's ready. Let me know how I can help.

@eclare108213
Copy link
Contributor Author

I'll update icepack after CICE-Consortium/Icepack#346 is merged.

@apcraig
Copy link
Contributor

apcraig commented Jan 18, 2021

@eclare108213, any chance to update icepack and switch this PR from draft mode? We could also update icepack and merge this now. Either way.

@eclare108213
Copy link
Contributor Author

Sorry, I haven't had a chance to come back to this. @apcraig would you have time to update Icepack, test and merge? I think it's ready.

@apcraig
Copy link
Contributor

apcraig commented Jan 18, 2021

I just updated Icepack. I ran full test suites before and verified (via diffs) that this PR is exactly what was tested before.

https://github.com/CICE-Consortium/Test-Results/wiki/cice_by_hash_forks#dd6e38f84da340b7956dd8a10af04627a1725334

I will also change the draft setting and we should be able to merge after any other reviews and @eclare108213 agrees it's ready.

@apcraig apcraig marked this pull request as ready for review January 18, 2021 21:39
@eclare108213
Copy link
Contributor Author

I think we should go ahead and merge this.

@apcraig apcraig merged commit d0084dd into CICE-Consortium:master Jan 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants