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

Timestamp:

Jan 30, 2017, 5:54:45 PM (7 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2727:2785 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -66 +66 @@
        frac_impa,frac_nucl,beta_fisrt,beta_v1,        &
        presnivs,  pphis,    pphi,     albsol,         &
-       sh,        rh,       cldfra,   rneb,           &
+       sh,        ch, rh,   cldfra,   rneb,           &
        diafra,    cldliq,   itop_con, ibas_con,       &
        pmflxr,    pmflxs,   prfl,     psfl,           &
@@ -103 +103 @@
 #ifdef CPP_StratAer
     USE traccoag_mod
-    USE phys_local_var_mod, ONLY: mdw, sulf_dep_dry, sulf_dep_wet
+    USE phys_local_var_mod, ONLY: mdw
+    USE phys_local_var_mod, ONLY: budg_dep_dry_h2so4, budg_dep_wet_h2so4
+    USE phys_local_var_mod, ONLY: budg_dep_dry_part,  budg_dep_wet_part
     USE infotrac, ONLY: nbtr_sulgas, id_SO2_strat, id_H2SO4_strat
     USE aerophys
@@ -137 +139 @@
     REAL,DIMENSION(klon,klev),INTENT(IN)   :: sh      ! humidite specifique
     REAL,DIMENSION(klon,klev),INTENT(IN)   :: rh      ! humidite relative
+    REAL,DIMENSION(klon,klev),INTENT(IN)   :: ch      ! eau liquide
     REAL,DIMENSION(klon,klev+1),INTENT(IN) :: paprs   ! pression pour chaque inter-couche (en Pa)
     REAL,DIMENSION(klon,klev),INTENT(IN)   :: pplay   ! pression pour le mileu de chaque couche (en Pa)
@@ -571 +574 @@
        write(lunout,*)  'flag_cvltr    = ', flag_cvltr
 
-       IF (lessivage.AND.config_inca.EQ.'inca') THEN
+       IF (lessivage .AND. type_trac .EQ. 'inca') THEN
           CALL abort_physic('phytrac', 'lessivage=T config_inca=inca impossible',1)
           STOP
@@ -698 +701 @@
        IF (type_trac=='coag') THEN
          ! initialize wet deposition flux of sulfur
-         sulf_dep_wet(:)=0.0
+         budg_dep_wet_h2so4(:)=0.0
+         budg_dep_wet_part(:)=0.0
          ! compute wet deposition flux of sulfur (sum over gases and particles)
          ! and convert to kg(S)/m2/s
@@ -706 +710 @@
          !do not include SO2 because most of it comes trom the troposphere
            IF (it==id_H2SO4_strat) THEN
-             sulf_dep_wet(i)=sulf_dep_wet(i)+d_tr_cv(i,k,it)*(mSatom/mH2SO4mol) &
+             budg_dep_wet_h2so4(i)=budg_dep_wet_h2so4(i)+d_tr_cv(i,k,it)*(mSatom/mH2SO4mol) &
                             & *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
            ELSEIF (it.GT.nbtr_sulgas) THEN
-             sulf_dep_wet(i)=sulf_dep_wet(i)+d_tr_cv(i,k,it)*(mSatom/mH2SO4mol)  &
+             budg_dep_wet_part(i)=budg_dep_wet_part(i)+d_tr_cv(i,k,it)*(mSatom/mH2SO4mol)  &
                             & *dens_aer_dry*4./3.*RPI*(mdw(it-nbtr_sulgas)/2.)**3 &
                             & *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
@@ -766 +770 @@
 
          ! initialize dry deposition flux of sulfur
-         sulf_dep_dry(:)=0.0
+         budg_dep_dry_h2so4(:)=0.0
+         budg_dep_dry_part(:)=0.0
 
          ! compute dry deposition velocity as function of surface type (numbers
@@ -800 +805 @@
                ! compute dry deposition flux of sulfur (sum over gases and particles)
                IF (it==id_H2SO4_strat) THEN
-                 sulf_dep_dry(:)=sulf_dep_dry(:)-source(:,it)*(mSatom/mH2SO4mol)
+                 budg_dep_dry_h2so4(:)=budg_dep_dry_h2so4(:)-source(:,it)*(mSatom/mH2SO4mol)
                ELSEIF (it.GT.nbtr_sulgas) THEN
-                 sulf_dep_dry(:)=sulf_dep_dry(:)-source(:,it)*(mSatom/mH2SO4mol)*dens_aer_dry &
+                 budg_dep_dry_part(:)=budg_dep_dry_part(:)-source(:,it)*(mSatom/mH2SO4mol)*dens_aer_dry &
                                 & *4./3.*RPI*(mdw(it-nbtr_sulgas)/2.)**3
                ENDIF
@@ -886 +891 @@
            DO it = 1, nbtr
              IF (it==id_H2SO4_strat) THEN
-               sulf_dep_wet(i)=sulf_dep_wet(i)+d_tr_ls(i,k,it)*(mSatom/mH2SO4mol) &
+               budg_dep_wet_h2so4(i)=budg_dep_wet_h2so4(i)+d_tr_ls(i,k,it)*(mSatom/mH2SO4mol) &
                               & *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
              ELSEIF (it.GT.nbtr_sulgas) THEN
-               sulf_dep_wet(i)=sulf_dep_wet(i)+d_tr_ls(i,k,it)*(mSatom/mH2SO4mol)  &
+               budg_dep_wet_part(i)=budg_dep_wet_part(i)+d_tr_ls(i,k,it)*(mSatom/mH2SO4mol)  &
                               & *dens_aer_dry*4./3.*RPI*(mdw(it-nbtr_sulgas)/2.)**3 &
                               & *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
@@ -1018 +1023 @@
             pdtphys,  t_seri,   paprs,          pplay,     &
             pmfu,     upwd,     ftsol,  pctsrf, pphis,     &
-            pphi,     albsol,   sh,             rh,        &
+            pphi,     albsol,   sh,    ch,     rh,        &
             cldfra,   rneb,     diafra,         cldliq,    &
             itop_con, ibas_con, pmflxr,         pmflxs,    &