diff --git a/src/coupled/ACCESS-CM2/control/explicit/cable_explicit_driver.F90 b/src/coupled/ACCESS-CM2/control/explicit/cable_explicit_driver.F90 index 9e9238f4b..092701c24 100644 --- a/src/coupled/ACCESS-CM2/control/explicit/cable_explicit_driver.F90 +++ b/src/coupled/ACCESS-CM2/control/explicit/cable_explicit_driver.F90 @@ -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 !---------------------------------------------------------------------! @@ -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 diff --git a/src/coupled/ACCESS-CM2/control/implicit/cable_implicit_driver.F90 b/src/coupled/ACCESS-CM2/control/implicit/cable_implicit_driver.F90 index a57842868..926d5256e 100644 --- a/src/coupled/ACCESS-CM2/control/implicit/cable_implicit_driver.F90 +++ b/src/coupled/ACCESS-CM2/control/implicit/cable_implicit_driver.F90 @@ -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 ) @@ -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 @@ -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 diff --git a/src/coupled/AM3/control/cable/interface/explicit/cable_explicit_driver.F90 b/src/coupled/AM3/control/cable/interface/explicit/cable_explicit_driver.F90 index ef2d3d401..6dd7f7870 100644 --- a/src/coupled/AM3/control/cable/interface/explicit/cable_explicit_driver.F90 +++ b/src/coupled/AM3/control/cable/interface/explicit/cable_explicit_driver.F90 @@ -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 diff --git a/src/coupled/ESM1.5/CABLEfilesFromESM1.5/cable_explicit_driver.F90 b/src/coupled/ESM1.5/CABLEfilesFromESM1.5/cable_explicit_driver.F90 index 082e96cfb..7dbfe7a21 100644 --- a/src/coupled/ESM1.5/CABLEfilesFromESM1.5/cable_explicit_driver.F90 +++ b/src/coupled/ESM1.5/CABLEfilesFromESM1.5/cable_explicit_driver.F90 @@ -389,9 +389,6 @@ 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 --------------------------------------------------! @@ -399,6 +396,8 @@ SUBROUTINE cable_explicit_driver( row_length, rows, land_pts, ntiles,npft, & 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. ---! diff --git a/src/coupled/ESM1.5/CABLEfilesFromESM1.5/cable_implicit_driver.F90 b/src/coupled/ESM1.5/CABLEfilesFromESM1.5/cable_implicit_driver.F90 index 31bc211f8..4f6b217b0 100644 --- a/src/coupled/ESM1.5/CABLEfilesFromESM1.5/cable_implicit_driver.F90 +++ b/src/coupled/ESM1.5/CABLEfilesFromESM1.5/cable_implicit_driver.F90 @@ -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 ) diff --git a/src/offline/cable_serial.F90 b/src/offline/cable_serial.F90 index 11df02a73..107055229 100644 --- a/src/offline/cable_serial.F90 +++ b/src/offline/cable_serial.F90 @@ -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. diff --git a/src/science/canopy/cable_canopy.F90 b/src/science/canopy/cable_canopy.F90 index e0ead8d1f..400c51532 100644 --- a/src/science/canopy/cable_canopy.F90 +++ b/src/science/canopy/cable_canopy.F90 @@ -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) )