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

bgcNICE tests and bug fix #203

Merged
merged 5 commits into from
Jun 19, 2018
Merged

Conversation

eclare108213
Copy link
Contributor

@eclare108213 eclare108213 commented Jun 6, 2018

bgcNICE tests and bug fix

  • Developer(s): E. Hunke

  • Please suggest code Pull Request reviewers in the column at right.

  • Are the code changes bit for bit, different at roundoff level, or more substantial? BFB

  • Is the documentation being updated with this PR? (Y/N) YES
    If not, does the documentation need to be updated separately at a later time? (Y/N) N
    Note: "Documentation" includes information on the wiki and .rst files in doc/source/,
    which are used to create the online technical docs at https://readthedocs.org/projects/cice-consortium-icepack/.

  • Other Relevant Details:

The NICE data is only valid for 24 days, so restart tests do not make sense. I removed them from the base and travis test suites.

Added a skeletal layer BGC smoke test to both test suites. It also uses the NICE data.

set_env.bgc is not used, so it's been deleted.

Fixed a bug in the skeletal layer configuration that was causing the code to crash in debug tests with a trcrn index = 0.

Checked that the timeseries plotter works correctly for NICE output.

Base_suite passes all tests including the new skeletal layer smoke test. See https://github.com/CICE-Consortium/Test-Results/wiki/v1.0.0.d0003.7b21edfc32.pinto.intel.180605.235425

@eclare108213
Copy link
Contributor Author

Added to this PR:
Moved forcing filenames to namelist and updated the documentation for the new namelist fields, atm_data_file, ocn_data_file, ice_data_file, bgc_data_file. The default icepack_in sets these new fields consistently with the default forcing used (clim with SHEBA ice convergence). Updated forcing filenames for ISPOL, NICE to the new ones provided by @njeffery (which are available on the ftp site). The base suite passes as before. Have not checked the documentation results.
This PR should be ready to merge now, if the reviewers agree.

@duvivier
Copy link
Contributor

duvivier commented Jun 9, 2018

Should bgc_data_dir and bgc_data_file both be specified in the bgc namelist instead of split into the bgc and forcing namelists?

Otherwise this looks fine.

@eclare108213
Copy link
Contributor Author

@duvivier Good point. bgc_data_dir is not used at all in Icepack, so I'll remove it. We might need it for CICE, though, and in that case I think it should be in the forcing namelist rather than bgc, to make it consistent with other parts of the code (e.g. we don't have the SHEBA convergence data flag in the dynamics namelist).

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.

Thank you for moving filenames to namelist!

@eclare108213
Copy link
Contributor Author

@duvivier I removed references to bgc_data_dir from the documentation. If that's all that's needed for the docs, then I think this one is ready to merge -

@duvivier duvivier merged commit 76111a4 into CICE-Consortium:master Jun 19, 2018
@duvivier
Copy link
Contributor

Okay, I think that was all that was needed. Merging now!

lettie-roach pushed a commit to lettie-roach/Icepack that referenced this pull request Oct 18, 2022
References and testing in documentation
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