Remove ESM15 special case. Add lnonwood condition for dPplant(wood), #…

…423
CABLE-LSM · Oct 25, 2024 · 927c87f · 927c87f
1 parent 5c748af
commit 927c87f
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/science/casa-cnp/casa_cnp.F90 b/src/science/casa-cnp/casa_cnp.F90
@@ -1,4 +1,3 @@
-!#define ESM15 YES
 !==============================================================================
 ! This source code is part of the
 ! Australian Community Atmosphere Biosphere Land Exchange (CABLE) model.
@@ -1027,14 +1026,15 @@ SUBROUTINE casa_delplant(veg,casabiome,casapool,casaflux,casamet,            &
                                       * casabiome%ftransNPtoL(veg%iveg(npt),leaf)
       ENDIF
 
-      casapool%dNplantdt(npt,wood) = 0.0
-#ifndef ESM15
-      ! offline/trunk uses this condition
-      IF (casamet%lnonwood(npt)==0)                                            & 
-#endif
-      casapool%dNplantdt(npt,wood) = - casaflux%kplant(npt,wood)             &
+      !R. Law 25/10/24 removed ESM15 case as no need to exclude the condition
+      !that is in offline/trunk. Also re-write as IF / THEN
+      IF (casamet%lnonwood(npt)==0) THEN                                          
+        casapool%dNplantdt(npt,wood) = - casaflux%kplant(npt,wood)             &
                                      * casapool%Nplant(npt,wood)               &
                                      * casabiome%ftransNPtoL(veg%iveg(npt),wood)
+      ELSE
+        casapool%dNplantdt(npt,wood) = 0.0
+      ENDIF
 
       casapool%dNplantdt(npt,froot) = - casaflux%kplant(npt,froot)             &
                                     * casapool%Nplant(npt,froot)               &
@@ -1066,9 +1066,14 @@ SUBROUTINE casa_delplant(veg,casabiome,casapool,casaflux,casamet,            &
                                      * casabiome%ftransPPtoL(veg%iveg(npt),leaf)
       ENDIF
 
-      casapool%dPplantdt(npt,wood) = - casaflux%kplant(npt,wood)               &
+      !R. Law 25/10/24 Add similar lnonwood condition as used in nitrogen case
+      IF (casamet%lnonwood(npt)==0) THEN                                          
+        casapool%dPplantdt(npt,wood) = - casaflux%kplant(npt,wood)             &
                                    * casapool%Pplant(npt,wood)                 &
                                    * casabiome%ftransPPtoL(veg%iveg(npt),wood)
+      ELSE
+        casapool%dPplantdt(npt,wood) = 0.0
+      ENDIF
 
       casapool%dPplantdt(npt,froot) = - casaflux%kplant(npt,froot)             &
                                     * casapool%Pplant(npt,froot)               &