Index: LMDZ5/trunk/libf/phylmd/aeropt_2bands.F90 =================================================================== --- LMDZ5/trunk/libf/phylmd/aeropt_2bands.F90 (revision 2323) +++ LMDZ5/trunk/libf/phylmd/aeropt_2bands.F90 (revision 2324) @@ -29,8 +29,6 @@ REAL, INTENT(in) :: delt REAL, DIMENSION(klon,klev,naero_tot), INTENT(in) :: m_allaer -!RAF REAL, DIMENSION(klon,klev,naero_tot), INTENT(in) :: m_allaer_pi REAL, DIMENSION(klon,klev), INTENT(in) :: RHcl ! humidite relative ciel clair -!RAF REAL, DIMENSION(klon,naero_tot),INTENT(in) :: fractnat_allaer INTEGER, INTENT(in) :: flag_aerosol REAL, DIMENSION(klon,klev), INTENT(in) :: pplay @@ -48,5 +46,4 @@ ! REAL, DIMENSION(klon,klev,naero_tot,nbands) :: tau_ae -!RAF REAL, DIMENSION(klon,klev,naero_tot,nbands) :: tau_ae_pi REAL, DIMENSION(klon,klev,naero_tot,nbands) :: piz_ae @@ -594,8 +591,5 @@ DO i=1, klon zrho=pplay(i,k)/t_seri(i,k)/RD ! kg/m3 -!CDIR UNROLL=naero_spc mass_temp(i,k,:) = m_allaer(i,k,:) / zrho / 1.e+9 -!RAF zrho -!CDIR UNROLL=naero_spc mass_temp_pi(i,k,:) = m_allaer_pi(i,k,:) / zrho / 1.e+9 zdp1(i,k)=pdel(i,k)/(gravit*delt) ! air mass auxiliary variable --> zdp1 [kg/(m^2 *s)] @@ -653,5 +647,4 @@ -!!CDIR ON_ADB(RH_tab) !CDIR ON_ADB(fact_RH) !CDIR SHORTLOOP @@ -661,5 +654,4 @@ DO k=1, KLEV -!!CDIR ON_ADB(RH_tab) !CDIR ON_ADB(fact_RH) DO i=1, KLON @@ -944,24 +936,24 @@ DO i=1, KLON tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_ASSO4M_phy,inu)+tau_ae(i,k,id_CSSO4M_phy,inu)+ & - tau_ae(i,k,id_ASBCM_phy,inu)+tau_ae(i,k,id_AIBCM_phy,inu)+ & - tau_ae(i,k,id_ASPOMM_phy,inu)+tau_ae(i,k,id_AIPOMM_phy,inu)+ & + tau_ae(i,k,id_ASBCM_phy,inu)+tau_ae(i,k,id_AIBCM_phy,inu)+ & + tau_ae(i,k,id_ASPOMM_phy,inu)+tau_ae(i,k,id_AIPOMM_phy,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)+ tau_ae(i,k,id_CIDUSTM_phy,inu) - tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5) + tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5) - piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASSO4M_phy,inu)*piz_ae(i,k,id_ASSO4M_phy,inu)+ & - tau_ae(i,k,id_CSSO4M_phy,inu)*piz_ae(i,k,id_CSSO4M_phy,inu)+ & - tau_ae(i,k,id_ASBCM_phy,inu)*piz_ae(i,k,id_ASBCM_phy,inu)+ & - tau_ae(i,k,id_AIBCM_phy,inu)*piz_ae(i,k,id_AIBCM_phy,inu)+ & - tau_ae(i,k,id_ASPOMM_phy,inu)*piz_ae(i,k,id_ASPOMM_phy,inu)+ & - tau_ae(i,k,id_AIPOMM_phy,inu)*piz_ae(i,k,id_AIPOMM_phy,inu)+ & - tau_ae(i,k,id_ASSSM_phy,inu)*piz_ae(i,k,id_ASSSM_phy,inu)+ & - tau_ae(i,k,id_CSSSM_phy,inu)*piz_ae(i,k,id_CSSSM_phy,inu)+ & - tau_ae(i,k,id_SSSSM_phy,inu)*piz_ae(i,k,id_SSSSM_phy,inu)+ & - tau_ae(i,k,id_CIDUSTM_phy,inu)*piz_ae(i,k,id_CIDUSTM_phy,inu)) & + piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASSO4M_phy,inu)*piz_ae(i,k,id_ASSO4M_phy,inu)+ & + tau_ae(i,k,id_CSSO4M_phy,inu)*piz_ae(i,k,id_CSSO4M_phy,inu)+ & + tau_ae(i,k,id_ASBCM_phy,inu)*piz_ae(i,k,id_ASBCM_phy,inu)+ & + tau_ae(i,k,id_AIBCM_phy,inu)*piz_ae(i,k,id_AIBCM_phy,inu)+ & + tau_ae(i,k,id_ASPOMM_phy,inu)*piz_ae(i,k,id_ASPOMM_phy,inu)+ & + tau_ae(i,k,id_AIPOMM_phy,inu)*piz_ae(i,k,id_AIPOMM_phy,inu)+ & + tau_ae(i,k,id_ASSSM_phy,inu)*piz_ae(i,k,id_ASSSM_phy,inu)+ & + tau_ae(i,k,id_CSSSM_phy,inu)*piz_ae(i,k,id_CSSSM_phy,inu)+ & + tau_ae(i,k,id_SSSSM_phy,inu)*piz_ae(i,k,id_SSSSM_phy,inu)+ & + tau_ae(i,k,id_CIDUSTM_phy,inu)*piz_ae(i,k,id_CIDUSTM_phy,inu)) & /tau_allaer(i,k,mrfspecies,inu) - piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1) - - cg_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASSO4M_phy,inu)* & + piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1) + + cg_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASSO4M_phy,inu)* & piz_ae(i,k,id_ASSO4M_phy,inu)*cg_ae(i,k,id_ASSO4M_phy,inu)+ & tau_ae(i,k,id_CSSO4M_phy,inu)*piz_ae(i,k,id_CSSO4M_phy,inu)* & @@ -991,31 +983,31 @@ DO k=1, KLEV DO i=1, KLON -!RAF - tau_allaer(i,k,mrfspecies,inu)=tau_ae_pi(i,k,id_ASSO4M_phy,inu)+ & + + tau_allaer(i,k,mrfspecies,inu)=tau_ae_pi(i,k,id_ASSO4M_phy,inu)+ & tau_ae_pi(i,k,id_CSSO4M_phy,inu)+ & - tau_ae_pi(i,k,id_ASBCM_phy,inu)+ & - tau_ae_pi(i,k,id_AIBCM_phy,inu)+ & + tau_ae_pi(i,k,id_ASBCM_phy,inu)+ & + tau_ae_pi(i,k,id_AIBCM_phy,inu)+ & tau_ae_pi(i,k,id_ASPOMM_phy,inu)+ & - tau_ae_pi(i,k,id_AIPOMM_phy,inu)+ & - tau_ae_pi(i,k,id_ASSSM_phy,inu)+ & - tau_ae_pi(i,k,id_CSSSM_phy,inu)+ & - tau_ae_pi(i,k,id_SSSSM_phy,inu)+ & + tau_ae_pi(i,k,id_AIPOMM_phy,inu)+ & + tau_ae_pi(i,k,id_ASSSM_phy,inu)+ & + tau_ae_pi(i,k,id_CSSSM_phy,inu)+ & + tau_ae_pi(i,k,id_SSSSM_phy,inu)+ & tau_ae_pi(i,k,id_CIDUSTM_phy,inu) - tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5) - - piz_allaer(i,k,mrfspecies,inu)=(tau_ae_pi(i,k,id_ASSO4M_phy,inu)*piz_ae(i,k,id_ASSO4M_phy,inu)+ & + tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5) + + piz_allaer(i,k,mrfspecies,inu)=(tau_ae_pi(i,k,id_ASSO4M_phy,inu)*piz_ae(i,k,id_ASSO4M_phy,inu)+ & tau_ae_pi(i,k,id_CSSO4M_phy,inu)*piz_ae(i,k,id_CSSO4M_phy,inu)+ & - tau_ae_pi(i,k,id_ASBCM_phy,inu)*piz_ae(i,k,id_ASBCM_phy,inu)+ & - tau_ae_pi(i,k,id_AIBCM_phy,inu)*piz_ae(i,k,id_AIBCM_phy,inu)+ & + tau_ae_pi(i,k,id_ASBCM_phy,inu)*piz_ae(i,k,id_ASBCM_phy,inu)+ & + tau_ae_pi(i,k,id_AIBCM_phy,inu)*piz_ae(i,k,id_AIBCM_phy,inu)+ & tau_ae_pi(i,k,id_ASPOMM_phy,inu)*piz_ae(i,k,id_ASPOMM_phy,inu)+ & - tau_ae_pi(i,k,id_AIPOMM_phy,inu)*piz_ae(i,k,id_AIPOMM_phy,inu)+ & - tau_ae_pi(i,k,id_ASSSM_phy,inu)*piz_ae(i,k,id_ASSSM_phy,inu)+ & - tau_ae_pi(i,k,id_CSSSM_phy,inu)*piz_ae(i,k,id_CSSSM_phy,inu)+ & - tau_ae_pi(i,k,id_SSSSM_phy,inu)*piz_ae(i,k,id_SSSSM_phy,inu)+ & + tau_ae_pi(i,k,id_AIPOMM_phy,inu)*piz_ae(i,k,id_AIPOMM_phy,inu)+ & + tau_ae_pi(i,k,id_ASSSM_phy,inu)*piz_ae(i,k,id_ASSSM_phy,inu)+ & + tau_ae_pi(i,k,id_CSSSM_phy,inu)*piz_ae(i,k,id_CSSSM_phy,inu)+ & + tau_ae_pi(i,k,id_SSSSM_phy,inu)*piz_ae(i,k,id_SSSSM_phy,inu)+ & tau_ae_pi(i,k,id_CIDUSTM_phy,inu)*piz_ae(i,k,id_CIDUSTM_phy,inu)) & /tau_allaer(i,k,mrfspecies,inu) - piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1) - - cg_allaer(i,k,mrfspecies,inu)=(& + piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1) + + cg_allaer(i,k,mrfspecies,inu)=(& 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)+ & 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)+ & @@ -1036,10 +1028,10 @@ DO k=1, KLEV DO i=1, KLON - tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_ASBCM_phy,inu)+tau_ae(i,k,id_AIBCM_phy,inu) - tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5) - piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASBCM_phy,inu)*piz_ae(i,k,id_ASBCM_phy,inu) & + tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_ASBCM_phy,inu)+tau_ae(i,k,id_AIBCM_phy,inu) + tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5) + piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASBCM_phy,inu)*piz_ae(i,k,id_ASBCM_phy,inu) & +tau_ae(i,k,id_AIBCM_phy,inu)*piz_ae(i,k,id_AIBCM_phy,inu))/ & tau_allaer(i,k,mrfspecies,inu) - piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1) + piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1) 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)& +tau_ae(i,k,id_AIBCM_phy,inu)*piz_ae(i,k,id_AIBCM_phy,inu)*cg_ae(i,k,id_AIBCM_phy,inu))/ & @@ -1053,9 +1045,9 @@ DO i=1, KLON tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_ASSO4M_phy,inu)+tau_ae(i,k,id_CSSO4M_phy,inu) - tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5) + tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5) piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_CSSO4M_phy,inu)*piz_ae(i,k,id_CSSO4M_phy,inu) & +tau_ae(i,k,id_ASSO4M_phy,inu)*piz_ae(i,k,id_ASSO4M_phy,inu))/ & tau_allaer(i,k,mrfspecies,inu) - piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1) + piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1) cg_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_CSSO4M_phy,inu)* & piz_ae(i,k,id_CSSO4M_phy,inu) *cg_ae(i,k,id_CSSO4M_phy,inu)& @@ -1072,9 +1064,9 @@ tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_ASPOMM_phy,inu)+tau_ae(i,k,id_AIPOMM_phy,inu) tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5) - piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASPOMM_phy,inu)*piz_ae(i,k,id_ASPOMM_phy,inu) & + piz_allaer(i,k,mrfspecies,inu)=(tau_ae(i,k,id_ASPOMM_phy,inu)*piz_ae(i,k,id_ASPOMM_phy,inu) & +tau_ae(i,k,id_AIPOMM_phy,inu)*piz_ae(i,k,id_AIPOMM_phy,inu))/ & tau_allaer(i,k,mrfspecies,inu) - piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1) - 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)& + piz_allaer(i,k,mrfspecies,inu)=MAX(piz_allaer(i,k,mrfspecies,inu),0.1) + 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)& +tau_ae(i,k,id_AIPOMM_phy,inu)*piz_ae(i,k,id_AIPOMM_phy,inu)*cg_ae(i,k,id_AIPOMM_phy,inu))/ & (tau_allaer(i,k,mrfspecies,inu)*piz_allaer(i,k,mrfspecies,inu)) @@ -1087,7 +1079,7 @@ DO i=1, KLON tau_allaer(i,k,mrfspecies,inu)=tau_ae(i,k,id_CIDUSTM_phy,inu) - tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5) + tau_allaer(i,k,mrfspecies,inu)=MAX(tau_allaer(i,k,mrfspecies,inu),1e-5) piz_allaer(i,k,mrfspecies,inu)=piz_ae(i,k,id_CIDUSTM_phy,inu) - cg_allaer(i,k,mrfspecies,inu)=cg_ae(i,k,id_CIDUSTM_phy,inu) + cg_allaer(i,k,mrfspecies,inu)=cg_ae(i,k,id_CIDUSTM_phy,inu) ENDDO ENDDO @@ -1135,10 +1127,9 @@ ENDDO ENDDO - inu=1 DO i=1, KLON absvisaer(i)=SUM((1-piz_allaer(i,:,:,inu))*tau_allaer(i,:,:,inu)) - END DO + ENDDO DEALLOCATE(aerosol_name) Index: LMDZ5/trunk/libf/phylmd/aeropt_5wv.F90 =================================================================== --- LMDZ5/trunk/libf/phylmd/aeropt_5wv.F90 (revision 2323) +++ LMDZ5/trunk/libf/phylmd/aeropt_5wv.F90 (revision 2324) @@ -67,6 +67,4 @@ ! REAL, DIMENSION(klon), INTENT(out) :: ai ! POLDER aerosol index -! REAL, DIMENSION(klon,nwave,naero_spc), INTENT(out) :: tausum -! REAL, DIMENSION(klon,klev,nwave,naero_spc), INTENT(out) :: tau REAL, DIMENSION(klon,nwave,naero_tot), INTENT(out) :: tausum REAL, DIMENSION(klon,klev,nwave,naero_tot), INTENT(out) :: tau @@ -626,9 +624,6 @@ DO k=1, klev DO i=1, klon -! IF (t_seri(i,k).EQ.0) stop 'stop aeropt_5wv T ' -! IF (pplay(i,k).EQ.0) stop 'stop aeropt_5wv p ' zrho=pplay(i,k)/t_seri(i,k)/RD ! kg/m3 dh(i,k)=pdel(i,k)/(gravit*zrho) -!CDIR UNROLL=naero_spc mass_temp(i,k,:) = m_allaer(i,k,:) / zrho / 1.e+9 zdp1(i,k)=pdel(i,k)/(gravit*delt) ! air mass auxiliary variable --> zdp1 [kg/(m^2 *s)] @@ -760,9 +755,7 @@ ENDIF -!Bug 21 12 10 AI -! used_tau(spsol)=.TRUE. IF (soluble) then used_tau(spsol)=.TRUE. - ELSE + ELSE used_tau(naero_soluble+spinsol)=.TRUE. ENDIF @@ -866,12 +859,14 @@ DO m=1,naero_spc od550aer(i)=od550aer(i)+tausum(i,2,m) - END DO - END DO + ENDDO + ENDDO + DO i=1, klon od865aer(i)=0. DO m=1,naero_spc od865aer(i)=od865aer(i)+tausum(i,5,m) - END DO - END DO + ENDDO + ENDDO + DO i=1, klon DO k=1, KLEV @@ -879,13 +874,11 @@ DO m=1,naero_spc ec550aer(i,k)=ec550aer(i,k)+tau(i,k,2,m)/dh(i,k) - END DO - END DO - END DO + ENDDO + ENDDO + ENDDO - od550lt1aer(:)=tausum(:,2,id_ASSO4M_phy)+tausum(:,2,id_ASBCM_phy)+tausum(:,2,id_AIBCM_phy)+ & - tausum(:,2,id_ASPOMM_phy)+tausum(:,2,id_AIPOMM_phy)+tausum(:,2,id_ASSSM_phy)+ & - 0.03*tausum(:,2,id_CSSSM_phy)+0.4*tausum(:,2,id_CIDUSTM_phy) - - + od550lt1aer(:)=tausum(:,2,id_ASSO4M_phy)+tausum(:,2,id_ASBCM_phy)+tausum(:,2,id_AIBCM_phy)+ & + tausum(:,2,id_ASPOMM_phy)+tausum(:,2,id_AIPOMM_phy)+tausum(:,2,id_ASSSM_phy)+ & + 0.03*tausum(:,2,id_CSSSM_phy)+0.4*tausum(:,2,id_CIDUSTM_phy) DEALLOCATE(aerosol_name) Index: LMDZ5/trunk/libf/phylmd/readaerosol_optic.F90 =================================================================== --- LMDZ5/trunk/libf/phylmd/readaerosol_optic.F90 (revision 2323) +++ LMDZ5/trunk/libf/phylmd/readaerosol_optic.F90 (revision 2324) @@ -68,6 +68,6 @@ REAL, DIMENSION(klon,klev) :: ssacu_pi REAL, DIMENSION(klon,klev) :: pdel - REAL, DIMENSION(klon,klev,naero_spc) :: m_allaer - REAL, DIMENSION(klon,klev,naero_spc) :: m_allaer_pi !RAF + REAL, DIMENSION(klon,klev,naero_tot) :: m_allaer + REAL, DIMENSION(klon,klev,naero_tot) :: m_allaer_pi !RAF ! REAL, DIMENSION(klon,naero_tot) :: fractnat_allaer !RAF delete?? @@ -156,16 +156,22 @@ m_allaer(:,:,id_AIBCM_phy) = bcins(:,:) ! AIBCM m_allaer(:,:,id_AIPOMM_phy) = pomins(:,:) ! AIPOMM + m_allaer(:,:,id_ASNO3M_phy) = 0.0 + m_allaer(:,:,id_CSNO3M_phy) = 0.0 + m_allaer(:,:,id_CINO3M_phy) = 0.0 !RAF - m_allaer_pi(:,:,1) = bcsol_pi(:,:) ! ASBCM pre-ind - m_allaer_pi(:,:,2) = pomsol_pi(:,:) ! ASPOMM pre-ind - m_allaer_pi(:,:,3) = sulfate_pi(:,:) ! ASSO4M (= SO4) pre-ind - m_allaer_pi(:,:,4) = 0. ! CSSO4M pre-ind - m_allaer_pi(:,:,5) = sssupco_pi(:,:) ! SSSSM pre-ind - m_allaer_pi(:,:,6) = sscoarse_pi(:,:) ! CSSSM pre-ind - m_allaer_pi(:,:,7) = ssacu_pi(:,:) ! ASSSM pre-ind - m_allaer_pi(:,:,8) = cidust_pi(:,:) ! CIDUSTM pre-ind - m_allaer_pi(:,:,9) = bcins_pi(:,:) ! AIBCM pre-ind - m_allaer_pi(:,:,10) = pomins_pi(:,:) ! AIPOMM pre-ind + m_allaer_pi(:,:,id_ASBCM_phy) = bcsol_pi(:,:) ! ASBCM pre-ind + m_allaer_pi(:,:,id_ASPOMM_phy) = pomsol_pi(:,:) ! ASPOMM pre-ind + m_allaer_pi(:,:,id_ASSO4M_phy) = sulfate_pi(:,:) ! ASSO4M (= SO4) pre-ind + m_allaer_pi(:,:,id_CSSO4M_phy) = 0. ! CSSO4M pre-ind + m_allaer_pi(:,:,id_SSSSM_phy) = sssupco_pi(:,:) ! SSSSM pre-ind + m_allaer_pi(:,:,id_ASSSM_phy) = sscoarse_pi(:,:) ! CSSSM pre-ind + m_allaer_pi(:,:,id_CIDUSTM_phy) = ssacu_pi(:,:) ! ASSSM pre-ind + m_allaer_pi(:,:,id_AIBCM_phy) = cidust_pi(:,:) ! CIDUSTM pre-ind + m_allaer_pi(:,:,id_AIBCM_phy) = bcins_pi(:,:) ! AIBCM pre-ind + m_allaer_pi(:,:,id_AIPOMM_phy) = pomins_pi(:,:) ! AIPOMM pre-ind + m_allaer_pi(:,:,id_ASNO3M_phy) = 0.0 + m_allaer_pi(:,:,id_CSNO3M_phy) = 0.0 + m_allaer_pi(:,:,id_CINO3M_phy) = 0.0 ! @@ -212,5 +218,5 @@ ! Diagnostics calculation for CMIP5 protocol sconcso4(:)=m_allaer(:,1,id_ASSO4M_phy)*1.e-9 -! sconcno3(:)=m_allaer(:,1,id_ASNO3M_phy)*1.e-9 + sconcno3(:)=m_allaer(:,1,id_ASNO3M_phy)*1.e-9 sconcoa(:)=(m_allaer(:,1,id_ASPOMM_phy)+m_allaer(:,1,id_AIPOMM_phy))*1.e-9 sconcbc(:)=(m_allaer(:,1,id_ASBCM_phy)+m_allaer(:,1,id_AIBCM_phy))*1.e-9 @@ -218,5 +224,5 @@ sconcdust(:)=m_allaer(:,1,id_CIDUSTM_phy)*1.e-9 concso4(:,:)=m_allaer(:,:,id_ASSO4M_phy)*1.e-9 -! concno3(:,:)=m_allaer(:,:,id_ASNO3M_phy)*1.e-9 + concno3(:,:)=m_allaer(:,:,id_ASNO3M_phy)*1.e-9 concoa(:,:)=(m_allaer(:,:,id_ASPOMM_phy)+m_allaer(:,:,id_AIPOMM_phy))*1.e-9 concbc(:,:)=(m_allaer(:,:,id_ASBCM_phy)+m_allaer(:,:,id_AIBCM_phy))*1.e-9