Skip to content

Commit

Permalink
Merge pull request CICE-Consortium#203 from duvivier/doc_refs
Browse files Browse the repository at this point in the history
References and testing in documentation
  • Loading branch information
duvivier authored Oct 11, 2018
2 parents fe8c815 + f9f5b72 commit a5b5864
Show file tree
Hide file tree
Showing 8 changed files with 521 additions and 498 deletions.
6 changes: 3 additions & 3 deletions doc/source/cice_index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ either Celsius or Kelvin units).
"kcatbound", ":math:`\bullet` category boundary formula", ""
"kdyn", ":math:`\bullet` type of dynamics (1 = EVP, 0 = off)", "1"
"kg_to_g", "kg to g conversion factor", "1000."
"kice", "thermal conductivity of fresh ice (:cite:`BL99`)", "2.03 W/m/deg"
"kice", "thermal conductivity of fresh ice (:cite:`Bitz99`)", "2.03 W/m/deg"
"kitd", ":math:`\bullet` type of itd conversions (0 = delta function, 1 = linear remap)", "1"
"kmt_file", ":math:`\bullet` input file for land mask info", ""
"krdg_partic", ":math:`\bullet` ridging participation function", "1"
Expand All @@ -327,7 +327,7 @@ either Celsius or Kelvin units).
"kseaice", "thermal conductivity of ice for zero-layer thermodynamics", "2.0 W/m/deg"
"ksno", "thermal conductivity of snow", "0.30 W/m/deg"
"kstrength", ":math:`\bullet` ice stength formulation (1= :cite:`Rothrock75`, 0 = :cite:`Hibler79`)", "1"
"ktherm", ":math:`\bullet` thermodynamic formulation (0 = zero-layer, 1 = :cite:`BL99`, 2 = mushy)", ""
"ktherm", ":math:`\bullet` thermodynamic formulation (0 = zero-layer, 1 = :cite:`Bitz99`, 2 = mushy)", ""
"**L**", "", ""
"l_brine", "flag for brine pocket effects", ""
"l_conservation_check", "if true, check conservation when ridging", ""
Expand Down Expand Up @@ -530,7 +530,7 @@ either Celsius or Kelvin units).
"**S**", "", ""
"s11, s12, s22", "stress tensor components", ""
"salinz", "ice salinity profile", "ppt"
"saltmax", "max salinity, at ice base (:cite:`BL99`)", "3.2 ppt"
"saltmax", "max salinity, at ice base (:cite:`Bitz99`)", "3.2 ppt"
"scale_factor", "scaling factor for shortwave radiation components", ""
"sec", "seconds elasped into idate", ""
"secday", "number of seconds in a day", "86400."
Expand Down
2 changes: 1 addition & 1 deletion doc/source/intro/about.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ coupled atmosphere--land global climate model. It was
designed to be compatible with the Parallel Ocean Program
(POP), an ocean circulation model developed at
Los Alamos National Laboratory for use on massively parallel computers
:cite:`SDM92,DSM93,DSM94`. The current version of the
:cite:`Smith92,Dukowicz93,Dukowicz94`. The current version of the
model has been enhanced greatly through collaborations with members of
the community.

Expand Down
Loading

0 comments on commit a5b5864

Please sign in to comment.