Ignore:
Timestamp:
Nov 28, 2014, 4:36:29 PM (10 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/phylmd/aeropt_2bands.F90

    r2056 r2160  
    2929  REAL, DIMENSION(klon,klev),     INTENT(in)  :: pdel
    3030  REAL,                           INTENT(in)  :: delt
    31   REAL, DIMENSION(klon,klev,naero_spc),   INTENT(in)  :: m_allaer
     31  REAL, DIMENSION(klon,klev,naero_tot),   INTENT(in)  :: m_allaer
    3232!RAF
    33   REAL, DIMENSION(klon,klev,naero_spc),   INTENT(in)  :: m_allaer_pi
     33  REAL, DIMENSION(klon,klev,naero_tot),   INTENT(in)  :: m_allaer_pi
    3434  REAL, DIMENSION(klon,klev),     INTENT(in)  :: RHcl       ! humidite relative ciel clair
    3535!RAF  REAL, DIMENSION(klon,naero_tot),INTENT(in)  :: fractnat_allaer
    … …  
    136136  INTEGER, ALLOCATABLE, DIMENSION(:)   :: aerosol_name
    137137  INTEGER :: nb_aer
    138   REAL, DIMENSION(klon,klev,naero_spc) :: mass_temp
     138  REAL, DIMENSION(klon,klev,naero_tot) :: mass_temp
    139139!RAF
    140   REAL, DIMENSION(klon,klev,naero_spc) :: mass_temp_pi
     140  REAL, DIMENSION(klon,klev,naero_tot) :: mass_temp_pi
    141141
    142142  !
    … …  
    607607     nb_aer = 2
    608608     ALLOCATE (aerosol_name(nb_aer))
    609      aerosol_name(1) = id_ASSO4M
    610      aerosol_name(2) = id_CSSO4M
     609     aerosol_name(1) = id_ASSO4M_phy
     610     aerosol_name(2) = id_CSSO4M_phy
    611611  ELSEIF (flag_aerosol .EQ. 2) THEN
    612612     nb_aer = 2
    613613     ALLOCATE (aerosol_name(nb_aer))
    614      aerosol_name(1) = id_ASBCM
    615      aerosol_name(2) = id_AIBCM
     614     aerosol_name(1) = id_ASBCM_phy
     615     aerosol_name(2) = id_AIBCM_phy
    616616  ELSEIF (flag_aerosol .EQ. 3) THEN
    617617     nb_aer = 2
    618618     ALLOCATE (aerosol_name(nb_aer))
    619      aerosol_name(1) = id_ASPOMM
    620      aerosol_name(2) = id_AIPOMM
     619     aerosol_name(1) = id_ASPOMM_phy
     620     aerosol_name(2) = id_AIPOMM_phy
    621621  ELSEIF (flag_aerosol .EQ. 4) THEN
    622622     nb_aer = 3
    623623     ALLOCATE (aerosol_name(nb_aer))
    624      aerosol_name(1) = id_CSSSM
    625      aerosol_name(2) = id_SSSSM
    626      aerosol_name(3) = id_ASSSM
     624     aerosol_name(1) = id_CSSSM_phy
     625     aerosol_name(2) = id_SSSSM_phy
     626     aerosol_name(3) = id_ASSSM_phy
    627627  ELSEIF (flag_aerosol .EQ. 5) THEN
    628628     nb_aer = 1
    629629     ALLOCATE (aerosol_name(nb_aer))
    630      aerosol_name(1) = id_CIDUSTM
     630     aerosol_name(1) = id_CIDUSTM_phy
    631631  ELSEIF (flag_aerosol .EQ. 6) THEN
    632632     nb_aer = 10
    633633     ALLOCATE (aerosol_name(nb_aer))
    634      aerosol_name(1) = id_ASSO4M     
    635      aerosol_name(2) = id_ASBCM
    636      aerosol_name(3) = id_AIBCM
    637      aerosol_name(4) = id_ASPOMM
    638      aerosol_name(5) = id_AIPOMM
    639      aerosol_name(6) = id_CSSSM
    640      aerosol_name(7) = id_SSSSM
    641      aerosol_name(8) = id_ASSSM
    642      aerosol_name(9) = id_CIDUSTM
    643      aerosol_name(10)= id_CSSO4M
     634     aerosol_name(1) = id_ASSO4M_phy
     635     aerosol_name(2) = id_ASBCM_phy
     636     aerosol_name(3) = id_AIBCM_phy
     637     aerosol_name(4) = id_ASPOMM_phy
     638     aerosol_name(5) = id_AIPOMM_phy
     639     aerosol_name(6) = id_CSSSM_phy
     640     aerosol_name(7) = id_SSSSM_phy
     641     aerosol_name(8) = id_ASSSM_phy
     642     aerosol_name(9) = id_CIDUSTM_phy
     643     aerosol_name(10)= id_CSSO4M_phy
    644644  ENDIF
    645645
    … …  
    678678  DO m=1,nb_aer   ! tau is only computed for each mass
    679679    fac=1.0
    680      IF (aerosol_name(m).EQ.id_ASBCM) THEN
     680     IF (aerosol_name(m).EQ.id_ASBCM_phy) THEN
    681681         soluble=.TRUE.
    682682         spsol=1
    683683         spss=0
    684      ELSEIF (aerosol_name(m).EQ.id_ASPOMM) THEN
     684     ELSEIF (aerosol_name(m).EQ.id_ASPOMM_phy) THEN
    685685        soluble=.TRUE.
    686686        spsol=2
    687687        spss=0
    688      ELSEIF (aerosol_name(m).EQ.id_ASSO4M) THEN
     688     ELSEIF (aerosol_name(m).EQ.id_ASSO4M_phy) THEN
    689689        soluble=.TRUE.
    690690        spsol=3
    691691        spss=0
    692692        fac=1.375    ! (NH4)2-SO4/SO4 132/96 mass conversion factor for OD
    693      ELSEIF  (aerosol_name(m).EQ.id_CSSO4M) THEN
     693     ELSEIF  (aerosol_name(m).EQ.id_CSSO4M_phy) THEN
    694694        soluble=.TRUE.
    695695        spsol=4
    696696        spss=0
    697697        fac=1.375    ! (NH4)2-SO4/SO4 132/96 mass conversion factor for OD
    698      ELSEIF (aerosol_name(m).EQ.id_SSSSM) THEN
     698     ELSEIF (aerosol_name(m).EQ.id_SSSSM_phy) THEN
    699699         soluble=.TRUE.
    700700         spsol=5
    701701         spss=3
    702      ELSEIF (aerosol_name(m).EQ.id_CSSSM) THEN
     702     ELSEIF (aerosol_name(m).EQ.id_CSSSM_phy) THEN
    703703         soluble=.TRUE.
    704704         spsol=6
    705705         spss=2
    706      ELSEIF (aerosol_name(m).EQ.id_ASSSM) THEN
     706     ELSEIF (aerosol_name(m).EQ.id_ASSSM_phy) THEN
    707707         soluble=.TRUE.
    708708         spsol=7
    709709         spss=1
    710      ELSEIF (aerosol_name(m).EQ.id_CIDUSTM) THEN
     710     ELSEIF (aerosol_name(m).EQ.id_CIDUSTM_phy) THEN
    711711         soluble=.FALSE.
    712712         spinsol=1
    713713         spss=0
    714      ELSEIF  (aerosol_name(m).EQ.id_AIBCM) THEN
     714     ELSEIF  (aerosol_name(m).EQ.id_AIBCM_phy) THEN
    715715         soluble=.FALSE.
    716716         spinsol=2
    717717         spss=0
    718      ELSEIF (aerosol_name(m).EQ.id_AIPOMM) THEN
     718     ELSEIF (aerosol_name(m).EQ.id_AIPOMM_phy) THEN
    719719         soluble=.FALSE.
    720720         spinsol=3
    … …  
    944944        DO k=1, KLEV
    945945          DO i=1, KLON
    946             tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_ASSO4M,inu)+tau_ae(i,k,id_CSSO4M,inu)+ &
    947                                            tau_ae(i,k,id_ASBCM,inu)+tau_ae(i,k,id_AIBCM,inu)+   &                                                   
    948                                            tau_ae(i,k,id_ASPOMM,inu)+tau_ae(i,k,id_AIPOMM,inu)+ &       
    949                                            tau_ae(i,k,id_ASSSM,inu)+tau_ae(i,k,id_CSSSM,inu)+   &
    950                                            tau_ae(i,k,id_SSSSM,inu)+ tau_ae(i,k,id_CIDUSTM,inu)
     946            tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_ASSO4M_phy,inu)+tau_ae(i,k,id_CSSO4M_phy,inu)+ &
     947                                           tau_ae(i,k,id_ASBCM_phy,inu)+tau_ae(i,k,id_AIBCM_phy,inu)+   &                                                   
     948                                           tau_ae(i,k,id_ASPOMM_phy,inu)+tau_ae(i,k,id_AIPOMM_phy,inu)+ &       
     949                                           tau_ae(i,k,id_ASSSM_phy,inu)+tau_ae(i,k,id_CSSSM_phy,inu)+   &
     950                                           tau_ae(i,k,id_SSSSM_phy,inu)+ tau_ae(i,k,id_CIDUSTM_phy,inu)
    951951             tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5)
    952952                 
    953              piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASSO4M,inu)*piz_ae(i,k,id_ASSO4M,inu)+ &
    954                                              tau_ae(i,k,id_CSSO4M,inu)*piz_ae(i,k,id_CSSO4M,inu)+ &
    955                                              tau_ae(i,k,id_ASBCM,inu)*piz_ae(i,k,id_ASBCM,inu)+ &
    956                                              tau_ae(i,k,id_AIBCM,inu)*piz_ae(i,k,id_AIBCM,inu)+ &
    957                                              tau_ae(i,k,id_ASPOMM,inu)*piz_ae(i,k,id_ASPOMM,inu)+ &
    958                                              tau_ae(i,k,id_AIPOMM,inu)*piz_ae(i,k,id_AIPOMM,inu)+ &     
    959                                              tau_ae(i,k,id_ASSSM,inu)*piz_ae(i,k,id_ASSSM,inu)+ &
    960                                              tau_ae(i,k,id_CSSSM,inu)*piz_ae(i,k,id_CSSSM,inu)+ &
    961                                              tau_ae(i,k,id_SSSSM,inu)*piz_ae(i,k,id_SSSSM,inu)+ &
    962                                              tau_ae(i,k,id_CIDUSTM,inu)*piz_ae(i,k,id_CIDUSTM,inu)) &
     953             piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASSO4M_phy,inu)*piz_ae(i,k,id_ASSO4M_phy,inu)+ &
     954                                             tau_ae(i,k,id_CSSO4M_phy,inu)*piz_ae(i,k,id_CSSO4M_phy,inu)+ &
     955                                             tau_ae(i,k,id_ASBCM_phy,inu)*piz_ae(i,k,id_ASBCM_phy,inu)+ &
     956                                             tau_ae(i,k,id_AIBCM_phy,inu)*piz_ae(i,k,id_AIBCM_phy,inu)+ &
     957                                             tau_ae(i,k,id_ASPOMM_phy,inu)*piz_ae(i,k,id_ASPOMM_phy,inu)+ &
     958                                             tau_ae(i,k,id_AIPOMM_phy,inu)*piz_ae(i,k,id_AIPOMM_phy,inu)+ &     
     959                                             tau_ae(i,k,id_ASSSM_phy,inu)*piz_ae(i,k,id_ASSSM_phy,inu)+ &
     960                                             tau_ae(i,k,id_CSSSM_phy,inu)*piz_ae(i,k,id_CSSSM_phy,inu)+ &
     961                                             tau_ae(i,k,id_SSSSM_phy,inu)*piz_ae(i,k,id_SSSSM_phy,inu)+ &
     962                                             tau_ae(i,k,id_CIDUSTM_phy,inu)*piz_ae(i,k,id_CIDUSTM_phy,inu)) &
    963963                                            /tau_allaer(i,k,mrfspecies,inu)
    964964             piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1)
    965965
    966              cg_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASSO4M,inu)*piz_ae(i,k,id_ASSO4M,inu)*cg_ae(i,k,id_ASSO4M,inu)+ &
    967                       tau_ae(i,k,id_CSSO4M,inu)*piz_ae(i,k,id_CSSO4M,inu)*cg_ae(i,k,id_CSSO4M,inu)+ &
    968                       tau_ae(i,k,id_ASBCM,inu)*piz_ae(i,k,id_ASBCM,inu)*cg_ae(i,k,id_ASBCM,inu)+ &
    969                       tau_ae(i,k,id_AIBCM,inu)*piz_ae(i,k,id_AIBCM,inu)*cg_ae(i,k,id_AIBCM,inu)+ &
    970                       tau_ae(i,k,id_ASPOMM,inu)*piz_ae(i,k,id_ASPOMM,inu)*cg_ae(i,k,id_ASPOMM,inu)+ &
    971                       tau_ae(i,k,id_AIPOMM,inu)*piz_ae(i,k,id_AIPOMM,inu)*cg_ae(i,k,id_AIPOMM,inu)+ &   
    972                       tau_ae(i,k,id_ASSSM,inu)*piz_ae(i,k,id_ASSSM,inu)*cg_ae(i,k,id_ASSSM,inu)+ &
    973                       tau_ae(i,k,id_CSSSM,inu)*piz_ae(i,k,id_CSSSM,inu)*cg_ae(i,k,id_CSSSM,inu)+ &
    974                       tau_ae(i,k,id_SSSSM,inu)*piz_ae(i,k,id_SSSSM,inu)*cg_ae(i,k,id_SSSSM,inu)+ &
    975                       tau_ae(i,k,id_CIDUSTM,inu)*piz_ae(i,k,id_CIDUSTM,inu)*cg_ae(i,k,id_CIDUSTM,inu))/ &
    976                       (tau_allaer(i,k,mrfspecies,inu)*piz_allaer(i,k,mrfspecies,inu))
     966             cg_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASSO4M_phy,inu)* &
     967              piz_ae(i,k,id_ASSO4M_phy,inu)*cg_ae(i,k,id_ASSO4M_phy,inu)+ &
     968              tau_ae(i,k,id_CSSO4M_phy,inu)*piz_ae(i,k,id_CSSO4M_phy,inu)* &
     969              cg_ae(i,k,id_CSSO4M_phy,inu)+ &
     970              tau_ae(i,k,id_ASBCM_phy,inu)*piz_ae(i,k,id_ASBCM_phy,inu)* &
     971              cg_ae(i,k,id_ASBCM_phy,inu)+ &
     972              tau_ae(i,k,id_AIBCM_phy,inu)*piz_ae(i,k,id_AIBCM_phy,inu)* &
     973              cg_ae(i,k,id_AIBCM_phy,inu)+ &
     974              tau_ae(i,k,id_ASPOMM_phy,inu)*piz_ae(i,k,id_ASPOMM_phy,inu)* &
     975              cg_ae(i,k,id_ASPOMM_phy,inu)+ &
     976              tau_ae(i,k,id_AIPOMM_phy,inu)*piz_ae(i,k,id_AIPOMM_phy,inu)* &
     977              cg_ae(i,k,id_AIPOMM_phy,inu)+ &
     978              tau_ae(i,k,id_ASSSM_phy,inu)*piz_ae(i,k,id_ASSSM_phy,inu)* &
     979              cg_ae(i,k,id_ASSSM_phy,inu)+ &
     980              tau_ae(i,k,id_CSSSM_phy,inu)*piz_ae(i,k,id_CSSSM_phy,inu)* &
     981              cg_ae(i,k,id_CSSSM_phy,inu)+ &
     982              tau_ae(i,k,id_SSSSM_phy,inu)*piz_ae(i,k,id_SSSSM_phy,inu)* &
     983              cg_ae(i,k,id_SSSSM_phy,inu)+ &
     984              tau_ae(i,k,id_CIDUSTM_phy,inu)*piz_ae(i,k,id_CIDUSTM_phy,inu)* &
     985              cg_ae(i,k,id_CIDUSTM_phy,inu))/ &
     986              (tau_allaer(i,k,mrfspecies,inu)*piz_allaer(i,k,mrfspecies,inu))
    977987          ENDDO   
    978988        ENDDO
    … …  
    983993          DO i=1, KLON
    984994!RAF
    985                  tau_allaer(i,k,mrfspecies,inu)=tau_ae_pi(i,k,id_ASSO4M,inu)+ &
    986                       tau_ae_pi(i,k,id_CSSO4M,inu)+ &
    987                       tau_ae_pi(i,k,id_ASBCM,inu)+ &
    988                       tau_ae_pi(i,k,id_AIBCM,inu)+ &
    989                       tau_ae_pi(i,k,id_ASPOMM,inu)+ &
    990                       tau_ae_pi(i,k,id_AIPOMM,inu)+ &   
    991                       tau_ae_pi(i,k,id_ASSSM,inu)+ &
    992                       tau_ae_pi(i,k,id_CSSSM,inu)+ &
    993                       tau_ae_pi(i,k,id_SSSSM,inu)+ &
    994                       tau_ae_pi(i,k,id_CIDUSTM,inu)
     995                 tau_allaer(i,k,mrfspecies,inu)=tau_ae_pi(i,k,id_ASSO4M_phy,inu)+ &
     996                      tau_ae_pi(i,k,id_CSSO4M_phy,inu)+ &
     997                      tau_ae_pi(i,k,id_ASBCM_phy,inu)+ &
     998                      tau_ae_pi(i,k,id_AIBCM_phy,inu)+ &
     999                      tau_ae_pi(i,k,id_ASPOMM_phy,inu)+ &
     1000                      tau_ae_pi(i,k,id_AIPOMM_phy,inu)+ &       
     1001                      tau_ae_pi(i,k,id_ASSSM_phy,inu)+ &
     1002                      tau_ae_pi(i,k,id_CSSSM_phy,inu)+ &
     1003                      tau_ae_pi(i,k,id_SSSSM_phy,inu)+ &
     1004                      tau_ae_pi(i,k,id_CIDUSTM_phy,inu)
    9951005                 tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5)
    9961006
    997                  piz_allaer(i,k,mrfspecies,inu)=(tau_ae_pi(i,k,id_ASSO4M,inu)*piz_ae(i,k,id_ASSO4M,inu)+ &
    998                       tau_ae_pi(i,k,id_CSSO4M,inu)*piz_ae(i,k,id_CSSO4M,inu)+ &
    999                       tau_ae_pi(i,k,id_ASBCM,inu)*piz_ae(i,k,id_ASBCM,inu)+ &
    1000                       tau_ae_pi(i,k,id_AIBCM,inu)*piz_ae(i,k,id_AIBCM,inu)+ &
    1001                       tau_ae_pi(i,k,id_ASPOMM,inu)*piz_ae(i,k,id_ASPOMM,inu)+ &
    1002                       tau_ae_pi(i,k,id_AIPOMM,inu)*piz_ae(i,k,id_AIPOMM,inu)+ &
    1003                       tau_ae_pi(i,k,id_ASSSM,inu)*piz_ae(i,k,id_ASSSM,inu)+ &
    1004                       tau_ae_pi(i,k,id_CSSSM,inu)*piz_ae(i,k,id_CSSSM,inu)+ &
    1005                       tau_ae_pi(i,k,id_SSSSM,inu)*piz_ae(i,k,id_SSSSM,inu)+ &
    1006                       tau_ae_pi(i,k,id_CIDUSTM,inu)*piz_ae(i,k,id_CIDUSTM,inu)) &
     1007                 piz_allaer(i,k,mrfspecies,inu)=(tau_ae_pi(i,k,id_ASSO4M_phy,inu)*piz_ae(i,k,id_ASSO4M_phy,inu)+ &
     1008                      tau_ae_pi(i,k,id_CSSO4M_phy,inu)*piz_ae(i,k,id_CSSO4M_phy,inu)+ &
     1009                      tau_ae_pi(i,k,id_ASBCM_phy,inu)*piz_ae(i,k,id_ASBCM_phy,inu)+ &
     1010                      tau_ae_pi(i,k,id_AIBCM_phy,inu)*piz_ae(i,k,id_AIBCM_phy,inu)+ &
     1011                      tau_ae_pi(i,k,id_ASPOMM_phy,inu)*piz_ae(i,k,id_ASPOMM_phy,inu)+ &
     1012                      tau_ae_pi(i,k,id_AIPOMM_phy,inu)*piz_ae(i,k,id_AIPOMM_phy,inu)+ &
     1013                      tau_ae_pi(i,k,id_ASSSM_phy,inu)*piz_ae(i,k,id_ASSSM_phy,inu)+ &
     1014                      tau_ae_pi(i,k,id_CSSSM_phy,inu)*piz_ae(i,k,id_CSSSM_phy,inu)+ &
     1015                      tau_ae_pi(i,k,id_SSSSM_phy,inu)*piz_ae(i,k,id_SSSSM_phy,inu)+ &
     1016                      tau_ae_pi(i,k,id_CIDUSTM_phy,inu)*piz_ae(i,k,id_CIDUSTM_phy,inu)) &
    10071017                      /tau_allaer(i,k,mrfspecies,inu)
    10081018                 piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1)
    10091019
    10101020                 cg_allaer(i,k,mrfspecies,inu)=(&
    1011                       tau_ae_pi(i,k,id_ASSO4M,inu)*piz_ae(i,k,id_ASSO4M,inu)*cg_ae(i,k,id_ASSO4M,inu)+ &
    1012                       tau_ae_pi(i,k,id_CSSO4M,inu)*piz_ae(i,k,id_CSSO4M,inu)*cg_ae(i,k,id_CSSO4M,inu)+ &
    1013                       tau_ae_pi(i,k,id_ASBCM,inu)*piz_ae(i,k,id_ASBCM,inu)*cg_ae(i,k,id_ASBCM,inu)+ &
    1014                       tau_ae_pi(i,k,id_AIBCM,inu)*piz_ae(i,k,id_AIBCM,inu)*cg_ae(i,k,id_AIBCM,inu)+ &
    1015                       tau_ae_pi(i,k,id_ASPOMM,inu)*piz_ae(i,k,id_ASPOMM,inu)*cg_ae(i,k,id_ASPOMM,inu)+ &
    1016                       tau_ae_pi(i,k,id_AIPOMM,inu)*piz_ae(i,k,id_AIPOMM,inu)*cg_ae(i,k,id_AIPOMM,inu)+ &
    1017                       tau_ae_pi(i,k,id_ASSSM,inu)*piz_ae(i,k,id_ASSSM,inu)*cg_ae(i,k,id_ASSSM,inu)+ &
    1018                       tau_ae_pi(i,k,id_CSSSM,inu)*piz_ae(i,k,id_CSSSM,inu)*cg_ae(i,k,id_CSSSM,inu)+ &
    1019                       tau_ae_pi(i,k,id_SSSSM,inu)*piz_ae(i,k,id_SSSSM,inu)*cg_ae(i,k,id_SSSSM,inu)+ &
    1020                       tau_ae_pi(i,k,id_CIDUSTM,inu)*piz_ae(i,k,id_CIDUSTM,inu)*&
    1021                       cg_ae(i,k,id_CIDUSTM,inu))/ &
     1021                      tau_ae_pi(i,k,id_ASSO4M_phy,inu)*piz_ae(i,k,id_ASSO4M_phy,inu)*cg_ae(i,k,id_ASSO4M_phy,inu)+ &
     1022                      tau_ae_pi(i,k,id_CSSO4M_phy,inu)*piz_ae(i,k,id_CSSO4M_phy,inu)*cg_ae(i,k,id_CSSO4M_phy,inu)+ &
     1023                      tau_ae_pi(i,k,id_ASBCM_phy,inu)*piz_ae(i,k,id_ASBCM_phy,inu)*cg_ae(i,k,id_ASBCM_phy,inu)+ &
     1024                      tau_ae_pi(i,k,id_AIBCM_phy,inu)*piz_ae(i,k,id_AIBCM_phy,inu)*cg_ae(i,k,id_AIBCM_phy,inu)+ &
     1025                      tau_ae_pi(i,k,id_ASPOMM_phy,inu)*piz_ae(i,k,id_ASPOMM_phy,inu)*cg_ae(i,k,id_ASPOMM_phy,inu)+ &
     1026                      tau_ae_pi(i,k,id_AIPOMM_phy,inu)*piz_ae(i,k,id_AIPOMM_phy,inu)*cg_ae(i,k,id_AIPOMM_phy,inu)+ &
     1027                      tau_ae_pi(i,k,id_ASSSM_phy,inu)*piz_ae(i,k,id_ASSSM_phy,inu)*cg_ae(i,k,id_ASSSM_phy,inu)+ &
     1028                      tau_ae_pi(i,k,id_CSSSM_phy,inu)*piz_ae(i,k,id_CSSSM_phy,inu)*cg_ae(i,k,id_CSSSM_phy,inu)+ &
     1029                      tau_ae_pi(i,k,id_SSSSM_phy,inu)*piz_ae(i,k,id_SSSSM_phy,inu)*cg_ae(i,k,id_SSSSM_phy,inu)+ &
     1030                      tau_ae_pi(i,k,id_CIDUSTM_phy,inu)*piz_ae(i,k,id_CIDUSTM_phy,inu)*&
     1031                      cg_ae(i,k,id_CIDUSTM_phy,inu))/ &
    10221032                      (tau_allaer(i,k,mrfspecies,inu)*piz_allaer(i,k,mrfspecies,inu))
    10231033          ENDDO
    … …  
    10271037        DO k=1, KLEV
    10281038          DO i=1, KLON
    1029             tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_ASBCM,inu)+tau_ae(i,k,id_AIBCM,inu)
     1039            tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_ASBCM_phy,inu)+tau_ae(i,k,id_AIBCM_phy,inu)
    10301040            tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5)
    1031             piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASBCM,inu)*piz_ae(i,k,id_ASBCM,inu) &
    1032                       +tau_ae(i,k,id_AIBCM,inu)*piz_ae(i,k,id_AIBCM,inu))/ &
     1041            piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASBCM_phy,inu)*piz_ae(i,k,id_ASBCM_phy,inu) &
     1042                      +tau_ae(i,k,id_AIBCM_phy,inu)*piz_ae(i,k,id_AIBCM_phy,inu))/ &
    10331043                      tau_allaer(i,k,mrfspecies,inu)
    10341044            piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1)
    1035             cg_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASBCM,inu)*piz_ae(i,k,id_ASBCM,inu) *cg_ae(i,k,id_ASBCM,inu)&
    1036                       +tau_ae(i,k,id_AIBCM,inu)*piz_ae(i,k,id_AIBCM,inu)*cg_ae(i,k,id_AIBCM,inu))/ &
     1045            cg_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASBCM_phy,inu)*piz_ae(i,k,id_ASBCM_phy,inu) *cg_ae(i,k,id_ASBCM_phy,inu)&
     1046                      +tau_ae(i,k,id_AIBCM_phy,inu)*piz_ae(i,k,id_AIBCM_phy,inu)*cg_ae(i,k,id_AIBCM_phy,inu))/ &
    10371047                      (tau_allaer(i,k,mrfspecies,inu)*piz_allaer(i,k,mrfspecies,inu))
    10381048          ENDDO
    … …  
    10431053        DO k=1, KLEV
    10441054          DO i=1, KLON
    1045             tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_ASSO4M,inu)+tau_ae(i,k,id_CSSO4M,inu)
     1055            tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_ASSO4M_phy,inu)+tau_ae(i,k,id_CSSO4M_phy,inu)
    10461056            tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5)
    1047             piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_CSSO4M,inu)*piz_ae(i,k,id_CSSO4M,inu) &
    1048                       +tau_ae(i,k,id_ASSO4M,inu)*piz_ae(i,k,id_ASSO4M,inu))/ &
     1057            piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_CSSO4M_phy,inu)*piz_ae(i,k,id_CSSO4M_phy,inu) &
     1058                      +tau_ae(i,k,id_ASSO4M_phy,inu)*piz_ae(i,k,id_ASSO4M_phy,inu))/ &
    10491059                      tau_allaer(i,k,mrfspecies,inu)
    10501060            piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1)
    1051             cg_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_CSSO4M,inu)*piz_ae(i,k,id_CSSO4M,inu) *cg_ae(i,k,id_CSSO4M,inu)&
    1052                       +tau_ae(i,k,id_ASSO4M,inu)*piz_ae(i,k,id_ASSO4M,inu)*cg_ae(i,k,id_ASSO4M,inu))/ &
    1053                       (tau_allaer(i,k,mrfspecies,inu)*piz_allaer(i,k,mrfspecies,inu))
     1061            cg_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_CSSO4M_phy,inu)* &
     1062            piz_ae(i,k,id_CSSO4M_phy,inu) *cg_ae(i,k,id_CSSO4M_phy,inu)&
     1063            +tau_ae(i,k,id_ASSO4M_phy,inu)*piz_ae(i,k,id_ASSO4M_phy,inu)* &
     1064            cg_ae(i,k,id_ASSO4M_phy,inu))/ &
     1065            (tau_allaer(i,k,mrfspecies,inu)*piz_allaer(i,k,mrfspecies,inu))
    10541066          ENDDO
    10551067        ENDDO
    … …  
    10591071        DO k=1, KLEV
    10601072          DO i=1, KLON
    1061             tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_ASPOMM,inu)+tau_ae(i,k,id_AIPOMM,inu)
     1073            tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_ASPOMM_phy,inu)+tau_ae(i,k,id_AIPOMM_phy,inu)
    10621074            tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5)
    1063             piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASPOMM,inu)*piz_ae(i,k,id_ASPOMM,inu) &
    1064                       +tau_ae(i,k,id_AIPOMM,inu)*piz_ae(i,k,id_AIPOMM,inu))/ &
     1075            piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASPOMM_phy,inu)*piz_ae(i,k,id_ASPOMM_phy,inu) &
     1076                      +tau_ae(i,k,id_AIPOMM_phy,inu)*piz_ae(i,k,id_AIPOMM_phy,inu))/ &
    10651077                      tau_allaer(i,k,mrfspecies,inu)
    10661078            piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1)
    1067             cg_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASPOMM,inu)*piz_ae(i,k,id_ASPOMM,inu) *cg_ae(i,k,id_ASPOMM,inu)&
    1068                       +tau_ae(i,k,id_AIPOMM,inu)*piz_ae(i,k,id_AIPOMM,inu)*cg_ae(i,k,id_AIPOMM,inu))/ &
     1079            cg_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASPOMM_phy,inu)*piz_ae(i,k,id_ASPOMM_phy,inu) *cg_ae(i,k,id_ASPOMM_phy,inu)&
     1080                      +tau_ae(i,k,id_AIPOMM_phy,inu)*piz_ae(i,k,id_AIPOMM_phy,inu)*cg_ae(i,k,id_AIPOMM_phy,inu))/ &
    10691081                      (tau_allaer(i,k,mrfspecies,inu)*piz_allaer(i,k,mrfspecies,inu))
    10701082          ENDDO
    … …  
    10751087        DO k=1, KLEV
    10761088          DO i=1, KLON
    1077             tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_CIDUSTM,inu)
     1089            tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_CIDUSTM_phy,inu)
    10781090            tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5)
    1079             piz_allaer(i,k,mrfspecies,inu)=piz_ae(i,k,id_CIDUSTM,inu)
    1080             cg_allaer(i,k,mrfspecies,inu)=cg_ae(i,k,id_CIDUSTM,inu)
     1091            piz_allaer(i,k,mrfspecies,inu)=piz_ae(i,k,id_CIDUSTM_phy,inu)
     1092            cg_allaer(i,k,mrfspecies,inu)=cg_ae(i,k,id_CIDUSTM_phy,inu)
    10811093          ENDDO
    10821094        ENDDO
    … …  
    10861098        DO k=1, KLEV
    10871099          DO i=1, KLON
    1088             tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_ASSSM,inu)+tau_ae(i,k,id_CSSSM,inu)+tau_ae(i,k,id_SSSSM,inu)
     1100            tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_ASSSM_phy,inu)+tau_ae(i,k,id_CSSSM_phy,inu)+tau_ae(i,k,id_SSSSM_phy,inu)
    10891101            tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5)
    1090             piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASSSM,inu)*piz_ae(i,k,id_ASSSM,inu) &
    1091                     +tau_ae(i,k,id_CSSSM,inu)*piz_ae(i,k,id_CSSSM,inu) &
    1092                     +tau_ae(i,k,id_SSSSM,inu)*piz_ae(i,k,id_SSSSM,inu))/ &
     1102            piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASSSM_phy,inu)*piz_ae(i,k,id_ASSSM_phy,inu) &
     1103                    +tau_ae(i,k,id_CSSSM_phy,inu)*piz_ae(i,k,id_CSSSM_phy,inu) &
     1104                    +tau_ae(i,k,id_SSSSM_phy,inu)*piz_ae(i,k,id_SSSSM_phy,inu))/ &
    10931105                    tau_allaer(i,k,mrfspecies,inu)
    10941106            piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1)
    1095             cg_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASSSM,inu)*piz_ae(i,k,id_ASSSM,inu) *cg_ae(i,k,id_ASSSM,inu)&
    1096                     +tau_ae(i,k,id_CSSSM,inu)*piz_ae(i,k,id_CSSSM,inu)*cg_ae(i,k,id_CSSSM,inu) &
    1097                     +tau_ae(i,k,id_SSSSM,inu)*piz_ae(i,k,id_SSSSM,inu)*cg_ae(i,k,id_SSSSM,inu))/ &
     1107            cg_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASSSM_phy,inu)*piz_ae(i,k,id_ASSSM_phy,inu) *cg_ae(i,k,id_ASSSM_phy,inu)&
     1108                    +tau_ae(i,k,id_CSSSM_phy,inu)*piz_ae(i,k,id_CSSSM_phy,inu)*cg_ae(i,k,id_CSSSM_phy,inu) &
     1109                    +tau_ae(i,k,id_SSSSM_phy,inu)*piz_ae(i,k,id_SSSSM_phy,inu)*cg_ae(i,k,id_SSSSM_phy,inu))/ &
    10981110                    (tau_allaer(i,k,mrfspecies,inu)*piz_allaer(i,k,mrfspecies,inu))
    10991111          ENDDO
Note: See TracChangeset for help on using the changeset viewer.