Changeset 2839 for LMDZ5/branches/testing/libf/phylmd/rrtm/aeropt_5wv_rrtm.F90

Timestamp:

Mar 30, 2017, 4:16:38 PM (7 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2785:2838 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/rrtm/aeropt_5wv_rrtm.F90 (modified) (5 diffs)

LMDZ5/branches/testing/libf/phylmd/rrtm/aeropt_5wv_rrtm.F90

@@ -12 +12 @@
   USE DIMPHY
   USE aero_mod
-  USE phys_local_var_mod, ONLY: od550aer,od865aer,ec550aer,od550lt1aer
+  USE phys_local_var_mod, ONLY: od443aer,od550aer,od865aer,ec550aer,od550lt1aer
   USE YOMCST, ONLY: RD,RG
 
@@ -327 +327 @@
         soluble=.TRUE.
         spsol=4
-        fac=1.375    ! (NH4)2-SO4/SO4 132/96 mass conversion factor for AOD
+        !fac=1.375    ! (NH4)2-SO4/SO4 132/96 mass conversion factor for AOD
+        fac=0.0      !--6 March 2017 - OB as Didier H said CSSO4 should not be used
     ELSEIF (aerosol_name(m).EQ.id_SSSSM_phy) THEN 
         soluble=.TRUE.
@@ -366 +367 @@
     DO la=1,las
 
-    !--only 550, 670 and 865 nm are used
-    IF (la.NE.la550.AND.la.NE.la670.AND.la.NE.la865) CYCLE
+    !--only 443, 550, 670 and 865 nm are used
+    !--to save time 670 and AI are not computed for CMIP6
+    !IF (la.NE.la443.AND.la.NE.la550.AND.la.NE.la670.AND.la.NE.la865) CYCLE
+    IF (la.NE.la443.AND.la.NE.la550.AND.la.NE.la865) CYCLE
 
       IF (soluble) THEN            ! For soluble aerosol
@@ -433 +436 @@
 
 !--AOD calculations for diagnostics
+  od443aer(:)=SUM(tausum(:,la443,:),dim=2)
   od550aer(:)=SUM(tausum(:,la550,:),dim=2)
-  od670aer(:)=SUM(tausum(:,la670,:),dim=2)
+  !od670aer(:)=SUM(tausum(:,la670,:),dim=2)
   od865aer(:)=SUM(tausum(:,la865,:),dim=2)
 
@@ -441 +445 @@
 
 !--aerosol index
-  ai(:)=-LOG(MAX(od670aer(:),1.e-8)/MAX(od865aer(:),1.e-8))/LOG(670./865.)
+  ai(:)=0.0
+  !ai(:)=-LOG(MAX(od670aer(:),1.e-8)/MAX(od865aer(:),1.e-8))/LOG(670./865.)
 
   od550lt1aer(:)=tausum(:,la550,id_ASSO4M_phy)+tausum(:,la550,id_ASBCM_phy) +tausum(:,la550,id_AIBCM_phy)+ &