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/readaerosolstrato2_rrtm.F90

    r2542 r2594  
    269269!--total vertical aod at the 5 SW wavelengths
    270270!--for now use band 3 AOD into all 5 wavelengths
     271!--it is only a reasonable approximation for 550 nm (wave=2)
    271272    band=3
    272273    DO i=1, klon
    273274    DO k=1, klev
    274275      IF (stratomask(i,k).GT.0.999999) THEN
    275         DO wave=1, nwave
    276           tausum_aero(:,wave,id_STRAT_phy)=tausum_aero(:,wave,id_STRAT_phy)+tau_aer_strat(:,k,band)
     276        DO wave=1, nwave_sw
     277          tausum_aero(i,wave,id_STRAT_phy)=tausum_aero(i,wave,id_STRAT_phy)+tau_aer_strat(i,k,band)
    277278        ENDDO
    278279      ENDIF
     
    308309    ENDDO
    309310
     311!--total vertical aod at 10 um
     312!--this is approximated from band 7 of RRTM
     313    band=7
     314    DO i=1, klon
     315    DO k=1, klev
     316      IF (stratomask(i,k).GT.0.999999) THEN
     317        DO wave=1, nwave_lw
     318          tausum_aero(i,nwave_sw+wave,id_STRAT_phy)=tausum_aero(i,nwave_sw+wave,id_STRAT_phy)+taulw_aer_strat(i,k,band)
     319        ENDDO
     320      ENDIF
     321    ENDDO
     322    ENDDO
     323
    310324    DO band=1, NLW
    311325    WHERE (stratomask.GT.0.999999)
Note: See TracChangeset for help on using the changeset viewer.