Changeset 106 for branches/ORCHIDEE_EXT/ORCHIDEE

Timestamp:

2011-02-11T15:24:03+01:00 (13 years ago)

Author:

didier.solyga

Message:

Minor modifications

Location:

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba

Files:

• enerbil.f90 (modified) (1 diff)
• sechiba.f90 (modified) (2 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/enerbil.f90

@@ -1000 +1000 @@
 
     ! initialisation
-    IF (long_print) WRITE (numout,*) ' enerbil_fusion start ', MINVAL(soilcap), MINLOC(soilcap),&
+   IF (long_print) WRITE (numout,*) ' enerbil_fusion start ', MINVAL(soilcap), MINLOC(soilcap),&
          & MAXVAL(soilcap), MAXLOC(soilcap)
     !

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/sechiba.f90

@@ -639 +639 @@
 !$$ 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
-
+!!$       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(:)
@@ -668 +668 @@
       ENDWHERE
       CALL histwrite(hist_id, 'cropFrac', kjit, histvar, kjpindex, index)
-   
+!!$   
 
 !--------------------------------------------