From b3b734db5375876f550f855fdeafe8ef2f13ee53 Mon Sep 17 00:00:00 2001 From: Sean Bryan Date: Fri, 20 Feb 2026 12:29:48 +1100 Subject: [PATCH] Remove duplicate namelist variables --- src/offline/cable_driver_common.F90 | 8 ++++---- src/offline/cable_mpimaster.F90 | 2 +- src/offline/cable_mpiworker.F90 | 4 +--- src/offline/cable_serial.F90 | 7 +++---- src/util/cable_common.F90 | 10 ++++++---- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/offline/cable_driver_common.F90 b/src/offline/cable_driver_common.F90 index 9fc5b92c0..69698fe9a 100644 --- a/src/offline/cable_driver_common.F90 +++ b/src/offline/cable_driver_common.F90 @@ -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, & @@ -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 diff --git a/src/offline/cable_mpimaster.F90 b/src/offline/cable_mpimaster.F90 index 6ae6ffb2c..9146b2cd4 100644 --- a/src/offline/cable_mpimaster.F90 +++ b/src/offline/cable_mpimaster.F90 @@ -80,7 +80,6 @@ MODULE cable_mpimaster spinup, & spincasa, & CASAONLY, & - l_landuse, & delsoilM, & delsoilT, & delgwM, & @@ -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 diff --git a/src/offline/cable_mpiworker.F90 b/src/offline/cable_mpiworker.F90 index 3bf56f137..db686dfea 100644 --- a/src/offline/cable_mpiworker.F90 +++ b/src/offline/cable_mpiworker.F90 @@ -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 diff --git a/src/offline/cable_serial.F90 b/src/offline/cable_serial.F90 index 2faec5942..520338c06 100644 --- a/src/offline/cable_serial.F90 +++ b/src/offline/cable_serial.F90 @@ -66,10 +66,6 @@ MODULE cable_serial spinup, & spincasa, & CASAONLY, & - l_casacnp, & - l_landuse, & - l_laiFeedbk, & - l_vcmaxFeedbk, & delsoilM, & delsoilT, & delgwM, & @@ -89,6 +85,9 @@ MODULE cable_serial filename, myhome, & CurYear, & IS_LEAPYEAR, & + l_landuse, & + l_laiFeedbk, & + l_vcmaxFeedbk, & kwidth_gl ! physical constants diff --git a/src/util/cable_common.F90 b/src/util/cable_common.F90 index 20106ae42..553cfc2cd 100644 --- a/src/util/cable_common.F90 +++ b/src/util/cable_common.F90 @@ -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