Changes between Version 35 and Version 36 of Branches/MergeOCN/Goll

Timestamp:

2015-06-01T15:39:02+02:00 (9 years ago)

Author:

dgoll

Comment:

--

Branches/MergeOCN/Goll

@@ -97 +97 @@
 }}}
 === UPDATE ===
-{{{
+
+
+{{{
+  !! 5.2.7 Don't grow wood, use C to fill labile pool
+             ELSEIF ( (.NOT. grow_wood) .AND. (b_inc_tot .GT. min_stomate) ) THEN
+
                 ! Calculate the C that needs to be distributed to the 
                 ! labile pool. The fraction is proportional to the ratio 
@@ -112 +117 @@
                 ! the labile pool in 5.2.11
 
-                !DSGdebug_01a: we do not have to add the b_inc_tot to ilabile as
-                ! we do not have subtracted it due to DSGdebug_01
-
                 bm_alloc_tot(ipts,j) = bm_alloc_tot(ipts,j) - b_inc_tot
+
+                !DSGdebug_01a   We didn't remove bm_alloc_tot yet from labile so no
+                !need to correct labile pool for changes in bm_alloc_tot (which is residual)
                 !DSGdebug_01a biomass(ipts,j,ilabile,icarbon) = &
-                !DSGdebug_01a 
-}}}
-
+                !DSGdebug_01a      biomass(ipts,j,ilabile,icarbon) + b_inc_tot 
+}}}
+[...]
+{{{
+ !! 5.3.7 Don't grow wood, use C to fill labile pool
+   ELSEIF ( (.NOT. grow_wood) .AND. (b_inc_tot .GT. min_stomate) ) THEN
+
+                ! Calculate the C that needs to be distributed to the 
+                ! labile pool. The fraction is proportional to the ratio 
+                ! between the total allocatable biomass and the unallocated 
+                ! biomass per tree (b_inc now contains the unallocated 
+                ! biomass). At the end of the allocation scheme bm_alloc_tot 
+                ! is substracted from the labile biomass pool to update the 
+                ! biomass pool (biomass(:,:,ilabile) = biomass(:,:,ilabile) - 
+                ! bm_alloc_tot(:,:)). At that point, the scheme puts the 
+                ! unallocated b_inc into the labile pool. What we 
+                ! want is that the unallocated fraction is removed from 
+                ! ::bm_alloc_tot such that only the allocated C is removed 
+                ! from the labile pool. b_inc_tot will be moved back into
+                ! the labile pool in 5.2.11
+                bm_alloc_tot(ipts,j) = bm_alloc_tot(ipts,j) - b_inc_tot
+
+                !DSGdebug_01a   We didn't remove bm_alloc_tot yet from labile so no
+                !need to correct labile pool for changes in bm_alloc_tot (which is residual)
+                !DSGdebug_01a biomass(ipts,j,ilabile,icarbon) = biomass(ipts,j,ilabile,icarbon) + &
+                !DSGdebug_01a      b_inc_tot
+
+}}}
+[...]
+{{{
+                ELSE
+
+                   ! Not enough carbon to pay the deficit
+                   ! There is likely a bigger problem somewhere in
+                   ! this routine
+                   WRITE(numout,*) 'WARNING 23: PFT, ipts: ',j,ipts
+                   CALL ipslerr_p (3,'growth_fun_all',&
+                        'WARNING 23: numerical problem overspending ',&
+                        'when trying to account for unallocatable C ','')
+
+                ENDIF
+
+             ELSE
+
+             !DSGdebug_01a   We didn't remove bm_alloc_tot yet from labile so no
+             !need to correct labile pool for changes in bm_alloc_tot (which is residual)
+             !DSGdebug_01a   ! Move the unallocated carbon back into the labile pool
+             !DSGdebug_01a   biomass(ipts,j,ilabile,icarbon) = &
+             !DSGdebug_01a        biomass(ipts,j,ilabile,icarbon) + residual(ipts,j)
+
+             ENDIF
+
+}}}
 
 == '''2. Mass conservation issue: stomate_phenology.f90''' ==