Changeset 142 for branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba

Timestamp:

2011-03-16T10:08:26+01:00 (14 years ago)

Author:

didier.solyga

Message:

Adapte the history writing for treefrac,cropfrac and grassfrac for a variable number of pfts

File:

• branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/sechiba.f90 (modified) (3 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/sechiba.f90

@@ -252 +252 @@
     REAL(r_std), DIMENSION(kjpindex)                   :: histvar          !! computations for history files
 
-    INTEGER(i_std) :: j
+
+    ! 15/03/2011 DS Add for externalisation
+    REAL(r_std), DIMENSION(kjpindex) :: sum_treefrac, sum_grassfrac, sum_cropfrac
+    INTEGER(i_std) :: jv
 
 
@@ -584 +587 @@
     !
     !
+
+    !DS 15:03/2011  Prepares the writing of the history files
+    sum_treefrac(:) = zero
+    sum_grassfrac(:) = zero
+    sum_cropfrac(:) = zero
+    DO jv = 2, nvm 
+       IF (is_tree(jv) .AND. natural(jv)) THEN
+          sum_treefrac(:) = sum_treefrac(:) + veget_max(:,jv)
+       ELSE IF ((.NOT. is_tree(jv))  .AND. natural(jv)) THEN
+          sum_grassfrac(:) = sum_grassfrac(:) + veget_max(:,jv)
+       ELSE 
+          sum_cropfrac = sum_cropfrac(:) + veget_max(:,jv)
+       ENDIF
+    ENDDO          
+
+
     IF ( .NOT. almaoutput ) THEN
        CALL histwrite(hist_id, 'beta', kjit, vbeta, kjpindex, index)
@@ -638 +657 @@
 
 !$$ 25/10/10 Modif DS & NViovy
-
-!!$       DO j = 2, nvm 
-!!$          IF (is_tree(j) .AND. natural(j)) THEN
-!!$             histvar(:)=SUM(veget_max(:,j))*100*contfrac(:)
-!!$             CALL histwrite(hist_id, 'treeFrac', kjit, histvar, kjpindex, index) 
-!!$          ELSE IF ((.NOT. is_tree(j))  .AND. natural(j)) THEN
-!!$             histvar(:)=SUM(veget_max(:,j))*100*contfrac(:)
-!!$             CALL histwrite(hist_id, 'grassFrac', kjit, histvar, kjpindex, index) 
-!!$          ELSE IF (.NOT. natural(j)) THEN
-!!$             histvar(:)=SUM(veget_max(:,j))*100*contfrac(:)
-!!$             CALL histwrite(hist_id, 'cropFrac', kjit, histvar, kjpindex, index)
-!!$          ELSE
-!!$             WRITE(numout,*) 'Something wrong happened in histvar of veget_max in sechiba.f90'
-!!$          ENDIF
-!!$       ENDDO
 !!$
-      WHERE (is_tree(:) .AND. natural(:)) 
-         histvar(:)=SUM(veget_max(:,j))*100*contfrac(:)
-      ENDWHERE
-      CALL histwrite(hist_id, 'treeFrac', kjit, histvar, kjpindex, index)
-
-      WHERE (.NOT. is_tree(:) .AND. natural(:))
-         histvar(:)=SUM(veget_max(:,j))*100*contfrac(:)
-      ENDWHERE
-      CALL histwrite(hist_id, 'grassFrac', kjit, histvar, kjpindex, index)
-
-      WHERE (.NOT. natural(:))
-         histvar(:)=SUM(veget_max(:,j))*100*contfrac(:)
-      ENDWHERE
-      CALL histwrite(hist_id, 'cropFrac', kjit, histvar, kjpindex, index)
-!!$   
-
-!--------------------------------------------
+       histvar(:)= sum_treefrac(:)*100*contfrac(:)
+       CALL histwrite(hist_id, 'treeFrac', kjit, histvar, kjpindex, index) 
+
+       histvar(:)= sum_grassfrac(:)*100*contfrac(:)
+       CALL histwrite(hist_id, 'grassFrac', kjit, histvar, kjpindex, index) 
+
+       histvar(:)= sum_cropfrac(:)*100*contfrac(:)
+       CALL histwrite(hist_id, 'cropFrac', kjit, histvar, kjpindex, index)
+
+
        histvar(:)=veget_max(:,1)*100*contfrac(:)
        CALL histwrite(hist_id, 'baresoilFrac', kjit, histvar, kjpindex, index)