Skip to content
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

update logic surrounding timestepping of cable%cansto / %oldcanst #506

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

update logic surrounding timestepping of cable%cansto / %oldcanst #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions src/coupled/ACCESS-CM2/control/explicit/cable_explicit_driver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,6 @@ SUBROUTINE cable_explicit_driver( row_length, rows, land_pts, ntiles,npft, &
!CM2!IF(l_vcmaxFeedbk) call casa_feedback(ktau_gl,veg,casabiome,casapool,casamet)
!CM2!IF(l_laiFeedbk) veg%vlai(:) = casamet%glai(:)

canopy%oldcansto=canopy%cansto
rad%otrad = rad%trad

!---------------------------------------------------------------------!
Expand All @@ -305,7 +304,7 @@ SUBROUTINE cable_explicit_driver( row_length, rows, land_pts, ntiles,npft, &
CALL cbm( ktau_gl,timestep, air, bgc, canopy, met, bal, &
rad, rough, soil, ssnow, sum_flux, veg, climate )

!-------- End Unique subroutine body -----------
canopy%cansto=canopy%oldcansto

return

Expand Down
6 changes: 2 additions & 4 deletions src/coupled/ACCESS-CM2/control/implicit/cable_implicit_driver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,6 @@ subroutine cable_implicit_driver( i_day_number, cycleno, &! num_cycles
met%tvair = met%tk
met%tvrad = met%tk

canopy%cansto = canopy%oldcansto

CALL cbm( ktau_gl,timestep, air, bgc, canopy, met, bal, &
rad, rough, soil, ssnow, sum_flux, veg, climate )

Expand Down Expand Up @@ -419,7 +417,7 @@ subroutine cable_store_prognostics()
PB(ipb)%snow_age = ssnow%snage
PB(ipb)%snow_flg3l= ssnow%isflag
PB(ipb)%snow_tile = ssnow%snowd
PB(ipb)%ocanopy = canopy%oldcansto
PB(ipb)%ocanopy = canopy%cansto
!Jan 2018 new PB variables
PB(ipb)%fes_cor = canopy%fes_cor
PB(ipb)%puddle = ssnow%pudsto
Expand Down Expand Up @@ -462,7 +460,7 @@ SUBROUTINE cable_reinstate_prognostics()
ssnow%snage = PB(1)%snow_age
ssnow%isflag = PB(1)%snow_flg3l
ssnow%snowd = PB(1)%snow_tile
canopy%oldcansto = PB(1)%ocanopy
canopy%cansto = PB(1)%ocanopy
!Jan 2018 new PB variables
canopy%fes_cor = PB(1)%fes_cor
ssnow%pudsto = PB(1)%puddle
Expand Down
2 changes: 2 additions & 0 deletions src/coupled/AM3/control/cable/interface/explicit/cable_explicit_driver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,8 @@ SUBROUTINE cable_explicit_driver( &
CALL cbm_expl( mp, nrb, timestep_number, timestep, air, bgc, canopy, met, bal, &
rad, rough, soil, ssnow, sum_flux, veg, climate )

canopy%cansto = canopy%oldcansto

RETURN
END SUBROUTINE cable_explicit_driver

Expand Down
5 changes: 2 additions & 3 deletions src/coupled/ESM1.5/CABLEfilesFromESM1.5/cable_explicit_driver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,16 +389,15 @@ SUBROUTINE cable_explicit_driver( row_length, rows, land_pts, ntiles,npft, &
IF(l_vcmaxFeedbk) call casa_feedback(ktau_gl,veg,casabiome,casapool,casamet)
IF(l_laiFeedbk) veg%vlai(:) = casamet%glai(:)

canopy%oldcansto=canopy%cansto


!---------------------------------------------------------------------!
!--- real(timestep) width, CABLE types passed to CABLE "engine" as ---!
!--- req'd by Mk3L --------------------------------------------------!
!---------------------------------------------------------------------!
CALL cbm( timestep, air, bgc, canopy, met, bal, &
rad, rough, soil, ssnow, sum_flux, veg, climate )

canopy%cansto=canopy%oldcansto

!---------------------------------------------------------------------!
!--- pass land-surface quantities calc'd by CABLE in explicit call ---!
!--- back to UM. ---!
Expand Down
2 changes: 0 additions & 2 deletions src/coupled/ESM1.5/CABLEfilesFromESM1.5/cable_implicit_driver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,6 @@ subroutine cable_implicit_driver( LS_RAIN, CON_RAIN, LS_SNOW, CONV_SNOW, &
met%tvrad = met%tk
met%doy = idoy + 1

canopy%cansto = canopy%oldcansto

CALL cbm(TIMESTEP, air, bgc, canopy, met, bal, &
rad, rough, soil, ssnow, sum_flux, veg, climate )

Expand Down
1 change: 0 additions & 1 deletion src/offline/cable_serial.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,6 @@ SUBROUTINE serialdrv(trunk_sumbal, NRRRR, dels, koffset, kend, GSWP_MID, PLUME,
ENDIF
ENDIF
met%ofsd = met%fsd(:,1) + met%fsd(:,2)
canopy%oldcansto=canopy%cansto
! Zero out lai where there is no vegetation acc. to veg. index
WHERE ( veg%iveg(:) .GE. 14 ) veg%vlai = 0.

Expand Down
2 changes: 1 addition & 1 deletion src/science/canopy/cable_canopy.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ SUBROUTINE define_canopy(bal,rad,rough,air,met,dels,ssnow,soil,veg, canopy,clima
REAL :: Surf_conductance(mp)
! END header

canopy%cansto = canopy%oldcansto
canopy%oldcansto = canopy%cansto

ALLOCATE( cansat(mp), gbhu(mp,mf))
ALLOCATE( dsx(mp), fwsoil(mp), tlfx(mp), tlfy(mp) )
Expand Down
Loading