Merge remote-tracking branch 'origin/363_params' into 402-merge-from-…

…am3-params
CABLE-LSM · Sep 17, 2024 · 7357d0a · 7357d0a
2 parents 0448257 + b5bf063
commit 7357d0a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/src/params/cable_other_constants_mod.F90 b/src/params/cable_other_constants_mod.F90
@@ -18,6 +18,10 @@ MODULE cable_other_constants_mod
 !-----------------------------------------------------------------------------
 !CABLE science not yet in JAC uses msn to describe number of snow layers
 USE grid_constants_mod_cbl, ONLY: nrb, nsl, nsCs, nvCs, msn => nsnl
+USE grid_constants_mod_cbl, ONLY: n_soiltypes => nsoil_max ! # of soil types [9]
+USE grid_constants_mod_cbl, ONLY: niter                    ! # iterations za/L
+USE grid_constants_mod_cbl, ONLY: mf                       !sunlit/shaded leaves
+USE grid_constants_mod_cbl, ONLY: swb  ! 2 shortwave bands (VIS,NIR)
 
 IMPLICIT NONE
 
@@ -28,17 +32,7 @@ MODULE cable_other_constants_mod
 REAL, PARAMETER :: rad_thresh = 0.001 ! min. zenithal angle for downward SW
 REAL, PARAMETER :: lai_thresh = 0.001 ! min. LAI to be considered as vegetated
 
-INTEGER, PARAMETER ::                                                          &
-  swb = 2,           & ! 2 shortwave bands (initial division - visible /
-                       ! near infrared)
-  n_sw_bands = 4,    & ! total number of shortwave radiation bands
-                       ! (above divided into direct / diffuse)
-  mf = 2,            & ! types of leaves (sunlit / shaded)
-  r_2  = SELECTED_REAL_KIND(12, 50), &!this will be removed
-                       ! double precision real dimension
-  niter = 4,         & ! number of iterations for za/L
-  n_assim_rates = 3, & ! Rubisco, RuBP and Sink-limited rates of photosynthesis
-  n_soiltypes = 9      ! number of soil types
+INTEGER, PARAMETER :: r_2  = KIND(1.d0) ! SELECTED_REAL_KIND(12, 50)
 
 REAL, PARAMETER ::                                                             &
   max_snow_depth = 50000.0,  & ! maximum depth of lying snow on tiles (kg/m2)

diff --git a/src/params/grid_constants_cbl.F90 b/src/params/grid_constants_cbl.F90
@@ -1,3 +1,4 @@
+!#define UM_CBL YES
 !******************************************************************************
 ! This source code is part of the Community Atmosphere Biosphere Land Exchange
 ! (CABLE) model. This work is licensed under the CSIRO Open Source Software
@@ -45,12 +46,16 @@ MODULE grid_constants_mod_cbl
 INTEGER, PARAMETER :: nsCs      = 2  ! # soil carbon stores
 INTEGER, PARAMETER :: nvCs      = 3  ! # vegetation carbon stores
 INTEGER, PARAMETER :: ICE_SoilType = 9 ! SoilType Index (soilparm_cable.nml JAC)
-INTEGER, PARAMETER :: lakes_cable  = 16! SoilType Index (soilparm_cable.nml JAC)
-
-INTEGER, PARAMETER :: ICE_VegType = 17  ! permanent ice index for veg
-
-INTEGER, PARAMETER :: mf = 2          ! # leaves (sunlit, shaded)
-INTEGER, PARAMETER :: niter = 4       ! number of iterations for za/L
+#ifndef UM_CBL
+INTEGER, PARAMETER :: lakes_cable  = 16 ! cable_surface_type (nml) Index 
+INTEGER, PARAMETER :: ice_cable    = 17 ! cable_surface_type (nml) Index
+#endif
+INTEGER, PARAMETER :: mf          = 2  ! # leaves (sunlit, shaded)
+INTEGER, PARAMETER :: niter       = 4  ! number of iterations for za/L
+INTEGER, PARAMETER :: swb         = 2  ! # SW bands (VIS+NIR) - CM3 alloc TYPEs
+INTEGER, PARAMETER :: nCpool_casa = 10 
+INTEGER, PARAMETER :: nNpool_casa = 10 
+INTEGER, PARAMETER :: nPPool_casa = 12 
 
 ! Strictly NOT a constant. # of active tiles, length of CABLE working vectors
 INTEGER :: mp

diff --git a/src/util/cable_runtime_opts_mod.F90 b/src/util/cable_runtime_opts_mod.F90
@@ -12,7 +12,7 @@ MODULE cable_runtime_opts_mod
   !jhan:make this logical
   CHARACTER(LEN=3) :: diag_soil_resp=''
 
-  CHARACTER(LEN=20) :: fwsoil_switch=''
+  CHARACTER(LEN=20) :: fwsoil_switch='standard'
 
   ! Ticket #56
   !jhan:options?