Skip to content

Merge phenvariable module into casavariable #676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Whyborn wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Merge phenvariable module into casavariable #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
19e33df
Attempt merge of phenvariable module into casavariable
Whyborn Jan 19, 2026
73a3218
Fix missing imports
Whyborn Jan 19, 2026
c612f69
Remove phenvariable reference
Whyborn Jan 19, 2026
5eba8c2
Remove phenvariable references in offline code
Whyborn Jan 19, 2026
9731fe8
Missed one required phen_variable import
Whyborn Jan 19, 2026
25c6003
Import dimension variables from casadimension
Whyborn Jan 19, 2026
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
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ if(CABLE_LIBRARY)
src/science/casa-cnp/casa_feedback.F90
src/science/casa-cnp/casa_inout.F90
src/science/casa-cnp/casa_param.F90
src/science/casa-cnp/casa_phenology.F90
#src/science/casa-cnp/casa_phenology.F90
Copy link
Collaborator

@JhanSrbinovsky JhanSrbinovsky Jan 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not just kill this?

Copy link
Contributor Author

@Whyborn Whyborn Jan 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because I think (and I forgot to mention this) I think it will break ESM1.6, when we try to update the CABLE code. There are a number of mentions of phenvariable in the UM7 code- I kept this here for now as a reminder, mainly to myself, that this needs to be addressed in UM7 as well.

src/science/casa-cnp/casa_readbiome.F90
src/science/casa-cnp/casa_rplant.F90
src/science/casa-cnp/casa_sumcflux.F90
Expand Down Expand Up @@ -186,7 +186,7 @@ else()
src/science/casa-cnp/casa_feedback.F90
src/science/casa-cnp/casa_inout.F90
src/science/casa-cnp/casa_param.F90
src/science/casa-cnp/casa_phenology.F90
#src/science/casa-cnp/casa_phenology.F90
src/science/casa-cnp/casa_readbiome.F90
src/science/casa-cnp/casa_rplant.F90
src/science/casa-cnp/casa_sumcflux.F90
Expand Down
1 change: 0 additions & 1 deletion src/offline/CASAONLY_LUC.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ SUBROUTINE CASAONLY_LUC( dels,kstart,kend,veg,soil,casabiome,casapool, &
USE casadimension
USE casaparm
USE casavariable
USE phenvariable
USE POP_Types, ONLY: POP_TYPE
USE POPMODULE, ONLY: POPStep, POP_init_single
USE TypeDef, ONLY: i4b, dp
Expand Down
2 changes: 0 additions & 2 deletions src/offline/cable_input.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
! netcdf
! casadimension
! casavariable
! phenvariable
! cable_param_module
! cable_checks_module
! cable_radiation_module
Expand All @@ -42,7 +41,6 @@ MODULE cable_input_module
USE casadimension, ONLY: icycle
USE casavariable
USE casaparm, ONLY: forest, shrub
USE phenvariable
! vh_js !
USE POP_Types, ONLY: POP_TYPE
USE POPLUC_Types, ONLY: POPLUC_TYPE
Expand Down
12 changes: 3 additions & 9 deletions src/offline/cable_mpimaster.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
! cable_cbm_module
! casadimension
! casavariable
! phenvariable
! casa_cable
! casa_inout_module
!
Expand Down Expand Up @@ -199,8 +198,7 @@ SUBROUTINE mpidrv_master (comm, dels, koffset, kend, PLUME, CRU)
! modules related to CASA-CNP
USE casadimension, ONLY: icycle,mplant,mlitter,msoil,mwood
USE casavariable, ONLY: casafile, casa_biome, casa_pool, casa_flux, &
casa_met, casa_balance, zero_sum_casa, update_sum_casa
USE phenvariable, ONLY: phen_variable
casa_met, casa_balance, zero_sum_casa, update_sum_casa, phen_variable
USE casa_cable
USE casa_inout_module

Expand Down Expand Up @@ -3272,7 +3270,6 @@ SUBROUTINE master_casa_params (comm,casabiome,casapool,casaflux,casamet,&
USE cable_def_types_mod

USE casavariable
USE phenvariable

IMPLICIT NONE

Expand Down Expand Up @@ -6065,7 +6062,6 @@ SUBROUTINE master_casa_types (comm, casapool, casaflux, &
USE cable_def_types_mod
USE casadimension
USE casavariable
USE phenvariable

IMPLICIT NONE

Expand Down Expand Up @@ -7409,9 +7405,9 @@ SUBROUTINE master_casa_dump_types(comm, casamet, casaflux, phen )

USE mpi

USE casavariable, ONLY: casa_met, casa_flux
use casadimension, only: mphase
USE casavariable, ONLY: casa_met, casa_flux, phen_variable
USE cable_def_types_mod, ONLY: climate_type
USE phenvariable
IMPLICIT NONE

INTEGER,INTENT(IN) :: comm
Expand Down Expand Up @@ -8049,7 +8045,6 @@ SUBROUTINE master_spincasacnp( dels,kstart,kend,mloop,veg,soil,casabiome,casapoo
USE casadimension
USE casaparm
USE casavariable
USE phenvariable
USE POP_Types, ONLY: POP_TYPE
USE POPMODULE, ONLY: POPStep
USE TypeDef, ONLY: i4b, dp
Expand Down Expand Up @@ -8203,7 +8198,6 @@ SUBROUTINE master_CASAONLY_LUC( dels,kstart,kend,veg,casabiome,casapool, &
USE casadimension
USE casaparm
USE casavariable
USE phenvariable
USE POP_Types, ONLY: POP_TYPE
USE POPMODULE, ONLY: POPStep, POP_init_single
USE TypeDef, ONLY: i4b, dp
Expand Down
12 changes: 3 additions & 9 deletions src/offline/cable_mpiworker.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
! cable_cbm_module
! casadimension
! casavariable
! phenvariable
! casa_cable
! casa_inout_module
!
Expand Down Expand Up @@ -149,8 +148,7 @@ SUBROUTINE mpidrv_worker (comm)
! modules related to CASA-CNP
USE casadimension, ONLY: icycle
USE casavariable, ONLY: casafile, casa_biome, casa_pool, casa_flux, &
casa_met, casa_balance
USE phenvariable, ONLY: phen_variable
casa_met, casa_balance, phen_variable

!CLN added
! modules related to POP
Expand Down Expand Up @@ -2401,7 +2399,6 @@ SUBROUTINE worker_casa_params (comm,casabiome,casapool,casaflux,casamet,&
USE cable_def_types_mod

USE casavariable
USE phenvariable

IMPLICIT NONE

Expand Down Expand Up @@ -5560,7 +5557,6 @@ SUBROUTINE worker_casa_type (comm, casapool,casaflux, &
USE casavariable
! gol124: commented out because casa_poolout in this version
! is no longer writing phen%phase
USE phenvariable

IMPLICIT NONE

Expand Down Expand Up @@ -6541,9 +6537,9 @@ SUBROUTINE worker_casa_dump_types(comm, casamet, casaflux, phen)

USE mpi

USE casavariable, ONLY: casa_met, casa_flux, mplant
use casadimension, only: mphase, mplant
USE casavariable, ONLY: casa_met, casa_flux, phen_variable
USE cable_def_types_mod, ONLY: climate_type
USE phenvariable

IMPLICIT NONE

Expand Down Expand Up @@ -6948,7 +6944,6 @@ SUBROUTINE worker_spincasacnp( dels,kstart,kend,mloop,veg,soil,casabiome,casapoo
USE casadimension
USE casaparm
USE casavariable
USE phenvariable
USE POP_Types, ONLY: POP_TYPE
USE POPMODULE, ONLY: POPStep
USE TypeDef, ONLY: i4b, dp
Expand Down Expand Up @@ -7303,7 +7298,6 @@ SUBROUTINE worker_CASAONLY_LUC( dels,kstart,kend,veg,soil,casabiome,casapool, &
USE casadimension
USE casaparm
USE casavariable
USE phenvariable
USE POP_Types, ONLY: POP_TYPE
USE POPMODULE, ONLY: POPStep
USE TypeDef, ONLY: i4b, dp
Expand Down
2 changes: 0 additions & 2 deletions src/offline/cable_parameters.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
! casadimension
! casaparm
! cable_IO_vars_module
! phenvariable
! physical_constants
! netcdf

Expand All @@ -56,7 +55,6 @@ MODULE cable_param_module
USE cable_def_types_mod
USE casadimension, ONLY: icycle
USE casavariable
USE phenvariable
USE cable_abort_module
USE cable_IO_vars_module
USE cable_common_module, ONLY: cable_user, gw_params
Expand Down
4 changes: 1 addition & 3 deletions src/offline/cable_serial.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,7 @@ MODULE cable_serial
! modules related to CASA-CNP
USE casadimension, ONLY: icycle
USE casavariable, ONLY: casafile, casa_biome, casa_pool, casa_flux, &
!mpidiff
casa_met, casa_balance, zero_sum_casa, update_sum_casa
USE phenvariable, ONLY: phen_variable
casa_met, casa_balance, zero_sum_casa, update_sum_casa, phen_variable

! vh_js !
! modules related to POP
Expand Down
8 changes: 2 additions & 6 deletions src/offline/casa_cable.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ SUBROUTINE POPdriver(casaflux,casabal,veg, POP)
USE casadimension
USE casaparm
USE casavariable
USE phenvariable
USE cable_common_module, ONLY: CurYear, CABLE_USER
USE TypeDef, ONLY: i4b, dp
USE POPMODULE, ONLY: POPStep
Expand Down Expand Up @@ -91,8 +90,7 @@ SUBROUTINE read_casa_dump( ncfile, casamet, casaflux,phen, climate, ncall, kend
USE netcdf
USE cable_def_types_mod, ONLY : r_2,ms,mp, climate_type
USE casadimension, ONLY : mplant,mdyear
USE casavariable, ONLY : casa_met, casa_flux
USE phenvariable
USE casavariable, ONLY : casa_met, casa_flux, phen_variable
USE cable_common_module, ONLY: CABLE_USER
USE casa_ncdf_module, ONLY : get_var_ncr2, &
get_var_ncr3, stderr_nc
Expand Down Expand Up @@ -261,9 +259,8 @@ SUBROUTINE write_casa_dump( ncfile, casamet, casaflux, phen, climate, n_call, ke
USE casa_ncdf_module, ONLY : def_dims, def_vars, def_var_atts, &
put_var_ncr1, put_var_ncr2, &
put_var_ncr3, stderr_nc
USE casavariable, ONLY : CASA_MET, CASA_FLUX
USE casavariable, ONLY : CASA_MET, CASA_FLUX, phen_variable
USE casadimension, ONLY : mplant
USE phenvariable
USE cable_common_module, ONLY: CABLE_USER

IMPLICIT NONE
Expand Down Expand Up @@ -640,7 +637,6 @@ SUBROUTINE analyticpool(kend,veg,soil,casabiome,casapool,
USE casadimension
USE casaparm
USE casavariable
USE phenvariable
IMPLICIT NONE
INTEGER, INTENT(IN) :: kend
TYPE (veg_parameter_type), INTENT(INOUT) :: veg ! vegetation parameters
Expand Down
1 change: 0 additions & 1 deletion src/offline/spincasacnp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ SUBROUTINE spincasacnp( dels,kstart,kend,mloop,veg,soil,casabiome,casapool, &
USE casa_cable !jhan:also put this in mod
USE casa_inout_module
USE casavariable
USE phenvariable
USE POP_Types, ONLY: POP_TYPE
USE POPMODULE, ONLY: POPStep
USE TypeDef, ONLY: i4b, dp
Expand Down
1 change: 0 additions & 1 deletion src/science/casa-cnp/bgcdriver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ SUBROUTINE bgcdriver(ktau,kstart,kend,dels,met,ssnow,canopy,veg,soil, &
USE casadimension
USE casaparm
USE casavariable
USE phenvariable
USE cable_common_module, ONLY: CurYear, CABLE_USER
USE TypeDef, ONLY: i4b, dp
# ifndef UM_CBL
Expand Down
1 change: 0 additions & 1 deletion src/science/casa-cnp/casa_cnp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ MODULE casa_cnp_module
USE casadimension
USE casaparm
USE casavariable
USE phenvariable
USE cable_common_module, ONLY: cable_user,l_landuse ! Custom soil respiration: Ticket #42
USE landuse_constant
IMPLICIT NONE
Expand Down
4 changes: 0 additions & 4 deletions src/science/casa-cnp/casa_inout.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ SUBROUTINE casa_readphen(veg,casamet,phen)
USE casadimension
USE casaparm
USE casavariable
USE phenvariable
IMPLICIT NONE
! INTEGER, INTENT(IN) :: mvt
TYPE (veg_parameter_type), INTENT(IN) :: veg ! vegetation parameters
Expand Down Expand Up @@ -131,7 +130,6 @@ SUBROUTINE casa_init(casabiome,casamet,casaflux,casapool,casabal,veg,phen)
USE casadimension
USE casaparm
USE casavariable
USE phenvariable
! for first time reading file *_1220.csv (BP may2010)
USE cable_def_types_mod
USE cable_io_vars_module, ONLY: landpt, patch
Expand Down Expand Up @@ -447,7 +445,6 @@ SUBROUTINE casa_poolout(ktau,veg,soil,casabiome,casapool,casaflux,casamet, &
USE casadimension
USE casaparm
USE casavariable
USE phenvariable
USE cable_common_module, ONLY: cable_user
IMPLICIT NONE
INTEGER, INTENT(IN) :: ktau
Expand Down Expand Up @@ -608,7 +605,6 @@ SUBROUTINE casa_fluxout(myear,veg,soil,casabal,casamet)
USE casadimension
USE casaparm
USE casavariable
USE phenvariable
! USE casaDeclare
IMPLICIT NONE
TYPE (veg_parameter_type), INTENT(INOUT) :: veg ! vegetation parameters
Expand Down
9 changes: 2 additions & 7 deletions src/science/casa-cnp/casa_readbiome.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,8 @@ SUBROUTINE casa_readbiome(veg,soil,casabiome,casapool,casaflux,casamet,phen)
USE cable_def_types_mod
USE casadimension
USE casaparm
USE casavariable, ONLY : casafile
USE casavariable, ONLY : casa_biome
USE casavariable, ONLY : casa_pool
USE casavariable, ONLY : casa_flux
USE casavariable, ONLY : casa_met

USE phenvariable
USE casavariable, ONLY : casafile, casa_biome, casa_pool, casa_flux,&
casa_met, phen_variable
!! vh_js !!
USE cable_common_module, ONLY: cable_user
IMPLICIT NONE
Expand Down
1 change: 0 additions & 1 deletion src/science/casa-cnp/casa_rplant.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ MODULE casa_rplant_module
USE casadimension
USE casaparm
USE casavariable
USE phenvariable
USE cable_common_module, ONLY: cable_user,l_landuse ! Custom soil respiration: Ticket #42
#ifndef UM_CBL
USE landuse_constant
Expand Down
41 changes: 34 additions & 7 deletions src/science/casa-cnp/casa_variable.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,13 +264,19 @@ MODULE casavariable
REAL(r_2), DIMENSION(:),POINTER :: clabilelast
END TYPE casa_balance

! The following declarations are removed and have to be passed using
! parameter list for each subroutine (BP apr2010)
! TYPE (casa_biome) :: casabiome
! TYPE (casa_pool) :: casapool
! TYPE (casa_flux) :: casaflux
! TYPE (casa_met) :: casamet
! TYPE (casa_balance) :: casabal
TYPE phen_variable
INTEGER, DIMENSION(:), POINTER :: phase
REAL(r_2), DIMENSION(:), POINTER :: TKshed
INTEGER, DIMENSION(:,:),POINTER :: doyphase
REAL, DIMENSION(:), POINTER :: phen ! fraction of max LAI
REAL, DIMENSION(:), POINTER :: aphen ! annual leaf on sum
INTEGER, DIMENSION(:,:),POINTER :: phasespin
INTEGER, DIMENSION(:,:),POINTER :: doyphasespin_1
INTEGER, DIMENSION(:,:),POINTER :: doyphasespin_2
INTEGER, DIMENSION(:,:),POINTER :: doyphasespin_3
INTEGER, DIMENSION(:,:),POINTER :: doyphasespin_4

END TYPE phen_variable

! Added filename type for casaCNP (BP apr2010)
TYPE casafiles_type
Expand Down Expand Up @@ -606,6 +612,27 @@ SUBROUTINE alloc_casavariable(casabiome,casapool,casaflux, &
SOURCE=0.0_r_2)
END SUBROUTINE alloc_casavariable

SUBROUTINE alloc_phenvariable(phen,arraysize)
!* Allocate phen derived type instance.
! Allocated arrays are initialised to zero.

TYPE(phen_variable), INTENT(INOUT) :: phen
INTEGER, INTENT(IN ) :: arraysize

ALLOCATE(phen%Tkshed(mvtype), source=0.0_r_2)
ALLOCATE(phen%phen(arraysize), phen%aphen(arraysize), source=0.0)
ALLOCATE( &
phen%phase(arraysize), &
phen%doyphase(arraysize,mphase), &
phen%phasespin(arraysize,mdyear), &
phen%doyphasespin_1(arraysize,mdyear), &
phen%doyphasespin_2(arraysize,mdyear), &
phen%doyphasespin_3(arraysize,mdyear), &
phen%doyphasespin_4(arraysize,mdyear), &
source=0 &
)
END SUBROUTINE alloc_phenvariable

SUBROUTINE alloc_sum_casavariable( sum_casapool, sum_casaflux &
,arraysize)

Expand Down
4 changes: 2 additions & 2 deletions src/science/landuse/landuse3.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,8 +741,8 @@ subroutine landuse_driver(mlon,mlat,landmask,arealand,ssnow,soil,veg,bal,canopy,
soil_parameter_type, soil_snow_type, veg_parameter_type, &
balances_type, canopy_type, bgc_pool_type, radiation_type
USE casadimension, ONLY: icycle,mplant,mlitter,msoil,mwood,mso
USE casavariable, ONLY: casa_pool,casa_balance,casa_met,casa_biome,casa_flux
USE phenvariable, ONLY: phen_variable
USE casavariable, ONLY: casa_pool,casa_balance,casa_met,casa_biome,casa_flux,&
phen_variable
USE landuse_variable
IMPLICIT NONE
TYPE (soil_snow_type) :: ssnow ! soil and snow variables
Expand Down
1 change: 0 additions & 1 deletion src/shared/cable_phenology.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ SUBROUTINE cable_phenology_clim (veg, climate, phen)
USE casadimension
USE casaparm
USE casavariable
USE phenvariable
!data
USE cable_surface_types_mod, ONLY: evergreen_needleleaf, deciduous_needleleaf
USE cable_surface_types_mod, ONLY: evergreen_broadleaf, deciduous_broadleaf
Expand Down
Loading