Changeset 2634 for LMDZ5/trunk/libf/phylmd/aeropt_2bands.F90

Timestamp:

Sep 24, 2016, 7:14:59 PM (8 years ago)

Author:

oboucher

Message:

Quicker way to compute aerosol optical properties.
Does not converge with previous version but results are close.

File:

• LMDZ5/trunk/libf/phylmd/aeropt_2bands.F90 (modified) (14 diffs)

LMDZ5/trunk/libf/phylmd/aeropt_2bands.F90

@@ -12 +12 @@
   USE phys_local_var_mod, only: absvisaer
   USE pres2lev_mod
-
 
   !    Yves Balkanski le 12 avril 2006
@@ -128 +127 @@
   REAL :: zrho
   REAL :: fac
-  REAL :: zdp1(klon,klev) 
-  REAL, PARAMETER ::  gravit = 9.80616    ! m2/s
+  REAL :: zdh(klon,klev) 
   INTEGER, ALLOCATABLE, DIMENSION(:)   :: aerosol_name
   INTEGER :: nb_aer
-  REAL, DIMENSION(klon,klev,naero_tot) :: mass_temp
-!RAF
-  REAL, DIMENSION(klon,klev,naero_tot) :: mass_temp_pi
 
   !
@@ -587 +582 @@
   END IF ! firstcall
 
-
   DO k=1, klev
     DO i=1, klon
-      zrho=pplay(i,k)/t_seri(i,k)/RD                  ! kg/m3
-      mass_temp(i,k,:) = m_allaer(i,k,:) / zrho / 1.e+9
-      mass_temp_pi(i,k,:) = m_allaer_pi(i,k,:) / zrho / 1.e+9
-      zdp1(i,k)=pdel(i,k)/(gravit*delt)      ! air mass auxiliary  variable --> zdp1 [kg/(m^2 *s)]
+      zrho=pplay(i,k)/t_seri(i,k)/RD    ! kg/m3
+      zdh(i,k)=pdel(i,k)/(RG*zrho)      ! m
     ENDDO
   ENDDO
@@ -645 +637 @@
   !      compute optical_thickness_at_gridpoint_per_species
 
-
-
 !CDIR ON_ADB(fact_RH)
 !CDIR SHORTLOOP
@@ -660 +650 @@
       IF (rh(i,k).GT.85.) RH_num(i,k)=10
       IF (rh(i,k).GT.90.) RH_num(i,k)=11
-      
       DELTA(i,k)=(rh(i,k)-RH_tab(RH_num(i,k)))*fact_RH(RH_num(i,k))
     ENDDO
@@ -718 +707 @@
     used_aer(id)=.TRUE.
 
-     
     IF (soluble) THEN
 
@@ -739 +727 @@
 !CDIR ON_ADB(C1_ASSSM_b2)
 !CDIR ON_ADB(C2_ASSSM_b2)
+
               DO i=1, KLON
+
                 H=rh(i,k)/100
-                tmp_var=mass_temp(i,k,spsol)*1000.*zdp1(i,k)*delt*fac
-                tmp_var_pi=mass_temp_pi(i,k,spsol)*1000.*zdp1(i,k)*delt*fac
+                tmp_var=m_allaer(i,k,spsol)/1.e6*zdh(i,k)*fac
+                tmp_var_pi=m_allaer_pi(i,k,spsol)/1.e6*zdh(i,k)*fac
 
                 ! band 1
@@ -784 +774 @@
 !CDIR ON_ADB(C1_CSSSM_b2)
 !CDIR ON_ADB(C2_CSSSM_b2)
+
               DO i=1, KLON
+
                 H=rh(i,k)/100
-                tmp_var=mass_temp(i,k,spsol)*1000.*zdp1(i,k)*delt*fac
-                tmp_var_pi=mass_temp_pi(i,k,spsol)*1000.*zdp1(i,k)*delt*fac
+                tmp_var=m_allaer(i,k,spsol)/1.e6*zdh(i,k)*fac
+                tmp_var_pi=m_allaer_pi(i,k,spsol)/1.e6*zdh(i,k)*fac
                 ! band 1
                 tau_ae2b_int=A1_CSSSM_b1(k)+A2_CSSSM_b1(k)*H+A3_CSSSM_b1(k)/(H-1.05)
@@ -828 +820 @@
 !CDIR ON_ADB(C1_SSSSM_b2)
 !CDIR ON_ADB(C2_SSSSM_b2)
+
               DO i=1, KLON
+
                 H=rh(i,k)/100
-                tmp_var=mass_temp(i,k,spsol)*1000.*zdp1(i,k)*delt*fac
-                tmp_var_pi=mass_temp_pi(i,k,spsol)*1000.*zdp1(i,k)*delt*fac
+                tmp_var=m_allaer(i,k,spsol)/1.e6*zdh(i,k)*fac
+                tmp_var_pi=m_allaer_pi(i,k,spsol)/1.e6*zdh(i,k)*fac
 
                 ! band 1 
@@ -864 +858 @@
           DO k=1, KLEV
             DO i=1, KLON
-              tmp_var=mass_temp(i,k,spsol)*1000.*zdp1(i,k)*delt*fac
-              tmp_var_pi=mass_temp_pi(i,k,spsol)*1000.*zdp1(i,k)*delt*fac
+              tmp_var=m_allaer(i,k,spsol)/1.e6*zdh(i,k)*fac
+              tmp_var_pi=m_allaer_pi(i,k,spsol)/1.e6*zdh(i,k)*fac
 !CDIR UNROLL=nbands
               DO inu=1,nbands
@@ -899 +893 @@
         DO k=1, KLEV
           DO i=1, KLON
-            tmp_var=mass_temp(i,k,naero_soluble+ spinsol)*1000.*zdp1(i,k)*delt*fac
-            tmp_var_pi=mass_temp_pi(i,k,naero_soluble+spinsol)*1000.*zdp1(i,k)*delt*fac
+            tmp_var=m_allaer(i,k,naero_soluble+spinsol)/1.e6*zdh(i,k)*fac
+            tmp_var_pi=m_allaer_pi(i,k,naero_soluble+spinsol)/1.e6*zdh(i,k)*fac
 !CDIR UNROLL=nbands
             DO inu=1,nbands
@@ -931 +925 @@
 
   DO inu=1, nbands
-    DO mrfspecies=1,naero_grp
+
+    !!DO mrfspecies=1,naero_grp
+    DO mrfspecies=2,3    !--only deal with total and natural aerosols
+
       IF (mrfspecies .EQ. 2) THEN             ! = total aerosol AER      
+
         DO k=1, KLEV
           DO i=1, KLON
@@ -1026 +1024 @@
                    
       ELSEIF (mrfspecies .EQ. 4) THEN             ! = BC
+
         DO k=1, KLEV
           DO i=1, KLON
@@ -1128 +1127 @@
   ENDDO
 
-  inu=1         ! visible wavaband
+  inu=1         ! visible waveband
   mrfspecies=2  ! total aerosol AER      
   DO i=1, KLON