Changeset 2220 for LMDZ5/branches/testing/libf/phylmd/phytrac_mod.F90

Timestamp:

Mar 3, 2015, 2:41:13 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2186:2216 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/phytrac_mod.F90 (modified) (6 diffs)

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

@@ -310 +310 @@
     !RomP >>>
     INTEGER,SAVE  :: iflag_lscav_omp,iflag_lscav
+    REAL, SAVE ::   ccntrAA_in,ccntrAA_omp
+    REAL, SAVE ::   ccntrENV_in,ccntrENV_omp
+    REAL, SAVE ::   coefcoli_in,coefcoli_omp
+
     LOGICAL,SAVE  :: convscav_omp,convscav
 !$OMP THREADPRIVATE(iflag_lscav)
+!$OMP THREADPRIVATE(ccntrAA_in,ccntrENV_in,coefcoli_in)
 !$OMP THREADPRIVATE(convscav)
     !RomP <<<
@@ -412 +417 @@
        iflag_lscav_omp=1
        call getin('iflag_lscav', iflag_lscav_omp)
+       ccntrAA_omp=1
+       ccntrENV_omp=1.
+       coefcoli_omp=0.001
+       call getin('ccntrAA', ccntrAA_omp)
+       call getin('ccntrENV', ccntrENV_omp)
+       call getin('coefcoli', coefcoli_omp)
 !$OMP END MASTER
 !$OMP BARRIER
        iflag_lscav=iflag_lscav_omp
+       ccntrAA_in=ccntrAA_omp
+       ccntrENV_in=ccntrENV_omp
+       coefcoli_in=coefcoli_omp
        !
        SELECT CASE(iflag_lscav)
@@ -463 +477 @@
                 IF (convscav.and.aerosol(it)) THEN
                    flag_cvltr(it)=.true.
-                   ccntrAA(it) =1.0         !--a modifier par JYG a lire depuis fichier 
-                   ccntrENV(it)=1.0 
-                   coefcoli(it)=0.001
+                   ccntrAA(it) =ccntrAA_in    !--a modifier par JYG a lire depuis fichier 
+                   ccntrENV(it)=ccntrENV_in
+                   coefcoli(it)=coefcoli_in
                 ELSE 
                    flag_cvltr(it)=.false.
@@ -613 +627 @@
                 !--with the full array tr_seri even if only item it is processed
 
+                print*,'CV SCAV ',it,ccntrAA(it),ccntrENV(it)
+
                 CALL cvltr_scav(pdtphys, da, phi,phi2,d1a,dam, mp,ep,         &
                      sigd,sij,wght_cvfd,clw,elij,epmlmMm,eplaMm,              &     
@@ -747 +763 @@
           !
           DO it = 1, nbtr
+
+             IF (aerosol(it)) THEN
              !  incloud scavenging and removal by large scale rain ! orig : ql_incl was replaced by 0.5e-3 kg/kg
              ! the value 0.5e-3 kg/kg is from Giorgi and Chameides (1986), JGR
@@ -763 +781 @@
              ENDDO
              CALL minmaxqfi(tr_seri(:,:,it),0.,1.e33,'lsc scav it = '//solsym(it))
+             ENDIF
+
           END DO  !tr