Changeset 326 for branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/intersurf.f90

Timestamp:

2011-07-18T11:42:45+02:00 (13 years ago)

Author:

didier.solyga

Message:

Synchronize intersurf.f90 and slowproc.f90 with the revisions 314 and 317 of the trunk

File:

• branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/intersurf.f90 (modified) (5 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/intersurf.f90

@@ -2902 +2902 @@
     control_flags%ok_dgvm = .FALSE.
     CALL getin_p('STOMATE_OK_DGVM',control_flags%ok_dgvm)
-
-    IF ( control_flags%ok_dgvm ) THEN
-       WRITE(numout,*) 'You try to use LPJ ',control_flags%ok_dgvm, &
-            ' with this version. '
-       WRITE(numout,*) 'It is not possible because it has to be modified ', &
-            ' to give correct values.'
-       CALL ipslerr (2,'intsurf_config', &
-         &          'Use of STOMATE_OK_DGVM is not stable for this version.',&
-         &          'ORCHIDEE should not give correct results with this option activated.', &
-         &          'Please disable DGVM to use this version of ORCHIDEE.')
-    ENDIF
-    !
-!!$    DS : reading of parameters associated to ok_dgvm
-    IF ( control_flags%ok_dgvm ) THEN
-       CALL getin_dgvm_parameters
-    ENDIF    
 
     !
@@ -4586 +4570 @@
             & 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, control_flags)
-! deforestation axis added as arguments
+            & hist_pool_11axis_id, hist_pool_101axis_id)
 
        !- end definition
@@ -4683 +4666 @@
        &  hist_dt, hist_hori_id, hist_PFTaxis_id, &
        & hist_pool_10axis_id, hist_pool_100axis_id, &
-       & hist_pool_11axis_id, hist_pool_101axis_id, control_flags)
+       & hist_pool_11axis_id, hist_pool_101axis_id)
     ! deforestation axis added as arguments
 
@@ -4711 +4694 @@
     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
@@ -4941 +4922 @@
          &               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
+    ! 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)
 
     ! crown area of individuals (m**2)