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
12 changes: 4 additions & 8 deletions src/coupled/AM3/control/cable/CM3/cbl_cbm_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ SUBROUTINE cbm_expl( mp, nrb, ktau,dels, air, bgc, canopy, met, &
REAL :: veg_trad(mp)
REAL :: soil_wt(mp)
REAL :: soil_trad(mp)
REAL :: trad_corr(mp)

CHARACTER(LEN=8), PARAMETER :: subr_name = "ExpCbmT_"

Expand Down Expand Up @@ -172,10 +171,9 @@ SUBROUTINE cbm_expl( mp, nrb, ktau,dels, air, bgc, canopy, met, &
veg_wt = 1.0 - rad%transd
veg_trad = Cemleaf * canopy%tv**4
soil_wt = rad%transd
soil_trad = Cemsoil * ssnow%otss**4
trad_corr = canopy%fns_cor/CSBOLTZ
soil_trad = Cemsoil * ssnow%tss**4

rad%trad = ( veg_wt * veg_trad ) + ( soil_wt * soil_trad ) + trad_corr
rad%trad = ( veg_wt * veg_trad ) + ( soil_wt * soil_trad )
rad%trad = rad%trad**0.25

RETURN
Expand Down Expand Up @@ -260,7 +258,6 @@ SUBROUTINE cbm_impl( cycleno, numcycles, mp, nrb, ktau, dels, &
REAL :: veg_trad(mp)
REAL :: soil_wt(mp)
REAL :: soil_trad(mp)
REAL :: trad_corr(mp)

CHARACTER(LEN=8), PARAMETER :: subr_name = "cbm_impl"

Expand Down Expand Up @@ -374,10 +371,9 @@ SUBROUTINE cbm_impl( cycleno, numcycles, mp, nrb, ktau, dels, &
veg_wt = 1.0 - rad%transd
veg_trad = Cemleaf * canopy%tv**4
soil_wt = rad%transd
soil_trad = Cemsoil * ssnow%otss**4
trad_corr = canopy%fns_cor/CSBOLTZ
soil_trad = Cemsoil * ssnow%tss**4

rad%trad = ( veg_wt * veg_trad ) + ( soil_wt * soil_trad ) + trad_corr
rad%trad = ( veg_wt * veg_trad ) + ( soil_wt * soil_trad )
rad%trad = rad%trad**0.25

! In physical model only (i.e. without CASA-CNP)
Expand Down
11 changes: 0 additions & 11 deletions src/science/soilsnow/cbl_soilsnow_main.F90
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,6 @@ SUBROUTINE soil_snow(dels, soil, ssnow, canopy, met, bal, veg)

ssnow%wbliq = ssnow%wb - ssnow%wbice

! soilsnow_init_spec, special initalizations in um_init NA for ESM1.5

xx=soil%css * soil%rhosoil

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Where is the equivalent bit of science in the library - i.e. where is %gamzz being initialised on the first call in offline and AM3 (likely um_init_soilsnow)?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Apparently this is now stored in the restart. We had a long conversation about this in the JULES PR, and the gist was that this bit of code can be removed. In offline mode, we call spec_init_soil_snow from the driver which overrides this anyway.

IF (ktau <= 1) &
ssnow%gammzz(:,1) = MAX( (1.0 - soil%ssat) * soil%css * soil%rhosoil &
& + (ssnow%wb(:,1) - ssnow%wbice(:,1) ) * Ccswat * Cdensity_liq &
& + ssnow%wbice(:,1) * Ccsice * Cdensity_ice, xx ) * soil%zse(1) + &
& (1. - ssnow%isflag) * Ccgsnow * ssnow%snowd



DO k = 1, ms ! for stempv

! Set liquid soil water fraction (fraction of saturation value):
Expand Down
Loading