Skip to content

Commit

Permalink
Merge pull request #1781 from olyson/releasedoc
Browse files Browse the repository at this point in the history 
Fix issues #1769, #1607, #1389 in release documentation
  • Loading branch information
@ekluzek
ekluzek authored Jun 30, 2022
2 parents 980b655 + e61613c commit 9399250
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 46 deletions.
4 changes: 2 additions & 2 deletions doc/source/tech_note/Crop_Irrigation/CLM50_Tech_Note_Crop_Irrigation.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ managed crop types that are using the same parameter set.
.. table:: Crop plant functional types (pfts) included in CLM5BGCCROP.

=== =========================== ================ ===========================
ITV Plant function types (PFTs) Management Class Crop Parameters Used
IVT Plant function types (PFTs) Management Class Crop Parameters Used
=== =========================== ================ ===========================
15 c3 unmanaged rainfed crop none not applicable
16 c3 unmanaged irrigated crop none not applicable
Expand Down Expand Up @@ -348,7 +348,7 @@ Harvest occurs in one time step using the BGC leaf offset algorithm.
.. table:: Crop phenology and morphology parameters for the active crop plant functional types (pfts) in CLM5BGCCROP. Numbers in the first row correspond to the list of pfts in :numref:`Table Crop plant functional types`.

=================================== ========================= ========================== ========================== ========================== ========================== ========================= ========================= ==========================
\ temperate corn spring wheat temperatue soybean cotton rice sugarcane tropical corn tropical soybean
\ temperate corn spring wheat temperate soybean cotton rice sugarcane tropical corn tropical soybean
=================================== ========================= ========================== ========================== ========================== ========================== ========================= ========================= ==========================
IVT 17, 18 19, 20 23, 24 41, 42 61, 62 67, 68 75, 76 77, 78
:math:`Date_{planting}^{min}` April 1 April 1 May 1 April 1 Janurary 1 Janurary 1 March 20 April 15
Expand Down
84 changes: 44 additions & 40 deletions doc/source/tech_note/Ecosystem/CLM50_Tech_Note_Ecosystem.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ Vegetated surfaces are comprised of up to 15 possible plant functional
types (PFTs) plus bare ground (:numref:`Table Plant functional types`). An
additional PFT is added if
the irrigation model is active and six additional PFTs are added if the
crop model is active (Chapter :numref:`rst_Crops and Irrigation`). These
crop model is active (Chapter :numref:`rst_Crops and Irrigation`).
In :numref:`Table Plant functional types`, IVT = 0,14 refers to the index of PCT_NAT_VEG
on the surface dataset while IVT = 15,18 refers to the index of PCT_CFT on the surface dataset. These
plant types differ in leaf and stem optical properties that determine reflection,
transmittance, and absorption of solar radiation (:numref:`Table Plant functional type optical properties`), root
distribution parameters that control the uptake of water from the soil
Expand All @@ -123,45 +125,47 @@ evolve with time if the model is run in transient landcover mode

.. table:: Plant functional types

+--------------------------------------------------------------+-------------------+
| Plant functional type | Acronym |
+==============================================================+===================+
| Needleleaf evergreen tree – temperate | NET Temperate |
+--------------------------------------------------------------+-------------------+
| Needleleaf evergreen tree - boreal | NET Boreal |
+--------------------------------------------------------------+-------------------+
| Needleleaf deciduous tree – boreal | NDT Boreal |
+--------------------------------------------------------------+-------------------+
| Broadleaf evergreen tree – tropical | BET Tropical |
+--------------------------------------------------------------+-------------------+
| Broadleaf evergreen tree – temperate | BET Temperate |
+--------------------------------------------------------------+-------------------+
| Broadleaf deciduous tree – tropical | BDT Tropical |
+--------------------------------------------------------------+-------------------+
| Broadleaf deciduous tree – temperate | BDT Temperate |
+--------------------------------------------------------------+-------------------+
| Broadleaf deciduous tree – boreal | BDT Boreal |
+--------------------------------------------------------------+-------------------+
| Broadleaf evergreen shrub - temperate | BES Temperate |
+--------------------------------------------------------------+-------------------+
| Broadleaf deciduous shrub – temperate | BDS Temperate |
+--------------------------------------------------------------+-------------------+
| Broadleaf deciduous shrub – boreal | BDS Boreal |
+--------------------------------------------------------------+-------------------+
| C\ :sub:`3` arctic grass | - |
+--------------------------------------------------------------+-------------------+
| C\ :sub:`3` grass | - |
+--------------------------------------------------------------+-------------------+
| C\ :sub:`4` grass | - |
+--------------------------------------------------------------+-------------------+
| C\ :sub:`3` Unmanaged Rainfed Crop | UCrop UIrr |
+--------------------------------------------------------------+-------------------+
| :sup:`1`\ C\ :sub:`3` Unmanaged Irrigated Crop | UCrop Irr |
+--------------------------------------------------------------+-------------------+
| :sup:`2`\ Managed Rainfed Unirrigated Crops | Crop UIrr |
+--------------------------------------------------------------+-------------------+
| :sup:`2`\ Managed Irrigated Crops | Crop Irr |
+--------------------------------------------------------------+-------------------+
+-----+--------------------------------------------------------------+-------------------+
| IVT | Plant functional type | Acronym |
+=====+==============================================================+===================+
| 0 | Bare Ground | NET Temperate |
+-----+--------------------------------------------------------------+-------------------+
| 1 | Needleleaf evergreen tree – temperate | NET Temperate |
+-----+--------------------------------------------------------------+-------------------+
| 2 | Needleleaf evergreen tree - boreal | NET Boreal |
+-----+--------------------------------------------------------------+-------------------+
| 3 | Needleleaf deciduous tree – boreal | NDT Boreal |
+-----+--------------------------------------------------------------+-------------------+
| 4 | Broadleaf evergreen tree – tropical | BET Tropical |
+-----+--------------------------------------------------------------+-------------------+
| 5 | Broadleaf evergreen tree – temperate | BET Temperate |
+-----+--------------------------------------------------------------+-------------------+
| 6 | Broadleaf deciduous tree – tropical | BDT Tropical |
+-----+--------------------------------------------------------------+-------------------+
| 7 | Broadleaf deciduous tree – temperate | BDT Temperate |
+-----+--------------------------------------------------------------+-------------------+
| 8 | Broadleaf deciduous tree – boreal | BDT Boreal |
+-----+--------------------------------------------------------------+-------------------+
| 9 | Broadleaf evergreen shrub - temperate | BES Temperate |
+-----+--------------------------------------------------------------+-------------------+
| 10 | Broadleaf deciduous shrub – temperate | BDS Temperate |
+-----+--------------------------------------------------------------+-------------------+
| 11 | Broadleaf deciduous shrub – boreal | BDS Boreal |
+-----+--------------------------------------------------------------+-------------------+
| 12 | C\ :sub:`3` arctic grass | - |
+-----+--------------------------------------------------------------+-------------------+
| 13 | C\ :sub:`3` grass | - |
+-----+--------------------------------------------------------------+-------------------+
| 14 | C\ :sub:`4` grass | - |
+-----+--------------------------------------------------------------+-------------------+
| 15 | C\ :sub:`3` Unmanaged Rainfed Crop | UCrop UIrr |
+-----+--------------------------------------------------------------+-------------------+
| 16 | :sup:`1`\ C\ :sub:`3` Unmanaged Irrigated Crop | UCrop Irr |
+-----+--------------------------------------------------------------+-------------------+
| 17 | :sup:`2`\ Managed Rainfed Crop | Crop UIrr |
+-----+--------------------------------------------------------------+-------------------+
| 18 | :sup:`2`\ Managed Irrigated Crop | Crop Irr |
+-----+--------------------------------------------------------------+-------------------+

:sup:`1`\ Only used if irrigation is active (Chapter :numref:`rst_Crops and Irrigation`).
:sup:`2`\ Only used if crop model is active (see Chapter :numref:`rst_Crops and Irrigation` for list of represented crops).
Expand Down
6 changes: 3 additions & 3 deletions ...rce/tech_note/Soil_Snow_Temperatures/CLM50_Tech_Note_Soil_Snow_Temperatures.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ one-dimensional form
c\frac{\partial T}{\partial t} =\frac{\partial }{\partial z} \left[\lambda \frac{\partial T}{\partial z} \right].
This equation is solved numerically to calculate the soil, snow, and
surface water temperatures for a fifteen-layer soil column with up to
five overlying layers of snow and a single surface water layer with the
surface water temperatures for a 25-layer soil column with up to
twelve overlying layers of snow and a single surface water layer with the
boundary conditions of :math:`h` as the heat flux into the top soil,
snow, and surface water layers from the overlying atmosphere (section
:numref:`Numerical Solution Temperature`) and zero heat flux at the bottom
Expand All @@ -59,7 +59,7 @@ The soil column is discretized into 25 layers (section
:numref:`Vertical Discretization`) where :math:`N_{levgrnd} = 25` is the
number of soil layers (:numref:`Table Soil layer structure`).

The overlying snow pack is modeled with up to five layers depending on
The overlying snow pack is modeled with up to twelve layers depending on
the total snow depth. The layers from top to bottom are indexed in the
Fortran code as :math:`i=-4,-3,-2,-1,0`, which permits the accumulation
or ablation of snow at the top of the snow pack without renumbering the
Expand Down
2 changes: 1 addition & 1 deletion ...Vegetation_Phenology_Turnover/CLM50_Tech_Note_Vegetation_Phenology_Turnover.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ follows:
OSWI_{sum}^{n} =\left\{\begin{array}{l} {OSWI_{sum}^{n-1} +f_{day} \qquad \qquad \qquad {\rm for\; }\Psi _{s,3} \le \Psi _{offset} } \\ {{\rm max}\left(OSWI_{sum}^{n-1} -f_{day} ,0\right)\qquad {\rm for\; }\Psi _{s,3} >\Psi _{onset} } \end{array}\right.
where :math:`{\Psi}_{offset} = -2 MPa` is the offset soil
where :math:`{\Psi}_{offset} = -0.8 MPa` is the offset soil
water potential threshold. An offset period is triggered if the previous
onset period is complete and :math:`{OSWI}_{sum}`
:math:`\mathrm{\ge}` :math:`{OSWI}_{sum\_crit}`, where :math:`{OSWI}_{sum\_crit} = 15`.
Expand Down

0 comments on commit 9399250

Please sign in to comment.