Changeset 6369

Timestamp:

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

Author:

josefine.ghattas

Message:

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

Location:

branches/ORCHIDEE_2_2/ORCHIDEE

Files:

• src_stomate/stomate.f90 (modified) (8 diffs)
• src_stomate/stomate_lpj.f90 (modified) (4 diffs)
• src_xml/field_def_orchidee.xml (modified) (2 diffs)
• src_xml/file_def_orchidee.xml (modified) (2 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)

branches/ORCHIDEE_2_2/ORCHIDEE/src_stomate/stomate_lpj.f90

@@ -153 +153 @@
        lai, rprof,npp_daily, turnover_daily, turnover_time,&
        control_moist, control_temp, soilcarbon_input, &
-       co2_to_bm, co2_fire, resp_hetero, resp_maint, resp_growth, &
+       co2_to_bm, co2_fire, resp_hetero, resp_hetero_litter, resp_hetero_soil, resp_maint, resp_growth, &
        height, deadleaf_cover, vcmax, &
        bm_to_litter, &
@@ -248 +248 @@
     REAL(r_std), DIMENSION(npts,nvm), INTENT(inout)            :: resp_hetero          !! Heterotrophic respiration
                                                                                        !! @tex $(gC m^{-2} dtslow^{-1})$ @endtex 
+    REAL(r_std), DIMENSION(npts,nvm), INTENT(inout)            :: resp_hetero_litter   !! Heterotrophic respiration from litter
+                                                                                       !! @tex $(gC m^{-2} dtslow^{-1})$ @endtex
+    REAL(r_std), DIMENSION(npts,nvm), INTENT(inout)            :: resp_hetero_soil     !! Heterotrophic respiration from soil
+                                                                                       !! @tex $(gC m^{-2} dtslow^{-1})$ @endtex
     REAL(r_std), DIMENSION(npts,nvm), INTENT(out)              :: resp_maint           !! Maintenance respiration  
                                                                                        !! @tex $(gC m^{-2} dtslow^{-1})$ @endtex 
@@ -800 +804 @@
          veget_cov_max, veget_cov_max_tmp, lai, &
          litter, carbon, turnover_daily, bm_to_litter, &
-         co2_to_bm, co2_fire, resp_hetero, resp_maint, resp_growth, gpp_daily)
+         co2_to_bm, co2_fire, resp_hetero, resp_hetero_litter, resp_hetero_soil, resp_maint, resp_growth, gpp_daily)
 
   !! 13. Update litter pools to account for harvest
@@ -1100 +1104 @@
 
     CALL xios_orchidee_send_field("rh",SUM(resp_hetero*veget_cov_max,dim=2)/1e3/one_day)
+    CALL xios_orchidee_send_field("rhLitter",SUM(resp_hetero_litter*veget_cov_max,dim=2)/1e3/one_day)
+    CALL xios_orchidee_send_field("rhSoil",SUM(resp_hetero_soil*veget_cov_max,dim=2)/1e3/one_day)
+    CALL xios_orchidee_send_field("HET_RESP_SOIL",resp_hetero_soil(:,:))
+    CALL xios_orchidee_send_field("HET_RESP_LITTER",resp_hetero_litter(:,:))
+
     CALL xios_orchidee_send_field("fFire",SUM(co2_fire*veget_cov_max,dim=2)/1e3/one_day)
     ctotfirelut(:,:)=xios_default_val

branches/ORCHIDEE_2_2/ORCHIDEE/src_xml/field_def_orchidee.xml

@@ -380 +380 @@
     <field id="MAXFPC_LASTYEAR" name="MAXFPC_LASTYEAR" long_name="Foliage projective cover of last year" unit="-" grid_ref="grid_nvm"/>
     <field id="HET_RESP" name="HET_RESP" long_name="heterotr. resp. from ground" unit="gC/m^2 tot/pft/day" grid_ref="grid_nvm"/>
+    <field id="HET_RESP_SOIL" name="HET_RESP_SOIL" long_name="heterotr. resp. from soil" unit="gC/m^2 tot/pft/day" grid_ref="grid_nvm"/>
+    <field id="HET_RESP_LITTER" name="HET_RESP_LITTER" long_name="heterotr. resp. from litter" unit="gC/m^2 tot/pft/day" grid_ref="grid_nvm"/>
     <field id="firefrac" name="FIREFRAC" long_name="Fire fraction on ground " unit="1/day" grid_ref="grid_nvm"/>
     <field id="CO2_FIRE" name="CO2_FIRE" long_name="Output CO2 flux from fire " unit="gC/day/m^2/pft" grid_ref="grid_nvm"/>
@@ -501 +503 @@
     <field id="npp_ipcc" name="npp" long_name="Net Primary Production (positive from atm to land)" unit="kg C m-2 s-1"/>
     <field id="rh" name="rh" long_name="Heterotrophic Respiration (positive from atm to land)" unit="kg C m-2 s-1"/>
-    <field id="rhSoil" name="rhSoil" long_name="Carbon mass flux due to heterotrophic respiration from soil on land (positive from land to atm)" unit="kg C m-2 s-1"  > this*(-1) </field>
-    <field id="rhLitter" name="rhLitter" long_name="Carbon mass flux due to heterotrophic respiration from litter on land (positive from land to atm)" unit="kg C m-2 s-1"  > this*(-1) </field>
+    <field id="rhSoil" name="rhSoil" long_name="Carbon mass flux due to heterotrophic respiration from soil on land (positive from land to atm)" unit="kg C m-2 s-1" /> 
+    <field id="rhLitter" name="rhLitter" long_name="Carbon mass flux due to heterotrophic respiration from litter on land (positive from land to atm)" unit="kg C m-2 s-1" /> 
     <field id="tSoilPools" name="tSoilPools" long_name="soil_carbon_turnover_rate : defined as 1/(turnover time) for soil pools." unit="s-1" grid_ref="grid_ncarb"/>
     <field id="fFire" name="fFire" long_name="CO2 Emission from Fire (positive from atm to land)" unit="kg C m-2 s-1"/>

branches/ORCHIDEE_2_2/ORCHIDEE/src_xml/file_def_orchidee.xml

@@ -735 +735 @@
      
     <!-- level 1 -->
-    <field field_ref="RESOLUTION_X" level="1"/>
-    <field field_ref="RESOLUTION_Y" level="1"/>
+    <field field_ref="RESOLUTION_X" level="0"/>
+    <field field_ref="RESOLUTION_Y" level="0"/>
     <field field_ref="CONTFRAC_STOMATE" level="0"/>
     <field field_ref="areas" level="0"/>
@@ -865 +865 @@
     <!-- level 10 -->
     <field field_ref="FIREINDEX" grid_ref="grid_nvm_out" level="10"/>
-    
+    <field field_ref="HET_RESP_SOIL" grid_ref="grid_nvm_out" level="10"/>
+    <field field_ref="HET_RESP_LITTER" grid_ref="grid_nvm_out" level="10"/>
+ 
    </field_group>