From a051b92bd1c625f6b97c3176b67f8d0d209e384b Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Thu, 11 Jul 2024 23:15:30 +1000 Subject: [PATCH] bug fi --- src/science/casa-cnp/biogeochem_casa.F90 | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/science/casa-cnp/biogeochem_casa.F90 b/src/science/casa-cnp/biogeochem_casa.F90 index 15fb6238b..ab0f4ebb1 100644 --- a/src/science/casa-cnp/biogeochem_casa.F90 +++ b/src/science/casa-cnp/biogeochem_casa.F90 @@ -1,5 +1,3 @@ -!#define ESM15 YES - MODULE biogeochem_mod IMPLICIT NONE @@ -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 @@ -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