Changeset 2160 for LMDZ5/branches/testing/libf/phylmd/tracinca_mod.F90

Timestamp:

Nov 28, 2014, 4:36:29 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/tracinca_mod.F90 (modified) (7 diffs)

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

@@ -28 +28 @@
        nstep,    julien,   gmtime,         lafin,     &
        pdtphys,  t_seri,   paprs,          pplay,     &
-       pmfu,     ftsol,    pctsrf,         pphis,     &
+       pmfu,     upwd,     ftsol,  pctsrf, pphis,     &
        pphi,     albsol,   sh,             rh,        &
        cldfra,   rneb,     diafra,         cldliq,    &
@@ -88 +88 @@
 !Convection:
 !----------
-    REAL,DIMENSION(klon,klev),INTENT(IN) :: pmfu  ! flux de masse dans le panache montant
+    REAL,DIMENSION(klon,klev),INTENT(IN) :: pmfu  ! flux de masse dans le panache montant - Tiedtke
+    REAL,DIMENSION(klon,klev),INTENT(IN) :: upwd  ! flux de masse dans le panache montant - Emanuel
 
 !...Tiedke     
@@ -120 +121 @@
     INTEGER :: k
     REAL,DIMENSION(klon,klev) :: pdel
+    REAL,DIMENSION(klon,klev) :: zpmfu  ! flux de masse dans le panache montant
     REAL    :: calday
     INTEGER :: ncsec
@@ -133 +135 @@
     END DO
     
+    zpmfu(:,:)=pmfu(:,:)
+
     IF (config_inca == 'aero') THEN
 #ifdef INCA
@@ -138 +142 @@
             aerosol_couple,tr_seri,pdtphys, &
             pplay,pdel,prfl,pmflxr,psfl,    &
-            pmflxs,pmfu,itop_con,ibas_con,  &
+            pmflxs,zpmfu,itop_con,ibas_con,  &
             pphi,airephy,nstep,rneb,t_seri, &      
             rh,tau_aero,piz_aero,cg_aero,   &
@@ -144 +148 @@
 #endif
     END IF
+
+    IF (config_inca == 'aeNP') THEN
+#ifdef INCA
+       zpmfu(:,:)=upwd(:,:)
+       CALL aerosolmainNP(                  &
+            aerosol_couple,tr_seri,pdtphys, &
+            pplay,pdel,prfl,pmflxr,psfl,    &
+            pmflxs,zpmfu,itop_con,ibas_con,  &
+            pphi,airephy,nstep,rneb,t_seri, &      
+            rh,lafin)
+#endif
+    END IF
+
 
 #ifdef INCA
@@ -172 +189 @@
          psfl,       & !flxsst
          pmflxs,     & !flxscv
-         pmfu,       & !flxupd
+         zpmfu,      & !flxupd   !--now depends on whether AP or NP
          flxmass_w,  & !flxmass_w
          t_seri,     & !tfld