Changeset 1921 for LMDZ5/branches/testing/libf/phylmd/physiq.F90

Timestamp:

Dec 20, 2013, 10:04:40 AM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1909:1920 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/physiq.F90 (modified) (9 diffs)

LMDZ5/branches/testing/libf/phylmd/physiq.F90

@@ -493 +493 @@
   REAL un_jour
   PARAMETER(un_jour=86400.)
+  INTEGER itapm1 !pas de temps de la physique du(es) mois precedents
+  SAVE itapm1    !mis a jour le dernier pas de temps du mois en cours
+  !$OMP THREADPRIVATE(itapm1)
   !======================================================================
   !
@@ -1254 +1257 @@
      !$OMP BARRIER
 
+    freq_outNMC(1) = ecrit_files(7)
+    freq_outNMC(2) = ecrit_files(8)
+    freq_outNMC(3) = ecrit_files(9)
+    WRITE(lunout,*)'OK freq_outNMC(1)=',freq_outNMC(1)
+    WRITE(lunout,*)'OK freq_outNMC(2)=',freq_outNMC(2)
+    WRITE(lunout,*)'OK freq_outNMC(3)=',freq_outNMC(3)
 
      include "ini_histday_seri.h"
@@ -1730 +1739 @@
           zxtsol,    zxfluxlat, zt2m,    qsat2m,  &
           d_t_vdf,   d_q_vdf,   d_u_vdf, d_v_vdf, d_t_diss, &
-          coefh,     coefm,     slab_wfbils,                 &
+          coefh(1:klon,1:klev,1:nbsrf+1),     coefm(1:klon,1:klev,1:nbsrf+1), &
+          slab_wfbils,                 &
           qsol,      zq2m,      s_pblh,  s_lcl, &
           s_capCL,   s_oliqCL,  s_cteiCL,s_pblT, &
@@ -2809 +2819 @@
           paprs, &
           pplay, &
-          coefh(:,:,is_ave), &
+          coefh(1:klon,1:klev,is_ave), &
           pphi, &
           t_seri, &
@@ -3340 +3350 @@
        paprs,    pplay,     pmfu,     pmfd, &
        pen_u,    pde_u,     pen_d,    pde_d, &
-       cdragh,   coefh(:,:,is_ave),   fm_therm, entr_therm, &
+       cdragh,   coefh(1:klon,1:klev,is_ave),   fm_therm, entr_therm, &
        u1,       v1,        ftsol,    pctsrf, &
        zustar,   zu10m,     zv10m, &
@@ -3368 +3378 @@
           t,pmfu, pmfd, pen_u, pde_u, pen_d, pde_d, &
           fm_therm,entr_therm, &
-          cdragh,coefh(:,:,is_ave),u1,v1,ftsol,pctsrf, &
+          cdragh,coefh(1:klon,1:klev,is_ave),u1,v1,ftsol,pctsrf, &
           frac_impa, frac_nucl, &
           pphis,airephy,dtime,itap, &
@@ -3431 +3441 @@
   !   SORTIES
   !=======================================================================
-
+  !
+  !IM initialisation + calculs divers diag AMIP2
+  !
+  include "calcul_divers.h"
+  !
   !IM Interpolation sur les niveaux de pression du NMC
   !   -------------------------------------------------
@@ -3448 +3462 @@
      ENDDO
   ENDDO
-  !
-  !IM initialisation + calculs divers diag AMIP2
-  !
-  include "calcul_divers.h"
   !
   IF (type_trac == 'inca') THEN
@@ -3649 +3659 @@
        pplay, lmax_th, aerosol_couple,                 &
        ok_ade, ok_aie, ivap, new_aod, ok_sync,         &
-       ptconv, read_climoz, clevSTD, freq_moyNMC,      &
+       ptconv, read_climoz, clevSTD,                   &
        ptconvth, d_t, qx, d_qx, zmasse,                &
        flag_aerosol_strat)