Changeset 2381 for LMDZ5/branches/LMDZ6_rc0/libf/phylmd/tracinca_mod.F90

Timestamp:

Oct 30, 2015, 2:50:54 PM (9 years ago)

Author:

acozic

Message:

Make some commit to fit with INCA coupling

• merge with rev 2180 on trunk
• merge with rev 2185 on trunk
• merge with rev 2200 on trunk
• change gregorian calendar in wxios

Location:

LMDZ5/branches/LMDZ6_rc0/libf

Files:

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

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

@@ -35 +35 @@
        tau_aero, piz_aero, cg_aero,        ccm,       &
        rfname,                                        &
-       tr_seri,  source,   solsym)      
+       tr_seri,  source)      
 
 !========================================================
@@ -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
 
 !=======================================================================================
@@ -134 +133 @@
        pdel(:,k) = paprs(:,k) - paprs (:,k+1)
     END DO
-    
-    zpmfu(:,:)=pmfu(:,:)
+  
+#ifdef INCA
+    IF (config_inca == 'aero') THEN 
+       zpmfu(:,:)=pmfu(:,:)       
+    ELSE IF (config_inca == 'aeNP') THEN
+       zpmfu(:,:)=upwd(:,:)
+    ENDIF
 
-    IF (config_inca == 'aero') THEN
-#ifdef INCA
-       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)
+    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)
 #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
 
 
@@ -196 +185 @@
          iip1,       & !nx
          jjp1,       & !ny
-         source,     &
-         solsym)
+         source )
 #endif