Skip to content

Commit

Permalink
Merge pull request CICE-Consortium#266 from duvivier/doc
Browse files Browse the repository at this point in the history
Final documentation clean up
  • Loading branch information
duvivier authored Dec 3, 2018
2 parents 5871333 + a1548e9 commit 78c129b
Show file tree
Hide file tree
Showing 15 changed files with 279 additions and 474 deletions.
6 changes: 3 additions & 3 deletions doc/source/cice_index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ either Celsius or Kelvin units).
"daice_da", "data assimilation concentration increment rate", ""
"daidtd", "ice area tendency due to dynamics/transport", "1/s"
"daidtt", "ice area tendency due to thermodynamics", "1/s"
"dalb_mlt", "[see **ice_shortwave.F90**]", "-0.075"
"dalb_mlti", "[see **ice_shortwave.F90**]", "-0.100"
"dalb_mltv", "[see **ice_shortwave.F90**]", "-0.150"
"dalb_mlt", "[see **icepack_shortwave.F90**]", "-0.075"
"dalb_mlti", "[see **icepack_shortwave.F90**]", "-0.100"
"dalb_mltv", "[see **icepack_shortwave.F90**]", "-0.150"
"darcy_V", "Darcy velocity used for brine height tracer", ""
"dardg1(n)dt", "rate of fractional area loss by ridging ice (category n)", "1/s"
"dardg2(n)dt", "rate of fractional area gain by new ridges (category n)", "1/s"
Expand Down
259 changes: 0 additions & 259 deletions doc/source/developer_guide/dg_documentation.rst

This file was deleted.

4 changes: 2 additions & 2 deletions doc/source/developer_guide/dg_dynamics.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ kinds, and restart capabilities.
Dynamics
~~~~~~~~~~~~~~

Dyanamical Solvers
Dynamical Solvers
************************

The dynamics solvers are found in **cicecore/cicedynB/dynamics/**. A couple of different solvers are
Expand Down Expand Up @@ -73,7 +73,7 @@ parameters are namelist settings. The following CPPs are no longer used in CICE

as they have been migrated to :ref:`tabnamelist`

nx_global, ny_global, block_size_x, block_size_y, max_blocks, nilyr, nslyr, ncat, nblyr, n_aero, n_zaero, n_algae, n_doc, n_dic, n_don, n_fed, n_fep, n_trbgcz, n_trzs, n_trbri, n_trzaero, n_trage, n_trfy, n_trlvl, n_trpnd, n_trbgcs, numin, numax
nx_global, ny_global, block_size_x, block_size_y, max_blocks, nilyr, nslyr, ncat, nblyr, n_aero, n_zaero, n_algae, n_doc, n_dic, n_don, n_fed, n_fep, numin, numax


Time Manager
Expand Down
Loading

0 comments on commit 78c129b

Please sign in to comment.