Changeset 625 for LMDZ4/trunk/libf/phylmd/physiq.F

Timestamp:

Apr 29, 2005, 10:06:07 AM (19 years ago)

Author:

lmdzadmin

Message:

Rajout cles CPP + changement argument pour INCA - Anne Cozic
MAF

File:

• LMDZ4/trunk/libf/phylmd/physiq.F (modified) (5 diffs)

LMDZ4/trunk/libf/phylmd/physiq.F

@@ -2384 +2384 @@
 #ifdef INCA_AER
       call AEROSOL_METEO_CALC(calday,pdtphys,pplay,paprs,t,pmflxr,pmflxs,
-     &   prfl,psfl,pctsrf,airephy,xjour,rlat,rlon)
+     &   prfl,psfl,pctsrf(1,3),airephy,xjour,rlat,rlon)
 #endif
 
@@ -2390 +2390 @@
            WRITE(lunout,*)'Appel CHEMHOOK_BEGIN ...'
 #endif
+
            CALL chemhook_begin (calday,
      $                          pctsrf(1,1),
@@ -2428 +2429 @@
 #endif        
 
+
 #ifdef INCAINFO
            WRITE(lunout,*)'OK.'
@@ -2630 +2632 @@
 c====================================================================
 C
-      call phytrac (iflag_con,rnpb,
-     I                   itap, julien, gmtime,
-     I                   debut,lafin,
+      call phytrac (iflag_con,
+     I                   rnpb,
+     I                   itap, 
+     I                   julien, 
+     I                   gmtime,
+     I                   debut,
+     I                   lafin,
      I                   nqmax-2,
-     I                   nlon,nlev,dtime,
-     I                   u,v,t,paprs,pplay,
-     I                   pmfu, pmfd, pen_u, pde_u, pen_d, pde_d,
-     I                   ycoefh,fm_therm,entr_therm,yu1,yv1,ftsol,
-     I                   pctsrf,rlat,frac_impa, frac_nucl,
-     I                   rlon,presnivs,pphis,pphi,
+     I                   nlon,
+     I                   nlev,
+     I                   dtime,
+     I                   u,
+     I                   v,
+     I                   t,
+     I                   paprs,
+     I                   pplay,
+     I                   pmfu, 
+     I                   pmfd, 
+     I                   pen_u, 
+     I                   pde_u, 
+     I                   pen_d, 
+     I                   pde_d,
+     I                   ycoefh,
+     I                   fm_therm,
+     I                   entr_therm,
+     I                   yu1,
+     I                   yv1,
+     I                   ftsol,
+     I                   pctsrf,
+     I                   rlat,
+     I                   frac_impa, 
+     I                   frac_nucl,
+     I                   rlon,
+     I                   presnivs,
+     I                   pphis,
+     I                   pphi,
      I                   albsol,
-     I                   qx(1,1,1), rhcl,
-     I                   cldfra, rneb, diafra, cldliq, itop_con,
+     I                   qx(1,1,1), 
+     I                   rhcl,
+     I                   cldfra, 
+     I                   rneb, 
+     I                   diafra, 
+     I                   cldliq, 
+     I                   itop_con,
      I                   ibas_con,
-     I                   pmflxr,pmflxs,prfl,psfl,
-     I                   da,phi,mp,
-     I                   upwd,dnwd,
-#ifdef INCA_CH4
+     I                   pmflxr,
+     I                   pmflxs,
+     I                   prfl,
+     I                   psfl,
+     I                   da,
+     I                   phi,
+     I                   mp,
+     I                   upwd,
+     I                   dnwd,
+#ifdef INCA
      I                   flxmass_w,
 #endif
@@ -2889 +2928 @@
      $                        nbtr,
      $                        paprs,
+#ifdef INCA_CH4
      $                        q_seri,
+#endif
      $                        annee_ref,
      $                        day_ini,
+#ifdef INCA_AER
+     $                        xjour,
+     $                        pphi,
+     $                        pphis,
+     $                        zx_rh,
+     $                        qx(1,1,1))
+#else
      $                        xjour)
+#endif
 #ifdef INCAINFO
            WRITE(lunout,*)'OK.'