Skip to content

Pull in recent um7 changes #647

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

Merged
Whyborn merged 2 commits into from
Nov 3, 2025
Merged

Pull in recent um7 changes #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
148006a
Bring commits b22a35a and 55a4fc9
Whyborn Oct 31, 2025
d9db66d
Bring xnslope change
Whyborn Oct 31, 2025
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
2 changes: 1 addition & 1 deletion src/science/casa-cnp/biogeochem_casa.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ SUBROUTINE biogeochem(ktau,dels,idoY,LALLOC,veg,soil,casabiome,casapool,casaflux
! zero annual sums
IF (idoy==1) CALL casa_cnpflux(casaflux,casapool,casabal,.TRUE.)

IF (cable_user%PHENOLOGY_SWITCH.EQ.'MODIS' .OR. cable_runtime%esm15 ) THEN
IF (cable_user%PHENOLOGY_SWITCH.EQ.'MODIS' ) THEN
CALL phenology(idoy,veg,phen)
ENDIF
CALL avgsoil(veg,soil,casamet)
Expand Down
4 changes: 1 addition & 3 deletions src/science/casa-cnp/casa_feedback.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ SUBROUTINE casa_feedback( ktau, veg, casabiome, casapool, casamet )

integer np,ivt
real, dimension(mp) :: ncleafx,npleafx, pleafx, nleafx ! local variables
real, dimension(17) :: xnslope
data xnslope/0.80,1.00,2.00,1.00,1.00,1.00,0.50,1.00,0.34,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00/
REAL :: npleafx_coef

! first initialize
Expand Down Expand Up @@ -89,7 +87,7 @@ SUBROUTINE casa_feedback( ktau, veg, casabiome, casapool, casamet )

veg%vcmax(np) = ( casabiome%nintercept(ivt) &
+ casabiome%nslope(ivt) * npleafx_coef * ncleafx(np) &
/ casabiome%sla(ivt) ) * xnslope(ivt) * 1.0e-6
/ casabiome%sla(ivt) ) * 1.0e-6

END IF

Expand Down