Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ please refer to: <https://github.com/CICE-Consortium/About-Us/wiki/Resource-Inde
- 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/.)
- 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
Expand Down
8 changes: 8 additions & 0 deletions doc/source/master_list.bib
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,14 @@ @Article{Hunke09
issue = {CB},
url = {http://dx.doi.org/10.1029/2008JC005186}
}
@Article{Large09
author = "W.G. Large and S.G. Yeager",
title = "{The global climatology of an interannually varying air-sea flux data set}",
journal = OM,
year = {2009},
volume = {33},
url = {http://dx.doi.org/10.1007/s00382-008-0441-3}
}
@Article{Weiss09
author = "J. Weiss and E.M. Schulson",
title = "{Coulombic faulting from the grain scale to the geophysical scale: lessons from ice}",
Expand Down
2 changes: 1 addition & 1 deletion doc/source/user_guide/ug_case_settings.rst
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ Table of namelist options
"\*","``trestore``", "integer", "sst restoring time scale (days)", ""
"","``restore_ice``", "true/false", "restore ice state along lateral boundaries", ""
"\*","``atm_data_type``", "``default``", "constant values defined in the code", ""
"","", "``LYq``", "AOMIP/Large-Yeager forcing data", ""
"","", "``LYq``", "COREII Large-Yeager (AOMIP) forcing data", ":cite:`Large09`"
"","", "``monthly``", "monthly forcing data", ""
"","", "``ncar``", "NCAR bulk forcing data", ""
"","", "``box2001``", "forcing data for :cite:`Hunke01` box problem", ""
Expand Down