merge main - especially sice #404 (params) went in.

CABLE-LSM · Nov 6, 2024 · f86652f · f86652f
2 parents 467902a + a5a52d8
commit f86652f
Show file tree

Hide file tree

Showing 17 changed files with 1,025 additions and 1,259 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -79,6 +79,7 @@ add_library(
     src/science/canopy/cbl_dryLeaf.F90
     src/science/canopy/cbl_friction_vel.F90
     src/science/canopy/cbl_fwsoil.F90
+    src/science/canopy/cbl_init_wetfac_mod.f90
     src/science/canopy/cbl_latent_heat.F90
     src/science/canopy/cbl_photosynthesis.F90
     src/science/canopy/cbl_pot_evap_snow.F90

diff --git a/documentation/docs/developer_guide/other_resources/api.md b/documentation/docs/developer_guide/other_resources/api.md
diff --git a/documentation/docs/user_guide/inputs/pftlookup_csv.md b/documentation/docs/user_guide/inputs/pftlookup_csv.md
@@ -107,7 +107,7 @@ on soil, vegetation carbon and nutrients dynamics.
 | fpptoL(frt)    | `casabiome%ftransPPtoL(nv,froot)`             | Flux factor of root phosphorus to litter pools \( (-) \) |
 | xkmlabp        | `xkmlabp(iso)`                                | Phosphorus absorption \( (gP \cdot m^{-2}) \)  |
 | xpsorbmax      | `xpsorbmax(iso)`                              | Maximum phosphorus absorption \( (gP \cdot m^{-2}) \) |
-| xfpleach       | `xfPleach(iso)`                               | Phosphorus leaching \( (-) \) |
+| xfpleach       | `xfPleach(iso)`                               | Phosphorus leaching \( (-) \) (hard-wired in the code for CABLE2.4/ACCESS-ESM1.5 at 1.e-4 independent of pft) |
 | N:Psoil (mic)  | `ratioNPsoil(iso,mic)`                        | Nitrogen to phosphorus ratio in microbial soil pool \( (gN \cdot gP^{-2}) \) |
 | N:Psoil (slow) | `ratioNPsoil(iso,slow)`                       | Nitrogen to phosphorus ratio in slow soil pool \( (gN \cdot gP^{-2}) \) |
 | N:Psoil (pass) | `ratioNPsoil(iso,pass)`                       | Nitrogen to phosphorus ratio in passive soil pool \( (gN \cdot gP^{-2}) \) |

diff --git a/documentation/mkdocs.yml b/documentation/mkdocs.yml
@@ -110,7 +110,8 @@ nav:
       - Build System: developer_guide/other_resources/build_system.md
       - Cheat Sheets: developer_guide/other_resources/cheat_sheets.md
       - CABLE's release process: developer_guide/other_resources/release_process.md
-      - API documentation: developer_guide/other_resources/api.md
+      - API documentation: api
       - Obsolete and deprecated features: developer_guide/other_resources/obsolete_and_deprecated_features/obsolete_and_deprecated_features.md
   - How-to:
     - Set up a sensitivity experiment: how-to/sensitivity_exp.md      
+  - API Reference: api
diff --git a/src/coupled/AM3/control/cable/CM3/cable_common.F90 b/src/coupled/AM3/control/cable/CM3/cable_common.F90
diff --git a/src/offline/cable_mpidrv.F90 b/src/offline/cable_mpidrv.F90
@@ -24,8 +24,7 @@ PROGRAM mpi_driver
   USE cable_mpicommon
   USE cable_mpimaster
   USE cable_mpiworker
-  USE cable_namelist_util, ONLY: get_namelist_file_name,&
-       CABLE_NAMELIST,arg_not_namelist
+  USE cable_namelist_util, ONLY: get_namelist_file_name
 
   IMPLICIT NONE