Changeset 281

Timestamp:

2011-06-27T10:04:55+02:00 (13 years ago)

Author:

didier.solyga

Message:

Merge the externalized version with the last commits done on the trunk (see revisions 278,279 and 280)

Location:

branches/ORCHIDEE_EXT/ORCHIDEE

Files:

• src_sechiba/intersurf.f90 (modified) (4 diffs)
• src_stomate/lpj_constraints.f90 (modified) (2 diffs)
• src_stomate/lpj_establish.f90 (modified) (1 diff)
• src_stomate/stomate_lpj.f90 (modified) (2 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/intersurf.f90

@@ -4581 +4581 @@
             & dt, hist_dt_stom, hori_id, hist_PFTaxis_id, &
             & hist_pool_10axis_id, hist_pool_100axis_id, &
-            & hist_pool_11axis_id, hist_pool_101axis_id)
+            & hist_pool_11axis_id, hist_pool_101axis_id, control_flags)
 ! deforestation axis added as arguments
 
@@ -4678 +4678 @@
        &  hist_dt, hist_hori_id, hist_PFTaxis_id, &
        & hist_pool_10axis_id, hist_pool_100axis_id, &
-       & hist_pool_11axis_id, hist_pool_101axis_id)
+       & hist_pool_11axis_id, hist_pool_101axis_id, control_flags)
     ! deforestation axis added as arguments
 
@@ -4706 +4706 @@
     INTEGER(i_std),INTENT(in) :: hist_pool_10axis_id,hist_pool_100axis_id
     INTEGER(i_std),INTENT(in) :: hist_pool_11axis_id,hist_pool_101axis_id
+    !- Flags that (de)activate parts of the model
+    TYPE(control_type), INTENT(in)             :: control_flags
     !-
     !- 1 local
@@ -4932 +4934 @@
          &               TRIM("Density of individuals                            "), &
          &               TRIM("1/ m^2              "), iim,jjm, hist_hori_id, &
+         &               nvm,1,nvm, hist_PFTaxis_id,32, ave(3), dt, hist_dt)
+
+    IF ( control_flags%ok_dgvm ) THEN    
+       ! Adaptation to climate
+       CALL histdef (hist_id_stom, &
+            &               TRIM("ADAPTATION          "), &
+            &               TRIM("Adaptation to climate (DGVM)                      "), &
+            &               TRIM("-                   "), iim,jjm, hist_hori_id, &
+            &               nvm,1,nvm, hist_PFTaxis_id,32, ave(3), dt, hist_dt)
+
+       ! Probability from regenerative
+       CALL histdef (hist_id_stom, &
+            &               TRIM("REGENERATION        "), &
+            &               TRIM("Probability from regenerative (DGVM)               "), &
+            &               TRIM("-                   "), iim,jjm, hist_hori_id, &
+            &               nvm,1,nvm, hist_PFTaxis_id,32, ave(3), dt, hist_dt)
+    ENDIF
+
+    ! crown area of individuals (m**2)
+    CALL histdef (hist_id_stom, &
+         &               TRIM("CN_IND              "), &
+         &               TRIM("crown area of individuals                         "), &
+         &               TRIM("m^2                 "), iim,jjm, hist_hori_id, &
+         &               nvm,1,nvm, hist_PFTaxis_id,32, ave(3), dt, hist_dt)
+
+    ! woodmass of individuals (gC)
+    CALL histdef (hist_id_stom, &
+         &               TRIM("WOODMASS_IND        "), &
+         &               TRIM("Woodmass of individuals                           "), &
+         &               TRIM("gC/pft              "), iim,jjm, hist_hori_id, &
          &               nvm,1,nvm, hist_PFTaxis_id,32, ave(3), dt, hist_dt)
 

branches/ORCHIDEE_EXT/ORCHIDEE/src_stomate/lpj_constraints.f90

@@ -146 +146 @@
           IF ( tree(j) .AND. ( pheno_model(j) .NE. 'none' ) ) THEN
 
-             WHERE ( when_growthinit(:,j) .GT. too_long*one_year )
+             WHERE ( when_growthinit(:,j) .GT. too_long*one_year .AND. when_growthinit(:,j).LT. large_value)
                 adapted(:,j) = zero
              ENDWHERE
@@ -198 +198 @@
     ENDDO
 
+    CALL histwrite (hist_id_stomate, 'ADAPTATION', itime, &
+         adapted, npts*nvm, horipft_index)
+    CALL histwrite (hist_id_stomate, 'REGENERATION', itime, &
+         regenerate, npts*nvm, horipft_index)
+
     IF (bavard.GE.4) WRITE(numout,*) 'Leaving constraints'
 

branches/ORCHIDEE_EXT/ORCHIDEE/src_stomate/lpj_establish.f90

@@ -621 +621 @@
                            &                **(1./(2.+pipe_tune3))
 
-                      vn(:)=(ind(i,j)+d_ind(i,j))*pipe_tune1*MIN(dia(i),maxdia(j))**pipe_tune_exp_coeff
+                      vn(i)=(ind(i,j)+d_ind(i,j))*pipe_tune1*MIN(dia(i),maxdia(j))**pipe_tune_exp_coeff
 
                    ENDIF

branches/ORCHIDEE_EXT/ORCHIDEE/src_stomate/stomate_lpj.f90

@@ -806 +806 @@
     CALL histwrite (hist_id_stomate, 'CO2_TAKEN', itime, &
          co2_to_bm, npts*nvm, horipft_index)
-!MM : histdef à construire ! 
-!!$   CALL histwrite (hist_id_stomate, 'CN_IND', itime, &
-!!$                    cn_ind, npts*nvm, horipft_index)
-!!$   CALL histwrite (hist_id_stomate, 'WOODMASS_IND', itime, &
-!!$                    woodmass_ind, npts*nvm, horipft_index)
     ! land cover change
     CALL histwrite (hist_id_stomate, 'CONVFLUX', itime, &
@@ -835 +830 @@
     CALL histwrite (hist_id_stomate, 'IND', itime, &
          ind, npts*nvm, horipft_index)
+    CALL histwrite (hist_id_stomate, 'CN_IND', itime, &
+         cn_ind, npts*nvm, horipft_index)
+    CALL histwrite (hist_id_stomate, 'WOODMASS_IND', itime, &
+         woodmass_ind, npts*nvm, horipft_index)
     CALL histwrite (hist_id_stomate, 'TOTAL_M', itime, &
          tot_live_biomass, npts*nvm, horipft_index)