Ignore:
Timestamp:
Dec 14, 2015, 11:43:09 AM (9 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2298:2396 into testing branch

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/branches/testing

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

    r2187 r2408  
    288288  ! Calculate the total mass of all soluble aersosols
    289289  ! to be revisited for AR6
    290   mass_solu_aero(:,:)    = sulfacc(:,:)    + bcsol(:,:)    + pomsol(:,:)   + nitracc(:,:)   ! + &
    291   !                           sscoarse(:,:)    + ssacu(:,:)    + sssupco(:,:)
    292   mass_solu_aero_pi(:,:) = sulfacc_pi(:,:) + bcsol_pi(:,:) + pomsol_pi(:,:) + nitracc_pi(:,:) ! + &
    293   !                           sscoarse_pi(:,:) + ssacu_pi(:,:) + sssupco_pi(:,:)
     290  mass_solu_aero(:,:)    = sulfacc(:,:)    + bcsol(:,:)    + pomsol(:,:)   + nitracc(:,:) + ssacu(:,:)
     291  mass_solu_aero_pi(:,:) = sulfacc_pi(:,:) + bcsol_pi(:,:) + pomsol_pi(:,:) + nitracc_pi(:,:) + ssacu_pi(:,:)
    294292
    295293  !****************************************************************************************
    … …  
    303301  END DO
    304302
     303!--new aerosol properties
    305304  ! aeropt_6bands for rrtm
    306305  CALL aeropt_6bands_rrtm( &
Note: See TracChangeset for help on using the changeset viewer.