Changeset 2594 for LMDZ5/branches/testing/libf/phylmd/rrtm

Timestamp:

Jul 18, 2016, 9:41:10 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2545:2589 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/rrtm/aeropt_5wv_rrtm.F90 (modified) (1 diff)
• libf/phylmd/rrtm/readaerosolstrato1_rrtm.F90 (modified) (3 diffs)
• libf/phylmd/rrtm/readaerosolstrato2_rrtm.F90 (modified) (2 diffs)

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

@@ -70 +70 @@
   ! Local
   !
-  INTEGER, PARAMETER :: las = nwave
+  INTEGER, PARAMETER :: las = nwave_sw
   LOGICAL :: soluble
   

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

@@ -61 +61 @@
 !--diagnostics AOD in the SW
 ! alpha_sw_strat_wave is *not* normalised by the 550 nm extinction coefficient
-    real, dimension(nwave) :: alpha_sw_strat_wave
+    real, dimension(nwave_sw) :: alpha_sw_strat_wave
     data alpha_sw_strat_wave/3.708007,4.125824,4.136584,3.887478,3.507738/
 !
-!--diagnostics AOD in the LW at 10 um 
-    real :: alpha_lw_strat_wave
+!--diagnostics AOD in the LW at 10 um (not normalised by the 550 nm ext coefficient
+    real :: alpha_lw_strat_wave(nwave_lw)
     data alpha_lw_strat_wave/0.2746812/
 !
@@ -171 +171 @@
 
 !--total vertical aod at the 5 SW wavelengths
-    DO wave=1, nwave
+    DO wave=1, nwave_sw
     DO k=1, klev
-    tausum_aero(:,wave,id_STRAT_phy)=tausum_aero(:,wave,id_STRAT_phy)+ &
-       tau_aer_strat(:,k)*alpha_sw_strat_wave(wave)/alpha_sw_strat_wave(2)
+      tausum_aero(:,wave,id_STRAT_phy)=tausum_aero(:,wave,id_STRAT_phy)+ &
+          tau_aer_strat(:,k)*alpha_sw_strat_wave(wave)/alpha_sw_strat_wave(2)
     ENDDO
     ENDDO
@@ -210 +210 @@
     ENDIF 
 
+!--total vertical aod at the 1 LW wavelength
+    DO wave=1, nwave_lw
+    DO k=1, klev
+      tausum_aero(:,nwave_sw+wave,id_STRAT_phy)=tausum_aero(:,nwave_sw+wave,id_STRAT_phy)+ &
+         tau_aer_strat(:,k)*alpha_lw_strat_wave(wave)/alpha_sw_strat_wave(2)
+    ENDDO
+    ENDDO
+
     DO band=1, nbands_lw_rrtm
     tau_aero_lw_rrtm(:,:,2,band)  = tau_aero_lw_rrtm(:,:,2,band) + alpha_lw_abs_rrtm(band)*tau_aer_strat(:,:)

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

@@ -269 +269 @@
 !--total vertical aod at the 5 SW wavelengths
 !--for now use band 3 AOD into all 5 wavelengths
+!--it is only a reasonable approximation for 550 nm (wave=2)
     band=3
     DO i=1, klon
     DO k=1, klev
       IF (stratomask(i,k).GT.0.999999) THEN
-        DO wave=1, nwave
-          tausum_aero(:,wave,id_STRAT_phy)=tausum_aero(:,wave,id_STRAT_phy)+tau_aer_strat(:,k,band)
+        DO wave=1, nwave_sw
+          tausum_aero(i,wave,id_STRAT_phy)=tausum_aero(i,wave,id_STRAT_phy)+tau_aer_strat(i,k,band)
         ENDDO
       ENDIF
@@ -308 +309 @@
     ENDDO
 
+!--total vertical aod at 10 um
+!--this is approximated from band 7 of RRTM
+    band=7
+    DO i=1, klon
+    DO k=1, klev
+      IF (stratomask(i,k).GT.0.999999) THEN
+        DO wave=1, nwave_lw
+          tausum_aero(i,nwave_sw+wave,id_STRAT_phy)=tausum_aero(i,nwave_sw+wave,id_STRAT_phy)+taulw_aer_strat(i,k,band)
+        ENDDO
+      ENDIF
+    ENDDO
+    ENDDO
+
     DO band=1, NLW
     WHERE (stratomask.GT.0.999999)