Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/offline/cable_driver_common.F90
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ MODULE cable_driver_common_mod
snmin, &
cable_user, &
gw_params, &
l_casacnp, &
l_landuse, &
l_laiFeedbk, &
l_vcmaxFeedbk, &
cable_runtime
USE cable_IO_vars_module, ONLY : &
soilparmnew, &
Expand Down Expand Up @@ -55,10 +59,6 @@ MODULE cable_driver_common_mod
LOGICAL, SAVE, PUBLIC :: spinup = .FALSE. ! model spinup to soil state equilibrium?
LOGICAL, SAVE, PUBLIC :: spincasa = .FALSE. ! TRUE: CASA-CNP Will spin mloop times, FALSE: no spin up
LOGICAL, SAVE, PUBLIC :: CASAONLY = .FALSE. ! ONLY Run CASA-CNP
LOGICAL, SAVE, PUBLIC :: l_casacnp = .FALSE. ! using CASA-CNP with CABLE
LOGICAL, SAVE, PUBLIC :: l_landuse = .FALSE. ! using CASA-CNP with CABLE
LOGICAL, SAVE, PUBLIC :: l_laiFeedbk = .FALSE. ! using prognostic LAI
LOGICAL, SAVE, PUBLIC :: l_vcmaxFeedbk = .FALSE. ! using prognostic Vcmax

REAL, SAVE, PUBLIC :: delsoilM ! allowed variation in soil moisture for spin up
REAL, SAVE, PUBLIC :: delsoilT ! allowed variation in soil temperature for spin up
Expand Down
2 changes: 1 addition & 1 deletion src/offline/cable_mpimaster.F90
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ MODULE cable_mpimaster
spinup, &
spincasa, &
CASAONLY, &
l_landuse, &
delsoilM, &
delsoilT, &
delgwM, &
Expand Down Expand Up @@ -179,6 +178,7 @@ SUBROUTINE mpidrv_master (comm, dels, koffset, kend, PLUME, CRU)
USE cable_common_module, ONLY: ktau_gl, kend_gl, knode_gl, cable_user, &
cable_runtime, fileName, &
CurYear, &
l_landuse, &
IS_LEAPYEAR, calcsoilalbedo, &
kwidth_gl
USE casa_ncdf_module, ONLY: is_casa_time
Expand Down
4 changes: 1 addition & 3 deletions src/offline/cable_mpiworker.F90
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,11 @@ MODULE cable_mpiworker
spinup, &
spincasa, &
CASAONLY, &
l_laiFeedbk, &
l_vcmaxFeedbk, &
delsoilM, &
delsoilT, &
LALLOC
USE cable_mpicommon
USE cable_common_module, ONLY: cable_user
USE cable_common_module, ONLY: cable_user, l_laiFeedbk, l_vcmaxFeedbk
USE casa_inout_module
USE casa_cable
USE bgcdriver_mod, ONLY : bgcdriver
Expand Down
7 changes: 3 additions & 4 deletions src/offline/cable_serial.F90
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@ MODULE cable_serial
spinup, &
spincasa, &
CASAONLY, &
l_casacnp, &
l_landuse, &
l_laiFeedbk, &
l_vcmaxFeedbk, &
delsoilM, &
delsoilT, &
delgwM, &
Expand All @@ -89,6 +85,9 @@ MODULE cable_serial
filename, myhome, &
CurYear, &
IS_LEAPYEAR, &
l_landuse, &
l_laiFeedbk, &
l_vcmaxFeedbk, &
kwidth_gl

! physical constants
Expand Down
10 changes: 6 additions & 4 deletions src/util/cable_common.F90
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,12 @@ MODULE cable_common_module
LOGICAL :: calcsoilalbedo = .FALSE.
!---Lestevens Sept2012
!---CASACNP switches and cycle index
LOGICAL, SAVE :: l_casacnp,l_laiFeedbk,l_vcmaxFeedbk
LOGICAL :: l_luc = .FALSE.
LOGICAL :: l_thinforest = .FALSE.
LOGICAL :: l_landuse = .FALSE.
LOGICAL :: l_casacnp = .FALSE.
LOGICAL :: l_laiFeedbk = .FALSE.
LOGICAL :: l_vcmaxFeedbk = .FALSE.
LOGICAL :: l_luc = .FALSE.
LOGICAL :: l_thinforest = .FALSE.
LOGICAL :: l_landuse = .FALSE.

!---CABLE runtime switches def in this type
TYPE kbl_internal_switches
Expand Down