Changeset 723 for LMDZ4/branches/LMDZ4_V2_patch/libf/phylmd/moy_undefSTD.F

Timestamp:

Oct 6, 2006, 1:06:22 PM (18 years ago)

Author:

lmdzadmin

Message:

On passe a des ecrit_ins, ecrit_day, etc en nombre de jours (REAL)
On lit frequence ecriture traceurs ecrit_trac dans physiq.def
Correction petits pbs ini_histrac.h
IM

File:

• LMDZ4/branches/LMDZ4_V2_patch/libf/phylmd/moy_undefSTD.F (modified) (4 diffs)

LMDZ4/branches/LMDZ4_V2_patch/libf/phylmd/moy_undefSTD.F

@@ -1 +1 @@
       SUBROUTINE moy_undefSTD(nlevSTD,itap,
-     $           ecrit_day,ecrit_mth,ecrit_hf2mth,
+     $           dtime,ecrit_day,ecrit_mth,ecrit_hf2mth,
      $           tnondef,tsumSTD)
       IMPLICIT none
@@ -28 +28 @@
       INTEGER nlevSTD, klevSTD, itap
       PARAMETER(klevSTD=17)
-      INTEGER ecrit_day, ecrit_mth, ecrit_hf2mth
+      REAL dtime, ecrit_day, ecrit_mth, ecrit_hf2mth
 c
 c variables locales
@@ -40 +40 @@
 c calcul 1 fois par jour
 c
-      IF(MOD(itap,ecrit_day).EQ.0) THEN
+      IF(MOD(itap,NINT(ecrit_day/dtime)).EQ.0) THEN
        DO k=1, nlevSTD
         DO i=1, klon
-         IF(tnondef(i,k,1).NE.FLOAT(ecrit_day)) THEN
+         IF(tnondef(i,k,1).NE.(ecrit_day/dtime)) THEN
           tsumSTD(i,k,1)=tsumSTD(i,k,1)/
-     $    (FLOAT(ecrit_day)-tnondef(i,k,1))
+     $    (ecrit_day/dtime-tnondef(i,k,1))
          ELSE
           tsumSTD(i,k,1)=1.E+20
@@ -55 +55 @@
 c calcul 1 fois par mois
 c
-      IF(MOD(itap,ecrit_mth).EQ.0) THEN
+      IF(MOD(itap,NINT(ecrit_mth/dtime)).EQ.0) THEN
        DO k=1, nlevSTD
         DO i=1, klon
-         IF(tnondef(i,k,2).NE.FLOAT(ecrit_mth)) THEN
+         IF(tnondef(i,k,2).NE.ecrit_mth/dtime) THEN
           tsumSTD(i,k,2)=tsumSTD(i,k,2)/
-     $    (FLOAT(ecrit_mth)-tnondef(i,k,2))
+     $    (ecrit_mth/dtime-tnondef(i,k,2))
          ELSE
           tsumSTD(i,k,2)=1.E+20
          ENDIF !tnondef
 c
-         IF(tnondef(i,k,3).NE.FLOAT(ecrit_hf2mth)) THEN
+         IF(tnondef(i,k,3).NE.NINT(ecrit_hf2mth)) THEN
           tsumSTD(i,k,3)=tsumSTD(i,k,3)/
-     $    (FLOAT(ecrit_hf2mth)-tnondef(i,k,3))
+     $    (ecrit_hf2mth-tnondef(i,k,3))
          ELSE
           tsumSTD(i,k,3)=1.E+20