Modifications

Author: yfang-repo

components/elm/docs/tech-guide/hydrology.md

@@ -1,6 +1,5 @@
+# Hydrology {#rst_Hydrology}
 
-<<<<<<< HEAD
-=======
 The model parameterizes interception, throughfall, canopy drip, snow
 accumulation and melt, water transfer between snow layers, infiltration,
 evaporation, surface runoff, sub-surface drainage, redistribution within
@@ -958,4 +957,3 @@ and lakes, which reduces the total amount of runoff available to the
 river routing model (Chapter `rst_MOSART`{.interpreted-text
 role="numref"}).
 
->>>>>>> Converted from CLM5

components/elm/docs/tech-guide/phs.md

@@ -1,7 +1,4 @@
-<<<<<<< HEAD
-
-=======
-# Plant Hydraulics 
+# Plant Hydraulics {#rst_Plant Hydraulics}
 
 ## Roots {#Roots}
 
@@ -24,39 +21,6 @@ plant-dependent root distribution parameter adopted from
 (`Table Plant functional type root distribution parameters`{.interpreted-text
 role="numref"}).
 
-**Table 1: Plant functional type root distribution parameters ** 
-
-| Plant Functional Type | $\beta$ |
-|----------------------|---------|
-| NET Temperate | 0.976 |
-| NET Boreal | 0.943 |
-| NDT Boreal | 0.943 |
-| BET Tropical | 0.993 |
-| BET temperate | 0.966 |
-| BDT tropical | 0.993 |
-| BDT temperate | 0.966 |
-| BDT boreal | 0.943 |
-| BES temperate | 0.964 |
-| BDS temperate | 0.964 |
-| BDS boreal | 0.914 |
-| C₃ grass arctic | 0.914 |
-| C₃ grass | 0.943 |
-| C₄ grass | 0.943 |
-| Crop R | 0.943 |
-| Crop I | 0.943 |
-| Corn R | 0.943 |
-| Corn I | 0.943 |
-| Temp Cereal R | 0.943 |
-| Temp Cereal I | 0.943 |
-| Winter Cereal R | 0.943 |
-| Winter Cereal I | 0.943 |
-| Soybean R | 0.943 |
-| Soybean I | 0.943 |
-| Miscanthus R | 0.943 |
-| Miscanthus I | 0.943 |
-| Switchgrass R | 0.943 |
-| Switchgrass I | 0.943 |
-
 ::: {#Table Plant functional type root distribution parameters}
   -----------------------------------------------------
   Plant Functional Type              $\beta$
@@ -676,4 +640,3 @@ temperature, reflecting leaf surface energy balance.
 ![Flow diagram of leaf flux calculations](phs_iteration_schematic.*)
 :::
 
->>>>>>> Converted from CLM5