Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

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

    r2542 r2594  
    6161!--diagnostics AOD in the SW
    6262! alpha_sw_strat_wave is *not* normalised by the 550 nm extinction coefficient
    63     real, dimension(nwave) :: alpha_sw_strat_wave
     63    real, dimension(nwave_sw) :: alpha_sw_strat_wave
    6464    data alpha_sw_strat_wave/3.708007,4.125824,4.136584,3.887478,3.507738/
    6565!
    66 !--diagnostics AOD in the LW at 10 um
    67     real :: alpha_lw_strat_wave
     66!--diagnostics AOD in the LW at 10 um (not normalised by the 550 nm ext coefficient
     67    real :: alpha_lw_strat_wave(nwave_lw)
    6868    data alpha_lw_strat_wave/0.2746812/
    6969!
     
    171171
    172172!--total vertical aod at the 5 SW wavelengths
    173     DO wave=1, nwave
     173    DO wave=1, nwave_sw
    174174    DO k=1, klev
    175     tausum_aero(:,wave,id_STRAT_phy)=tausum_aero(:,wave,id_STRAT_phy)+ &
    176        tau_aer_strat(:,k)*alpha_sw_strat_wave(wave)/alpha_sw_strat_wave(2)
     175      tausum_aero(:,wave,id_STRAT_phy)=tausum_aero(:,wave,id_STRAT_phy)+ &
     176          tau_aer_strat(:,k)*alpha_sw_strat_wave(wave)/alpha_sw_strat_wave(2)
    177177    ENDDO
    178178    ENDDO
     
    210210    ENDIF
    211211
     212!--total vertical aod at the 1 LW wavelength
     213    DO wave=1, nwave_lw
     214    DO k=1, klev
     215      tausum_aero(:,nwave_sw+wave,id_STRAT_phy)=tausum_aero(:,nwave_sw+wave,id_STRAT_phy)+ &
     216         tau_aer_strat(:,k)*alpha_lw_strat_wave(wave)/alpha_sw_strat_wave(2)
     217    ENDDO
     218    ENDDO
     219
    212220    DO band=1, nbands_lw_rrtm
    213221    tau_aero_lw_rrtm(:,:,2,band)  = tau_aero_lw_rrtm(:,:,2,band) + alpha_lw_abs_rrtm(band)*tau_aer_strat(:,:)
Note: See TracChangeset for help on using the changeset viewer.