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

fsd2 #394

Merged
merged 9 commits into from
Jan 24, 2020
Merged

fsd2 #394

merged 9 commits into from
Jan 24, 2020

Conversation

lettie-roach
Copy link
Contributor

@lettie-roach lettie-roach commented Jan 10, 2020

PR checklist

  • Short (1 sentence) summary of your PR:
    Correction to 'wave_spec_type' logic
  • Developer(s):
    @lettie-roach
  • Suggest PR reviewers from list in the column to the right.
    @eclare108213 @apcraig @duvivier
  • Please copy the PR test results link or provide a summary of testing completed below.

https://github.com/CICE-Consortium/Test-Results/wiki/c52a091233.badger.intel.20-01-24.033842

225 of 236 tests PASSED
10 of 236 tests FAILED
0 of 236 tests PENDING

See explanation below (@eclare108213).

  • 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
  • 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:

Correction to 'wave_spec_type' - remove 'file' option (redundant). Updated documentation.

wave_spec_type
none = no wave data provided, no wave-ice interactions
profile = use a hard-coded, default profile for testing wave-ice interactions
constant = wave data file is provided, use constant wave spectrum, for testing
random = wave data file is provided, wave spectrum generated using random number

I also changed the code so that if wave_spec_type = 'none', then the wave spectrum is set to zero. Previously, we used a dummy fixed wave spectrum in this case, which was useful for code testing, but I think should be zeroed out for the general user.

The FSD physics is unchanged, but the logic for the wave forcing has been corrected, which changes the answers for the fsd12 test option. @eclare108213 changed the fsd12 test because it was aborting due to the new wave_spec_type logic.

@eclare108213
Copy link
Contributor

Travis CI is failing on the ftp data retrieval. I relaunched it and it failed again.

Copy link
Contributor

@eclare108213 eclare108213 left a comment

Choose a reason for hiding this comment

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

Does this change mean that wave_spectrum_profile is not used at all and could be removed from the code?

I agree we don't want the user to set wave_spec_type='none' and it be unexpectedly nonzero. However, having nonzero values does allow meaningful testing without a data file, and if I remember correctly, we only have the data in netCDF, not binary format. So perhaps we should keep the profile and have these options for wave_spec_type:
none
profile
constant
random
Does that make sense?

@lettie-roach
Copy link
Contributor Author

lettie-roach commented Jan 11, 2020 via email

Copy link
Contributor

@eclare108213 eclare108213 left a comment

Choose a reason for hiding this comment

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

The code changes look fine to me, except there is a change to Icepack showing up that's probably not intended. Will these changes result in non-BFB test results for the ww3 test case? It's fine if they do, since this is fixing a bug. @lettie-roach do you have your computational environment set up to be able to run the test suites, or at least the fsd test cases, and compare with the code without your mods? We'll need that done for this PR.

@lettie-roach
Copy link
Contributor Author

lettie-roach commented Jan 13, 2020 via email

@eclare108213
Copy link
Contributor

Okay, then you have something to learn during the tutorial! I'll try to get a set of tests running here this week. I'll let @apcraig figure out the Icepack thing and make a recommendation for what to do. Thanks!

Copy link
Contributor

@apcraig apcraig left a comment

Choose a reason for hiding this comment

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

It looks like this change includes an update to the latest Icepack version on master. Those changes do not affect CICE and I'm happy for them to be included.

I have looked at the rest of the code changes and don't see any issues.

@eclare108213
Copy link
Contributor

Ran the base_suite and compared with the current master. The fsd12 (no ww3) tests fails because of the namelist change, as expected. The ‘robin’ decomposition tests are failing for an unknown reason, but the fsd changes should not be contributing; both appear to have dropped nodes and timed out. The JRA runs fails because the data is still unavailable. I think these results are acceptable and the PR is ready to merge.

@eclare108213 eclare108213 assigned apcraig and unassigned eclare108213 Jan 24, 2020
@eclare108213
Copy link
Contributor

@apcraig please double-check that the Icepack change is desirable in this commit. Thx

@apcraig apcraig merged commit e18b650 into CICE-Consortium:master Jan 24, 2020
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