Changeset 8423 for branches/ORCHIDEE_2_2/ORCHIDEE/src_stomate/stomate_io.f90

Timestamp:

2024-02-13T13:45:31+01:00 (5 months ago)

Author:

josefine.ghattas

Message:

Revert commit [8418] because it has problems with restartability.

File:

• branches/ORCHIDEE_2_2/ORCHIDEE/src_stomate/stomate_io.f90 (modified) (6 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/src_stomate/stomate_io.f90

@@ -440 +440 @@
          &              .TRUE., litterhum_daily, 'gather', nbp_glo, index_g)
     IF (ALL(litterhum_daily(:) == val_exp)) litterhum_daily(:) = zero
-
     !-
     t2m_daily(:) = val_exp
@@ -472 +471 @@
          &                .TRUE., soilhum_daily, 'gather', nbp_glo, index_g)
     IF (ALL(soilhum_daily(:,:) == val_exp)) soilhum_daily(:,:) = zero
-
     !-
     precip_daily(:) = val_exp
@@ -606 +604 @@
          &              .TRUE., soilhum_month, 'gather', nbp_glo, index_g)
     IF (ALL(soilhum_month(:,:) == val_exp)) soilhum_month(:,:) = zero
-
-
     !-
     ! 6 fire probability
@@ -997 +993 @@
              CALL restget_p (rest_id_stomate, var_name, nbp_glo, nlitt , 1, itime, &
                   &                     .TRUE., litter(:,:,m,l,k), 'gather', nbp_glo, index_g)
-             IF (ok_moyano_soilhumsat)THEN
-               IF (ALL(litter(:,:,m,l,k) == val_exp)) litter(:,:,m,l,k) = Litterini_Moyano
-             ELSE
-               IF (ALL(litter(:,:,m,l,k) == val_exp)) litter(:,:,m,l,k) = zero
-             ENDIF
+             IF (ALL(litter(:,:,m,l,k) == val_exp)) litter(:,:,m,l,k) = zero
           ENDDO
        ENDDO
@@ -1021 +1013 @@
        CALL restget_p (rest_id_stomate, var_name, nbp_glo, ncarb , 1, itime, &
             &                   .TRUE., carbon(:,:,m), 'gather', nbp_glo, index_g)
-       IF (ok_moyano_soilhumsat)THEN 
-          IF (ALL(carbon(:,:,m) == val_exp)) carbon(:,:,m) = Cini_Moyano
-       ELSE
-          IF (ALL(carbon(:,:,m) == val_exp)) carbon(:,:,m) = zero
-       ENDIF
+       IF (ALL(carbon(:,:,m) == val_exp)) carbon(:,:,m) = zero
     ENDDO
     !-
@@ -1701 +1689 @@
     var_name = 't2m_daily'
     CALL restput_p (rest_id_stomate, var_name, nbp_glo,    1, 1, itime, &
-                    &                t2m_daily, 'scatter', nbp_glo, index_g)
+         &                t2m_daily, 'scatter', nbp_glo, index_g)
     !-
     var_name = 't2m_min_daily'
     CALL restput_p (rest_id_stomate, var_name, nbp_glo,    1, 1, itime, &
-                    &                t2m_min_daily, 'scatter', nbp_glo, index_g)
+         &                t2m_min_daily, 'scatter', nbp_glo, index_g)
     !-
     var_name = 'tsurf_daily'
     CALL restput_p (rest_id_stomate, var_name, nbp_glo,    1, 1, itime, &
-                    &                tsurf_daily, 'scatter', nbp_glo, index_g)
+         &                tsurf_daily, 'scatter', nbp_glo, index_g)
     !-
     var_name = 'tsoil_daily'
     CALL restput_p (rest_id_stomate, var_name, nbp_glo, nslm, 1, itime, &
-                    &                tsoil_daily, 'scatter', nbp_glo, index_g)
+         &                tsoil_daily, 'scatter', nbp_glo, index_g)
     !-
     var_name = 'soilhum_daily'