Changeset 5536 for LMDZ6/branches/contrails/libf/phylmd/phytrac_mod.f90

Timestamp:

Feb 12, 2025, 10:08:35 AM (3 days ago)

Author:

aborella

Message:

Revert merge with trunk

Location:

LMDZ6/branches/contrails

Files:

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

LMDZ6/branches/contrails/libf/phylmd/phytrac_mod.f90

@@ -35 +35 @@
   REAL,DIMENSION(:,:,:),ALLOCATABLE,SAVE :: d_tr_sat
   REAL,DIMENSION(:,:,:),ALLOCATABLE,SAVE :: d_tr_uscav
-  REAL,DIMENSION(:,:),ALLOCATABLE,SAVE   :: flux_tr_wet    ! tracer wet deposit (surface)                    jyg
-  REAL,DIMENSION(:,:),ALLOCATABLE,SAVE   :: flux_tr_wet_cv ! tracer convective wet deposit (surface)         jyg
+  REAL,DIMENSION(:,:),ALLOCATABLE,SAVE   :: flux_tr_wet ! tracer wet deposit (surface)                    jyg
   REAL,DIMENSION(:,:,:),ALLOCATABLE,SAVE :: qPr,qDi ! concentration tra dans pluie,air descente insaturee
   REAL,DIMENSION(:,:,:),ALLOCATABLE,SAVE :: qPa,qMel
@@ -49 +48 @@
 
 !$OMP THREADPRIVATE(qPa,qMel,qTrdi,dtrcvMA,d_tr_th,d_tr_lessi_impa,d_tr_lessi_nucl)
-!$OMP THREADPRIVATE(d_tr_trsp,d_tr_sscav,d_tr_sat,d_tr_uscav)
-!$OMP THREADPRIVATE(flux_tr_wet,flux_tr_wet_cv,qPr,qDi)
+!$OMP THREADPRIVATE(d_tr_trsp,d_tr_sscav,d_tr_sat,d_tr_uscav,flux_tr_wet,qPr,qDi)
 !$OMP THREADPRIVATE(d_tr_insc,d_tr_bcscav,d_tr_evapls,d_tr_ls,qPrls)
 !$OMP THREADPRIVATE(d_tr_cl,d_tr_dry,flux_tr_dry,d_tr_dec,d_tr_cv)
@@ -71 +69 @@
     ALLOCATE(d_tr_sscav(klon,klev,nbtr),d_tr_sat(klon,klev,nbtr))
     ALLOCATE(d_tr_uscav(klon,klev,nbtr),qPr(klon,klev,nbtr),qDi(klon,klev,nbtr))
-    ALLOCATE(flux_tr_wet(klon,nbtr),flux_tr_wet_cv(klon,nbtr))
+    ALLOCATE(flux_tr_wet(klon,nbtr))
     ALLOCATE(qPa(klon,klev,nbtr),qMel(klon,klev,nbtr))
     ALLOCATE(qTrdi(klon,klev,nbtr),dtrcvMA(klon,klev,nbtr))
@@ -413 +411 @@
           flux_tr_dry(i,it)=0.
           flux_tr_wet(i,it)=0.
-          flux_tr_wet_cv(i,it)=0.
        ENDDO
     ENDDO
@@ -703 +700 @@
                 !--with the full array tr_seri even if only item it is processed
 
-                CALL cvltr_scav(pdtphys, da, phi,phi2,d1a,dam, mp,ep,                 &
-                     sigd,sij,wght_cvfd,clw,elij,epmlmMm,eplaMm,                      &    
-                     pmflxr,pmflxs,evap,t_seri,wdtrainA,wdtrainM,                     &  
-                     paprs,it,tr_seri,upwd,dnwd,itop_con,ibas_con,                    &
-                     ccntrAA_3d,ccntrENV_3d,coefcoli_3d,                              &
-                     d_tr_cv,d_tr_trsp,d_tr_sscav,d_tr_sat,d_tr_uscav,flux_tr_wet_cv, &
-                     qDi,qPr,                                                         &
-                     qPa,qMel,qTrdi,dtrcvMA,Mint,                                     &
+                CALL cvltr_scav(pdtphys, da, phi,phi2,d1a,dam, mp,ep,                &
+                     sigd,sij,wght_cvfd,clw,elij,epmlmMm,eplaMm,                     &     
+                     pmflxr,pmflxs,evap,t_seri,wdtrainA,wdtrainM,                    &   
+                     paprs,it,tr_seri,upwd,dnwd,itop_con,ibas_con,                   &
+                     ccntrAA_3d,ccntrENV_3d,coefcoli_3d,                             &
+                     d_tr_cv,d_tr_trsp,d_tr_sscav,d_tr_sat,d_tr_uscav,flux_tr_wet,   &
+                     qDi,qPr,                                                        &
+                     qPa,qMel,qTrdi,dtrcvMA,Mint,                                    &
                      zmfd1a,zmfphi2,zmfdam)
 
@@ -926 +923 @@
                            beta_v1,pplay,paprs,t_seri,tr_seri,d_tr_insc,d_tr_bcscav,d_tr_evapls,qPrls)
 
-             !total wet deposit = large scale wet deposit + convective wet deposit
-             DO i = 1, klon
-               flux_tr_wet(i, it) = flux_tr_wet_cv(i, it) + &
-                                    qPrls(i, it)*(prfl(i, 1)+psfl(i, 1))*pdtphys
-             ENDDO  ! i = 1, klon
-
              !large scale scavenging tendency
              DO k = 1, klev