Changeset 719 for LMDZ4/trunk

Timestamp:

Oct 6, 2006, 12:34:58 PM (18 years ago)

Author:

lmdzadmin

Message:

Correction typage ecrit_day, ecrit_mth (*.h) et definition rh2m (physiq.F)
FH/IM

Location:

LMDZ4/trunk/libf/phylmd

Files:

• calcul_divers.h (modified) (3 diffs)
• ini_paramLMDZ_phy.h (modified) (1 diff)
• physiq.F (modified) (11 diffs)
• write_histday.h (modified) (1 diff)
• write_paramLMDZ_phy.h (modified) (1 diff)

LMDZ4/trunk/libf/phylmd/calcul_divers.h

@@ -5 +5 @@
 c initialisations diverses au "debut" du mois
 c
-      IF(MOD(itap,ecrit_mth).EQ.1) THEN
+      IF(MOD(itap,NINT(ecrit_mth/dtime)).EQ.1) THEN
          DO i=1, klon
           nday_rain(i)=0.
@@ -17 +17 @@
        ENDDO
 c
-      ENDIF !MOD(itap,ecrit_mth).EQ.1
+      ENDIF
 c
-      IF(MOD(itap,ecrit_day).EQ.0) THEN
+      IF(MOD(itap,NINT(ecrit_day/dtime)).EQ.0) THEN
 c
 cIM calcul total_rain, nday_rain
@@ -27 +27 @@
         IF(total_rain(i).GT.0.) nday_rain(i)=nday_rain(i)+1.
        ENDDO
-      ENDIF !itap.EQ.ecrit_mth
+      ENDIF

LMDZ4/trunk/libf/phylmd/ini_paramLMDZ_phy.h

@@ -1 +1 @@
 c
        zstophy = dtime
-cIM 030306    zout = dtime * FLOAT(ecrit_day)
        zout = ecrit_day
 c

LMDZ4/trunk/libf/phylmd/physiq.F

@@ -12 +12 @@
 #endif
      .            d_u, d_v, d_t, d_qx, d_ps
-cIM Amip2
      .            , dudyn
      .            , PVteta)
@@ -38 +37 @@
 c   CLEFS CPP POUR LES IO
 c   =====================
+#define histins
 #define histhf
 #define histday
 #define histmth
-#define histins
 #define histmthNMC
 #define histISCCP
@@ -69 +68 @@
 c d_q_dyn-input-R-tendance dynamique pour "q" (kg/kg/s)
 c omega---input-R-vitesse verticale en Pa/s
-cIM comgeomphy.h BEG
 c cuphy----input-R-resolution des mailles en x (m)
 c cvphy----input-R-resolution des mailles en y (m)
-cIM comgeomphy.h END
 c d_u-----output-R-tendance physique de "u" (m/s/s)
 c d_v-----output-R-tendance physique de "v" (m/s/s)
@@ -78 +75 @@
 c d_qx----output-R-tendance physique de "qx" (kg/kg/s)
 c d_ps----output-R-tendance physique de la pression au sol
-cIM
 c PVteta--output-R-vorticite potentielle a des thetas constantes
 c======================================================================
@@ -127 +123 @@
 cIM "slab" ocean
       REAL tslab(klon)    !Temperature du slab-ocean
-cIM      SAVE tslab
       REAL seaice(klon)   !glace de mer (kg/m2) 
-cIM      SAVE seaice
       REAL fluxo(klon)    !flux turbulents ocean-glace de mer 
       REAL fluxg(klon)    !flux turbulents ocean-atmosphere
-cIM
       REAL amn, amx
 c======================================================================
@@ -206 +199 @@
       REAL znivsig(klev)
       REAL zsurf(nbsrf)
-cIM 
       INTEGER kinv
       real pir
-cMI
+
       REAL u(klon,klev)
       REAL v(klon,klev)
@@ -464 +456 @@
       INTEGER iw, iwmax
       REAL wmin, pas_w
-c     PARAMETER(wmin=-100.,pas_w=10.,iwmax=30)
-cIM 051005     PARAMETER(wmin=-200.,pas_w=10.,iwmax=40)
       PARAMETER(wmin=-100.,pas_w=10.,iwmax=20)
       REAL o500(klon)
@@ -473 +463 @@
       INTEGER nreg, nbregdyn
       PARAMETER(nbregdyn=5)
-cIM 051005 BEG
-c     REAL histoW(iwmax,nbregdyn,napisccp)
-c     REAL nhistoW(iwmax,nbregdyn,napisccp)
-c     REAL histoWn(iwmax,nbregdyn)
-c     REAL nhistoWn(iwmax,nbregdyn)
-cIM 090905 END
 
       INTEGER linv
@@ -486 +470 @@
 c sorties ISCCP
 
-c     logical ok_isccp
-c     real ecrit_isccp
       integer nid_isccp
-c     save ok_isccp, ecrit_isccp, nid_isccp        
       save nid_isccp        
-
-#undef histISCCP
-#define histISCCP
-c     data ok_isccp,ecrit_isccp/.true.,0.125/      
-c     data ok_isccp,ecrit_isccp/.true.,1./      
-cIM 190504     data ok_isccp/.true./      
-cIM 190504 #else
-cIM 190504     data ok_isccp/.false./
-cIM 190504 #endif
 
       REAL zx_tau(kmaxm1), zx_pc(lmaxm1), zx_o500(iwmax)
       DATA zx_tau/0.0, 0.3, 1.3, 3.6, 9.4, 23., 60./
-cIM bad 151205     DATA zx_pc/50., 180., 310., 440., 560., 680., 800./
       DATA zx_pc/180., 310., 440., 560., 680., 800., 1000./
 
 c cldtopres pression au sommet des nuages
       REAL cldtopres(lmaxm1), cldtopres3(lmax3)
-cIM 151205 erreur     DATA cldtopres/50., 180., 310., 440., 560., 680., 800./
       DATA cldtopres/180., 310., 440., 560., 680., 800., 1000./
       DATA cldtopres3/440., 680., 1000./
-cIM 051005 BEG
       REAL tmp_his1_3d(iwmax,kmaxm1,lmaxm1,nbregdyn,napisccp) 
       REAL tmp_his2_3d(iwmax,kmaxm1,lmaxm1,nbregdyn,napisccp) 
       REAL tmp_his3_3d(iwmax,kmaxm1,lmaxm1,nbregdyn,napisccp) 
-cIM 051005 END
-
       INTEGER komega, nhoriRD 
 
@@ -594 +561 @@
 c  QUESTION : noms de variables ?
 
-#undef histhf
-#define histhf
 #ifdef histhf
-cIM 130904   data ok_hf,ecrit_hf/.true.,0.25/
       data ok_hf/.true./
 #else
@@ -1615 +1579 @@
 #endif
 
-#undef histmthNMC
-#define histmthNMC
 #ifdef histmthNMC
 #include "ini_histmthNMC.h"

LMDZ4/trunk/libf/phylmd/write_histday.h

@@ -611 +611 @@
 c
       DO i=1, klon
-       zx_tmp_2d(i)=MIN(100.,rh2m(i)*100.)
-      ENDDO
-c
-      CALL gr_fi_ecrit(1,klon,iim,jjmp1, zx_tmp_2d,zx_tmp_2d)
+       zx_tmp_fi2d(i)=MIN(100.,rh2m(i)*100.)
+      ENDDO
+c
+      CALL gr_fi_ecrit(1,klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
       CALL histwrite(nid_day,"rh2m",itau_w,zx_tmp_2d,
      .               iim*jjmp1,ndex2d)

LMDZ4/trunk/libf/phylmd/write_paramLMDZ_phy.h

@@ -301 +301 @@
      .               zx_tmp_2d,iim*jjmp1,ndex2d)
 c
-      zx_tmp_2d(1:iim,1:jjmp1)=FLOAT(ecrit_ins)
+      zx_tmp_2d(1:iim,1:jjmp1)=ecrit_ins
       CALL histwrite(nid_ctesGCM,"ecrit_ins",itau_w,
      .               zx_tmp_2d,iim*jjmp1,ndex2d)
 c
-      zx_tmp_2d(1:iim,1:jjmp1)=FLOAT(ecrit_hf)
+      zx_tmp_2d(1:iim,1:jjmp1)=ecrit_hf
       CALL histwrite(nid_ctesGCM,"ecrit_hf",itau_w,
      .               zx_tmp_2d,iim*jjmp1,ndex2d)
 c
-      zx_tmp_2d(1:iim,1:jjmp1)=FLOAT(ecrit_day)
+      zx_tmp_2d(1:iim,1:jjmp1)=ecrit_day
       CALL histwrite(nid_ctesGCM,"ecrit_day",itau_w,
      .               zx_tmp_2d,iim*jjmp1,ndex2d)
 c
-      zx_tmp_2d(1:iim,1:jjmp1)=FLOAT(ecrit_mth)
+      zx_tmp_2d(1:iim,1:jjmp1)=ecrit_mth
       CALL histwrite(nid_ctesGCM,"ecrit_mth",itau_w,
      .               zx_tmp_2d,iim*jjmp1,ndex2d)
 c
-      zx_tmp_2d(1:iim,1:jjmp1)=FLOAT(ecrit_tra)
+      zx_tmp_2d(1:iim,1:jjmp1)=ecrit_tra
       CALL histwrite(nid_ctesGCM,"ecrit_tra",itau_w,
      .               zx_tmp_2d,iim*jjmp1,ndex2d)
 c
-      zx_tmp_2d(1:iim,1:jjmp1)=FLOAT(ecrit_reg)
+      zx_tmp_2d(1:iim,1:jjmp1)=ecrit_reg
       CALL histwrite(nid_ctesGCM,"ecrit_reg",itau_w,
      .               zx_tmp_2d,iim*jjmp1,ndex2d)