Changeset 2324


Ignore:
Timestamp:
Jul 8, 2015, 5:20:22 PM (9 years ago)
Author:
oboucher
Message:

Tidying up the old aerosol optical properties
especially use naero_tot dimension wherever needed

Location:
LMDZ5/trunk/libf/phylmd
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/trunk/libf/phylmd/aeropt_2bands.F90

    r2311 r2324  
    2929  REAL,                           INTENT(in)  :: delt
    3030  REAL, DIMENSION(klon,klev,naero_tot),   INTENT(in)  :: m_allaer
    31 !RAF
    3231  REAL, DIMENSION(klon,klev,naero_tot),   INTENT(in)  :: m_allaer_pi
    3332  REAL, DIMENSION(klon,klev),     INTENT(in)  :: RHcl       ! humidite relative ciel clair
    34 !RAF  REAL, DIMENSION(klon,naero_tot),INTENT(in)  :: fractnat_allaer
    3533  INTEGER,                        INTENT(in)  :: flag_aerosol
    3634  REAL, DIMENSION(klon,klev),     INTENT(in)  :: pplay
     
    4846  !
    4947  REAL, DIMENSION(klon,klev,naero_tot,nbands) ::  tau_ae
    50 !RAF
    5148  REAL, DIMENSION(klon,klev,naero_tot,nbands) ::  tau_ae_pi
    5249  REAL, DIMENSION(klon,klev,naero_tot,nbands) ::  piz_ae
     
    594591    DO i=1, klon
    595592      zrho=pplay(i,k)/t_seri(i,k)/RD                  ! kg/m3
    596 !CDIR UNROLL=naero_spc
    597593      mass_temp(i,k,:) = m_allaer(i,k,:) / zrho / 1.e+9
    598 !RAF zrho
    599 !CDIR UNROLL=naero_spc
    600594      mass_temp_pi(i,k,:) = m_allaer_pi(i,k,:) / zrho / 1.e+9
    601595      zdp1(i,k)=pdel(i,k)/(gravit*delt)      ! air mass auxiliary  variable --> zdp1 [kg/(m^2 *s)]
     
    653647
    654648
    655 !!CDIR ON_ADB(RH_tab)
    656649!CDIR ON_ADB(fact_RH)
    657650!CDIR SHORTLOOP
     
    661654   
    662655  DO k=1, KLEV
    663 !!CDIR ON_ADB(RH_tab)
    664656!CDIR ON_ADB(fact_RH)
    665657    DO i=1, KLON
     
    944936          DO i=1, KLON
    945937            tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_ASSO4M_phy,inu)+tau_ae(i,k,id_CSSO4M_phy,inu)+ &
    946                                            tau_ae(i,k,id_ASBCM_phy,inu)+tau_ae(i,k,id_AIBCM_phy,inu)+   &                                                   
    947                                            tau_ae(i,k,id_ASPOMM_phy,inu)+tau_ae(i,k,id_AIPOMM_phy,inu)+ &       
     938                                           tau_ae(i,k,id_ASBCM_phy,inu)+tau_ae(i,k,id_AIBCM_phy,inu)+   &
     939                                           tau_ae(i,k,id_ASPOMM_phy,inu)+tau_ae(i,k,id_AIPOMM_phy,inu)+ &
    948940                                           tau_ae(i,k,id_ASSSM_phy,inu)+tau_ae(i,k,id_CSSSM_phy,inu)+   &
    949941                                           tau_ae(i,k,id_SSSSM_phy,inu)+ tau_ae(i,k,id_CIDUSTM_phy,inu)
    950              tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5)
     942            tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5)
    951943                 
    952              piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASSO4M_phy,inu)*piz_ae(i,k,id_ASSO4M_phy,inu)+ &
    953                                              tau_ae(i,k,id_CSSO4M_phy,inu)*piz_ae(i,k,id_CSSO4M_phy,inu)+ &
    954                                              tau_ae(i,k,id_ASBCM_phy,inu)*piz_ae(i,k,id_ASBCM_phy,inu)+ &
    955                                              tau_ae(i,k,id_AIBCM_phy,inu)*piz_ae(i,k,id_AIBCM_phy,inu)+ &
    956                                              tau_ae(i,k,id_ASPOMM_phy,inu)*piz_ae(i,k,id_ASPOMM_phy,inu)+ &
    957                                              tau_ae(i,k,id_AIPOMM_phy,inu)*piz_ae(i,k,id_AIPOMM_phy,inu)+ &     
    958                                              tau_ae(i,k,id_ASSSM_phy,inu)*piz_ae(i,k,id_ASSSM_phy,inu)+ &
    959                                              tau_ae(i,k,id_CSSSM_phy,inu)*piz_ae(i,k,id_CSSSM_phy,inu)+ &
    960                                              tau_ae(i,k,id_SSSSM_phy,inu)*piz_ae(i,k,id_SSSSM_phy,inu)+ &
    961                                              tau_ae(i,k,id_CIDUSTM_phy,inu)*piz_ae(i,k,id_CIDUSTM_phy,inu)) &
     944            piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASSO4M_phy,inu)*piz_ae(i,k,id_ASSO4M_phy,inu)+ &
     945                                            tau_ae(i,k,id_CSSO4M_phy,inu)*piz_ae(i,k,id_CSSO4M_phy,inu)+ &
     946                                            tau_ae(i,k,id_ASBCM_phy,inu)*piz_ae(i,k,id_ASBCM_phy,inu)+  &
     947                                            tau_ae(i,k,id_AIBCM_phy,inu)*piz_ae(i,k,id_AIBCM_phy,inu)+  &
     948                                            tau_ae(i,k,id_ASPOMM_phy,inu)*piz_ae(i,k,id_ASPOMM_phy,inu)+ &
     949                                            tau_ae(i,k,id_AIPOMM_phy,inu)*piz_ae(i,k,id_AIPOMM_phy,inu)+ &
     950                                            tau_ae(i,k,id_ASSSM_phy,inu)*piz_ae(i,k,id_ASSSM_phy,inu)+  &
     951                                            tau_ae(i,k,id_CSSSM_phy,inu)*piz_ae(i,k,id_CSSSM_phy,inu)+  &
     952                                            tau_ae(i,k,id_SSSSM_phy,inu)*piz_ae(i,k,id_SSSSM_phy,inu)+  &
     953                                            tau_ae(i,k,id_CIDUSTM_phy,inu)*piz_ae(i,k,id_CIDUSTM_phy,inu)) &
    962954                                            /tau_allaer(i,k,mrfspecies,inu)
    963              piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1)
    964 
    965              cg_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASSO4M_phy,inu)* &
     955            piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1)
     956
     957            cg_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASSO4M_phy,inu)* &
    966958              piz_ae(i,k,id_ASSO4M_phy,inu)*cg_ae(i,k,id_ASSO4M_phy,inu)+ &
    967959              tau_ae(i,k,id_CSSO4M_phy,inu)*piz_ae(i,k,id_CSSO4M_phy,inu)* &
     
    991983        DO k=1, KLEV
    992984          DO i=1, KLON
    993 !RAF
    994                 tau_allaer(i,k,mrfspecies,inu)=tau_ae_pi(i,k,id_ASSO4M_phy,inu)+ &
     985
     986              tau_allaer(i,k,mrfspecies,inu)=tau_ae_pi(i,k,id_ASSO4M_phy,inu)+ &
    995987                      tau_ae_pi(i,k,id_CSSO4M_phy,inu)+ &
    996                       tau_ae_pi(i,k,id_ASBCM_phy,inu)+ &
    997                       tau_ae_pi(i,k,id_AIBCM_phy,inu)+ &
     988                      tau_ae_pi(i,k,id_ASBCM_phy,inu)+  &
     989                      tau_ae_pi(i,k,id_AIBCM_phy,inu)+  &
    998990                      tau_ae_pi(i,k,id_ASPOMM_phy,inu)+ &
    999                       tau_ae_pi(i,k,id_AIPOMM_phy,inu)+ &       
    1000                       tau_ae_pi(i,k,id_ASSSM_phy,inu)+ &
    1001                       tau_ae_pi(i,k,id_CSSSM_phy,inu)+ &
    1002                       tau_ae_pi(i,k,id_SSSSM_phy,inu)+ &
     991                      tau_ae_pi(i,k,id_AIPOMM_phy,inu)+ &
     992                      tau_ae_pi(i,k,id_ASSSM_phy,inu)+  &
     993                      tau_ae_pi(i,k,id_CSSSM_phy,inu)+  &
     994                      tau_ae_pi(i,k,id_SSSSM_phy,inu)+  &
    1003995                      tau_ae_pi(i,k,id_CIDUSTM_phy,inu)
    1004                  tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5)
    1005 
    1006                 piz_allaer(i,k,mrfspecies,inu)=(tau_ae_pi(i,k,id_ASSO4M_phy,inu)*piz_ae(i,k,id_ASSO4M_phy,inu)+ &
     996              tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5)
     997
     998              piz_allaer(i,k,mrfspecies,inu)=(tau_ae_pi(i,k,id_ASSO4M_phy,inu)*piz_ae(i,k,id_ASSO4M_phy,inu)+ &
    1007999                      tau_ae_pi(i,k,id_CSSO4M_phy,inu)*piz_ae(i,k,id_CSSO4M_phy,inu)+ &
    1008                       tau_ae_pi(i,k,id_ASBCM_phy,inu)*piz_ae(i,k,id_ASBCM_phy,inu)+ &
    1009                       tau_ae_pi(i,k,id_AIBCM_phy,inu)*piz_ae(i,k,id_AIBCM_phy,inu)+ &
     1000                      tau_ae_pi(i,k,id_ASBCM_phy,inu)*piz_ae(i,k,id_ASBCM_phy,inu)+   &
     1001                      tau_ae_pi(i,k,id_AIBCM_phy,inu)*piz_ae(i,k,id_AIBCM_phy,inu)+   &
    10101002                      tau_ae_pi(i,k,id_ASPOMM_phy,inu)*piz_ae(i,k,id_ASPOMM_phy,inu)+ &
    1011                       tau_ae_pi(i,k,id_AIPOMM_phy,inu)*piz_ae(i,k,id_AIPOMM_phy,inu)+ & 
    1012                       tau_ae_pi(i,k,id_ASSSM_phy,inu)*piz_ae(i,k,id_ASSSM_phy,inu)+ &
    1013                       tau_ae_pi(i,k,id_CSSSM_phy,inu)*piz_ae(i,k,id_CSSSM_phy,inu)+ &
    1014                       tau_ae_pi(i,k,id_SSSSM_phy,inu)*piz_ae(i,k,id_SSSSM_phy,inu)+ &
     1003                      tau_ae_pi(i,k,id_AIPOMM_phy,inu)*piz_ae(i,k,id_AIPOMM_phy,inu)+ &
     1004                      tau_ae_pi(i,k,id_ASSSM_phy,inu)*piz_ae(i,k,id_ASSSM_phy,inu)+   &
     1005                      tau_ae_pi(i,k,id_CSSSM_phy,inu)*piz_ae(i,k,id_CSSSM_phy,inu)+   &
     1006                      tau_ae_pi(i,k,id_SSSSM_phy,inu)*piz_ae(i,k,id_SSSSM_phy,inu)+   &
    10151007                      tau_ae_pi(i,k,id_CIDUSTM_phy,inu)*piz_ae(i,k,id_CIDUSTM_phy,inu)) &
    10161008                      /tau_allaer(i,k,mrfspecies,inu)
    1017                  piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1)
    1018 
    1019                 cg_allaer(i,k,mrfspecies,inu)=(&
     1009              piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1)
     1010
     1011              cg_allaer(i,k,mrfspecies,inu)=(&
    10201012                      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)+ &
    10211013                      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)+ &
     
    10361028        DO k=1, KLEV
    10371029          DO i=1, KLON
    1038             tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_ASBCM_phy,inu)+tau_ae(i,k,id_AIBCM_phy,inu)
    1039             tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5)
    1040             piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASBCM_phy,inu)*piz_ae(i,k,id_ASBCM_phy,inu) &
     1030            tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_ASBCM_phy,inu)+tau_ae(i,k,id_AIBCM_phy,inu)
     1031            tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5)
     1032            piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASBCM_phy,inu)*piz_ae(i,k,id_ASBCM_phy,inu) &
    10411033                      +tau_ae(i,k,id_AIBCM_phy,inu)*piz_ae(i,k,id_AIBCM_phy,inu))/ &
    10421034                      tau_allaer(i,k,mrfspecies,inu)
    1043             piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1)
     1035            piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1)
    10441036            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)&
    10451037                      +tau_ae(i,k,id_AIBCM_phy,inu)*piz_ae(i,k,id_AIBCM_phy,inu)*cg_ae(i,k,id_AIBCM_phy,inu))/ &
     
    10531045          DO i=1, KLON
    10541046            tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_ASSO4M_phy,inu)+tau_ae(i,k,id_CSSO4M_phy,inu)
    1055             tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5)
     1047            tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5)
    10561048            piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_CSSO4M_phy,inu)*piz_ae(i,k,id_CSSO4M_phy,inu) &
    10571049                      +tau_ae(i,k,id_ASSO4M_phy,inu)*piz_ae(i,k,id_ASSO4M_phy,inu))/ &
    10581050                      tau_allaer(i,k,mrfspecies,inu)
    1059             piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1)
     1051            piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1)
    10601052            cg_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_CSSO4M_phy,inu)* &
    10611053            piz_ae(i,k,id_CSSO4M_phy,inu) *cg_ae(i,k,id_CSSO4M_phy,inu)&
     
    10721064            tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_ASPOMM_phy,inu)+tau_ae(i,k,id_AIPOMM_phy,inu)
    10731065            tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5)
    1074             piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASPOMM_phy,inu)*piz_ae(i,k,id_ASPOMM_phy,inu) &
     1066            piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASPOMM_phy,inu)*piz_ae(i,k,id_ASPOMM_phy,inu) &
    10751067                      +tau_ae(i,k,id_AIPOMM_phy,inu)*piz_ae(i,k,id_AIPOMM_phy,inu))/ &
    10761068                      tau_allaer(i,k,mrfspecies,inu)
    1077             piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1)
    1078             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)&
     1069            piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1)
     1070            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)&
    10791071                      +tau_ae(i,k,id_AIPOMM_phy,inu)*piz_ae(i,k,id_AIPOMM_phy,inu)*cg_ae(i,k,id_AIPOMM_phy,inu))/ &
    10801072                      (tau_allaer(i,k,mrfspecies,inu)*piz_allaer(i,k,mrfspecies,inu))
     
    10871079          DO i=1, KLON
    10881080            tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_CIDUSTM_phy,inu)
    1089             tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5)
     1081            tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5)
    10901082            piz_allaer(i,k,mrfspecies,inu)=piz_ae(i,k,id_CIDUSTM_phy,inu)
    1091             cg_allaer(i,k,mrfspecies,inu)=cg_ae(i,k,id_CIDUSTM_phy,inu)
     1083            cg_allaer(i,k,mrfspecies,inu)=cg_ae(i,k,id_CIDUSTM_phy,inu)
    10921084          ENDDO
    10931085        ENDDO
     
    11351127    ENDDO
    11361128  ENDDO
    1137    
    11381129
    11391130  inu=1
    11401131  DO i=1, KLON
    11411132     absvisaer(i)=SUM((1-piz_allaer(i,:,:,inu))*tau_allaer(i,:,:,inu))
    1142   END DO       
     1133  ENDDO
    11431134
    11441135  DEALLOCATE(aerosol_name)
  • LMDZ5/trunk/libf/phylmd/aeropt_5wv.F90

    r2311 r2324  
    6767  !
    6868  REAL, DIMENSION(klon), INTENT(out)          :: ai      ! POLDER aerosol index
    69 !  REAL, DIMENSION(klon,nwave,naero_spc), INTENT(out)      :: tausum
    70 !  REAL, DIMENSION(klon,klev,nwave,naero_spc), INTENT(out) :: tau
    7169  REAL, DIMENSION(klon,nwave,naero_tot), INTENT(out)      :: tausum
    7270  REAL, DIMENSION(klon,klev,nwave,naero_tot), INTENT(out) :: tau
     
    626624  DO k=1, klev
    627625    DO i=1, klon
    628 !      IF (t_seri(i,k).EQ.0) stop 'stop aeropt_5wv T '
    629 !      IF (pplay(i,k).EQ.0) stop  'stop aeropt_5wv p '
    630626      zrho=pplay(i,k)/t_seri(i,k)/RD                  ! kg/m3
    631627      dh(i,k)=pdel(i,k)/(gravit*zrho)
    632 !CDIR UNROLL=naero_spc
    633628      mass_temp(i,k,:) = m_allaer(i,k,:) / zrho / 1.e+9
    634629      zdp1(i,k)=pdel(i,k)/(gravit*delt)     ! air mass auxiliary  variable --> zdp1 [kg/(m^2 *s)]
     
    760755    ENDIF
    761756
    762 !Bug 21 12 10 AI
    763 !    used_tau(spsol)=.TRUE.
    764757    IF (soluble) then
    765758      used_tau(spsol)=.TRUE.
    766        ELSE
     759    ELSE
    767760      used_tau(naero_soluble+spinsol)=.TRUE.
    768761    ENDIF
     
    866859     DO m=1,naero_spc
    867860        od550aer(i)=od550aer(i)+tausum(i,2,m)
    868      END DO
    869   END DO
     861     ENDDO
     862  ENDDO
     863
    870864  DO i=1, klon
    871865     od865aer(i)=0.
    872866     DO m=1,naero_spc
    873867        od865aer(i)=od865aer(i)+tausum(i,5,m)
    874      END DO
    875   END DO
     868     ENDDO
     869  ENDDO
     870
    876871  DO i=1, klon
    877872     DO k=1, KLEV
     
    879874        DO m=1,naero_spc
    880875           ec550aer(i,k)=ec550aer(i,k)+tau(i,k,2,m)/dh(i,k)
    881         END DO
    882      END DO
    883   END DO
     876        ENDDO
     877     ENDDO
     878  ENDDO
    884879 
    885    od550lt1aer(:)=tausum(:,2,id_ASSO4M_phy)+tausum(:,2,id_ASBCM_phy)+tausum(:,2,id_AIBCM_phy)+ &
    886         tausum(:,2,id_ASPOMM_phy)+tausum(:,2,id_AIPOMM_phy)+tausum(:,2,id_ASSSM_phy)+ &
    887         0.03*tausum(:,2,id_CSSSM_phy)+0.4*tausum(:,2,id_CIDUSTM_phy)
    888 
    889 
     880   od550lt1aer(:)=tausum(:,2,id_ASSO4M_phy)+tausum(:,2,id_ASBCM_phy)+tausum(:,2,id_AIBCM_phy)+  &
     881                  tausum(:,2,id_ASPOMM_phy)+tausum(:,2,id_AIPOMM_phy)+tausum(:,2,id_ASSSM_phy)+ &
     882                  0.03*tausum(:,2,id_CSSSM_phy)+0.4*tausum(:,2,id_CIDUSTM_phy)
    890883
    891884  DEALLOCATE(aerosol_name)
  • LMDZ5/trunk/libf/phylmd/readaerosol_optic.F90

    r2323 r2324  
    6868  REAL, DIMENSION(klon,klev)   :: ssacu_pi
    6969  REAL, DIMENSION(klon,klev)   :: pdel
    70   REAL, DIMENSION(klon,klev,naero_spc) :: m_allaer
    71   REAL, DIMENSION(klon,klev,naero_spc) :: m_allaer_pi !RAF 
     70  REAL, DIMENSION(klon,klev,naero_tot) :: m_allaer
     71  REAL, DIMENSION(klon,klev,naero_tot) :: m_allaer_pi !RAF 
    7272!  REAL, DIMENSION(klon,naero_tot)      :: fractnat_allaer !RAF delete??
    7373
     
    156156  m_allaer(:,:,id_AIBCM_phy)  = bcins(:,:)        ! AIBCM
    157157  m_allaer(:,:,id_AIPOMM_phy) = pomins(:,:)       ! AIPOMM
     158  m_allaer(:,:,id_ASNO3M_phy) = 0.0
     159  m_allaer(:,:,id_CSNO3M_phy) = 0.0
     160  m_allaer(:,:,id_CINO3M_phy) = 0.0
    158161
    159162!RAF
    160   m_allaer_pi(:,:,1)  = bcsol_pi(:,:)        ! ASBCM pre-ind
    161   m_allaer_pi(:,:,2)  = pomsol_pi(:,:)       ! ASPOMM pre-ind
    162   m_allaer_pi(:,:,3)  = sulfate_pi(:,:)      ! ASSO4M (= SO4) pre-ind
    163   m_allaer_pi(:,:,4)  = 0.                ! CSSO4M pre-ind
    164   m_allaer_pi(:,:,5)  = sssupco_pi(:,:)      ! SSSSM pre-ind
    165   m_allaer_pi(:,:,6)  = sscoarse_pi(:,:)     ! CSSSM pre-ind
    166   m_allaer_pi(:,:,7)  = ssacu_pi(:,:)        ! ASSSM pre-ind
    167   m_allaer_pi(:,:,8)  = cidust_pi(:,:)       ! CIDUSTM pre-ind
    168   m_allaer_pi(:,:,9)  = bcins_pi(:,:)        ! AIBCM pre-ind
    169   m_allaer_pi(:,:,10) = pomins_pi(:,:)       ! AIPOMM pre-ind
     163  m_allaer_pi(:,:,id_ASBCM_phy)   = bcsol_pi(:,:)        ! ASBCM pre-ind
     164  m_allaer_pi(:,:,id_ASPOMM_phy)  = pomsol_pi(:,:)       ! ASPOMM pre-ind
     165  m_allaer_pi(:,:,id_ASSO4M_phy)  = sulfate_pi(:,:)      ! ASSO4M (= SO4) pre-ind
     166  m_allaer_pi(:,:,id_CSSO4M_phy)  = 0.                   ! CSSO4M pre-ind
     167  m_allaer_pi(:,:,id_SSSSM_phy)   = sssupco_pi(:,:)      ! SSSSM pre-ind
     168  m_allaer_pi(:,:,id_ASSSM_phy)   = sscoarse_pi(:,:)     ! CSSSM pre-ind
     169  m_allaer_pi(:,:,id_CIDUSTM_phy) = ssacu_pi(:,:)        ! ASSSM pre-ind
     170  m_allaer_pi(:,:,id_AIBCM_phy)   = cidust_pi(:,:)       ! CIDUSTM pre-ind
     171  m_allaer_pi(:,:,id_AIBCM_phy)   = bcins_pi(:,:)        ! AIBCM pre-ind
     172  m_allaer_pi(:,:,id_AIPOMM_phy)  = pomins_pi(:,:)       ! AIPOMM pre-ind
     173  m_allaer_pi(:,:,id_ASNO3M_phy) = 0.0
     174  m_allaer_pi(:,:,id_CSNO3M_phy) = 0.0
     175  m_allaer_pi(:,:,id_CINO3M_phy) = 0.0
    170176
    171177!
     
    212218! Diagnostics calculation for CMIP5 protocol
    213219  sconcso4(:)=m_allaer(:,1,id_ASSO4M_phy)*1.e-9
    214 !  sconcno3(:)=m_allaer(:,1,id_ASNO3M_phy)*1.e-9
     220  sconcno3(:)=m_allaer(:,1,id_ASNO3M_phy)*1.e-9
    215221  sconcoa(:)=(m_allaer(:,1,id_ASPOMM_phy)+m_allaer(:,1,id_AIPOMM_phy))*1.e-9
    216222  sconcbc(:)=(m_allaer(:,1,id_ASBCM_phy)+m_allaer(:,1,id_AIBCM_phy))*1.e-9
     
    218224  sconcdust(:)=m_allaer(:,1,id_CIDUSTM_phy)*1.e-9
    219225  concso4(:,:)=m_allaer(:,:,id_ASSO4M_phy)*1.e-9
    220 !  concno3(:,:)=m_allaer(:,:,id_ASNO3M_phy)*1.e-9
     226  concno3(:,:)=m_allaer(:,:,id_ASNO3M_phy)*1.e-9
    221227  concoa(:,:)=(m_allaer(:,:,id_ASPOMM_phy)+m_allaer(:,:,id_AIPOMM_phy))*1.e-9
    222228  concbc(:,:)=(m_allaer(:,:,id_ASBCM_phy)+m_allaer(:,:,id_AIBCM_phy))*1.e-9
Note: See TracChangeset for help on using the changeset viewer.