Changeset 2171 for LMDZ5/trunk/libf/phylmd/tracinca_mod.F90

Timestamp:

Dec 19, 2014, 4:21:08 PM (10 years ago)

Author:

acozic

Message:

There are some commits that we must not do just before holiday .... so be back to rev 2168

File:

• LMDZ5/trunk/libf/phylmd/tracinca_mod.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/phylmd/tracinca_mod.F90

@@ -35 +35 @@
        tau_aero, piz_aero, cg_aero,        ccm,       &
        rfname,                                        &
-       tr_seri,  source)      
+       tr_seri,  source,   solsym)      
 
 !========================================================
@@ -113 +113 @@
   ! Output arguments
     REAL,DIMENSION(klon,nbtr), INTENT(OUT)        :: source  ! a voir lorsque le flux de surface est prescrit 
+    CHARACTER(len=8),DIMENSION(nbtr), INTENT(OUT) :: solsym
 
 !=======================================================================================
@@ -133 +134 @@
        pdel(:,k) = paprs(:,k) - paprs (:,k+1)
     END DO
-  
+    
+    zpmfu(:,:)=pmfu(:,:)
+
+    IF (config_inca == 'aero') THEN
 #ifdef INCA
-    IF (config_inca == 'aero') THEN 
-       zpmfu(:,:)=pmfu(:,:)       
-    ELSE IF (config_inca == 'aeNP') THEN
+       CALL aerosolmain(                    &
+            aerosol_couple,tr_seri,pdtphys, &
+            pplay,pdel,prfl,pmflxr,psfl,    &
+            pmflxs,zpmfu,itop_con,ibas_con,  &
+            pphi,airephy,nstep,rneb,t_seri, &      
+            rh,tau_aero,piz_aero,cg_aero,   &
+            rfname,ccm,lafin)
+#endif
+    END IF
+
+    IF (config_inca == 'aeNP') THEN
+#ifdef INCA
        zpmfu(:,:)=upwd(:,:)
-    ENDIF
-
-    CALL aerosolmain(                    &
-         aerosol_couple,tr_seri,pdtphys, &
-         pplay,pdel,prfl,pmflxr,psfl,    &
-         pmflxs,zpmfu,itop_con,ibas_con,  &
-         pphi,airephy,nstep,rneb,t_seri, &      
-         rh,tau_aero,piz_aero,cg_aero,   &
-         rfname,ccm,lafin, config_inca)
+       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
 
 
@@ -185 +196 @@
          iip1,       & !nx
          jjp1,       & !ny
-         source )
+         source,     &
+         solsym)
 #endif