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

Jump to bottom

bug fix rm USE rplant1 and CALL rplant1 #340

Merged
merged 1 commit into from
Jul 12, 2024
Merged

bug fix rm USE rplant1 and CALL rplant1 #340

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
11 changes: 1 addition & 10 deletions src/science/casa-cnp/biogeochem_casa.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
!#define ESM15 YES

MODULE biogeochem_mod

IMPLICIT NONE
Expand All @@ -17,11 +15,7 @@ SUBROUTINE biogeochem(ktau,dels,idoY,LALLOC,veg,soil,casabiome,casapool,casaflux
USE casa_cnp_module
USE casa_inout_module, ONLY : casa_cnpflux
USE POP_TYPES, ONLY: POP_TYPE
#ifdef ESM15
USE casa_rplant_module, ONLY: casa_rplant
#else
USE casa_rplant_module, ONLY: casa_rplant1
#endif

IMPLICIT NONE
INTEGER, INTENT(IN) :: ktau
Expand Down Expand Up @@ -62,11 +56,8 @@ SUBROUTINE biogeochem(ktau,dels,idoY,LALLOC,veg,soil,casabiome,casapool,casaflux
CALL phenology(idoy,veg,phen)
ENDIF
CALL avgsoil(veg,soil,casamet)
#ifdef ESM15

CALL casa_rplant(veg,casabiome,casapool,casaflux,casamet,climate)
#else
CALL casa_rplant1(veg,casabiome,casapool,casaflux,casamet)
#endif
IF (.NOT.cable_user%CALL_POP) THEN
CALL casa_allocation(veg,soil,casabiome,casaflux,casapool,casamet,phen,LALLOC)
ENDIF
Expand Down
Loading