Changeset 6369 for branches/ORCHIDEE_2_2/ORCHIDEE/src_stomate/stomate.f90

Timestamp:

2019-11-29T15:58:40+01:00 (5 years ago)

Author:

josefine.ghattas

Message:

Integrated correction of diagnostic variables rhSoil and rhLitter as done in the trunk rev [6362]. See ticket #630

File:

• branches/ORCHIDEE_2_2/ORCHIDEE/src_stomate/stomate.f90 (modified) (8 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/src_stomate/stomate.f90

@@ -259 +259 @@
                                                                          !! @tex $(gC m^{-2} dt_stomate^{-1})$ @endtex
 !$OMP THREADPRIVATE(resp_hetero_d)
+  REAL(r_std),ALLOCATABLE,SAVE,DIMENSION(:,:)    :: resp_hetero_litter_d !! Heterotrophic respiration from litter per ground area 
+                                                                         !! @tex $(gC m^{-2} dt_stomate^{-1})$ @endtex
+!$OMP THREADPRIVATE(resp_hetero_litter_d)
+  REAL(r_std),ALLOCATABLE,SAVE,DIMENSION(:,:)    :: resp_hetero_soil_d   !! Heterotrophic respiration from soil per ground area 
+                                                                         !! @tex $(gC m^{-2} dt_stomate^{-1})$ @endtex
+!$OMP THREADPRIVATE(resp_hetero_soil_d)
   REAL(r_std),ALLOCATABLE,SAVE,DIMENSION(:,:)    :: resp_hetero_radia    !! Heterothrophic respiration per ground area at Sechiba
                                                                          !! time step 
@@ -1505 +1511 @@
     resp_hetero_radia(:,:) = resp_hetero_litter(:,:) + resp_hetero_soil(:,:)
     resp_hetero_d(:,:) = resp_hetero_d(:,:) + resp_hetero_radia(:,:)
+    resp_hetero_litter_d(:,:) = resp_hetero_litter_d(:,:) + resp_hetero_litter(:,:)
+    resp_hetero_soil_d(:,:) = resp_hetero_soil_d(:,:) + resp_hetero_soil(:,:)
+
     
     !! 4.6 Accumulate instantaneous variables (do_slow=.FALSE.) 
@@ -1595 +1604 @@
             &             control_moist_inst, control_temp_inst, soilcarbon_input_inst, &
             &             co2_to_bm_dgvm, co2_fire, &
-            &             resp_hetero_d, resp_maint_d, resp_growth_d, &
+            &             resp_hetero_d, resp_hetero_litter_d, resp_hetero_soil_d, resp_maint_d, resp_growth_d, &
             &             height, deadleaf_cover, vcmax, &
             &             bm_to_litter,&
@@ -1767 +1776 @@
 
        CALL xios_orchidee_send_field("nep",SUM(nep_daily*veget_cov_max,dim=2)/1e3/one_day)
-       CALL xios_orchidee_send_field("rhSoil",SUM(resp_hetero_soil*veget_cov_max,dim=2)/1e3)
-       CALL xios_orchidee_send_field("rhLitter",SUM(resp_hetero_litter*veget_cov_max,dim=2)/1e3)
 
        ! Calculate co2_flux as (-1)*nep_daily*veget_cov_max. 
@@ -1853 +1860 @@
        resp_maint_part(:,:,:)=zero
        resp_hetero_d=zero
+       resp_hetero_litter_d=zero
+       resp_hetero_soil_d=zero
+
        IF (printlev >= 3) THEN
           WRITE(numout,*) 'stomate_main: daily processes done'
@@ -2830 +2840 @@
     ENDIF
 
+    ALLOCATE(resp_hetero_litter_d(kjpindex,nvm),stat=ier)
+    l_error = l_error .OR. (ier /= 0)
+    IF (l_error) THEN
+       WRITE(numout,*) 'Memory allocation error for resp_hetero_litter_d. We stop. We need kjpindex*nvm words',kjpindex,nvm
+       STOP 'stomate_init'
+    ENDIF
+
+    ALLOCATE(resp_hetero_soil_d(kjpindex,nvm),stat=ier)
+    l_error = l_error .OR. (ier /= 0)
+    IF (l_error) THEN
+       WRITE(numout,*) 'Memory allocation error for resp_hetero_soil_d. We stop. We need kjpindex*nvm words',kjpindex,nvm
+       STOP 'stomate_init'
+    ENDIF
+
     ALLOCATE(resp_hetero_radia(kjpindex,nvm),stat=ier)
     l_error = l_error .OR. (ier /= 0)
@@ -3425 +3449 @@
     turnover_daily(:,:,:,:) = zero
     resp_hetero_d(:,:) = zero
+    resp_hetero_litter_d(:,:) = zero
+    resp_hetero_soil_d(:,:) = zero
     nep_daily(:,:) = zero
     nep_monthly(:,:) = zero
@@ -3538 +3564 @@
     IF (ALLOCATED(age))  DEALLOCATE(age)
     IF (ALLOCATED(resp_hetero_d)) DEALLOCATE(resp_hetero_d)
+    IF (ALLOCATED(resp_hetero_litter_d)) DEALLOCATE(resp_hetero_litter_d)
+    IF (ALLOCATED(resp_hetero_soil_d)) DEALLOCATE(resp_hetero_soil_d)
     IF (ALLOCATED(resp_hetero_radia)) DEALLOCATE(resp_hetero_radia)
     IF (ALLOCATED(resp_maint_d)) DEALLOCATE(resp_maint_d)