P.Tulet 4/5/18 : bug

src/SURFEX/ch_aer_emission.F90

@@ -258,30 +258,7 @@ PFLUX(:,I_CH_M0j) = ZFM(:,4) * 1E-6 / (ZDEN2MOL * PRHODREF(:))
 IF (LVARSIGI) PFLUX(:,I_CH_M6i) = ZFM(:,3) / (ZDEN2MOL * PRHODREF(:))
 IF (LVARSIGJ) PFLUX(:,I_CH_M6j) = ZFM(:,6) / (ZDEN2MOL * PRHODREF(:))
 !
-! aerosol phase conversion kg/kg.m.s-1 into ppp.m.s-1
-PFLUX(:,I_CH_SO4i) = PFLUX(:,I_CH_SO4i) * XMD / (ZMI(JP_AER_SO4)*1E-3)
-PFLUX(:,I_CH_SO4j) = PFLUX(:,I_CH_SO4j) * XMD / (ZMI(JP_AER_SO4)*1E-3)
-PFLUX(:,I_CH_NO3i) = PFLUX(:,I_CH_NO3i) * XMD / (ZMI(JP_AER_NO3)*1E-3)
-PFLUX(:,I_CH_NO3j) = PFLUX(:,I_CH_NO3j) * XMD / (ZMI(JP_AER_NO3)*1E-3)
-PFLUX(:,I_CH_NH3i) = PFLUX(:,I_CH_NH3i) * XMD / (ZMI(JP_AER_NH3)*1E-3)
-PFLUX(:,I_CH_NH3j) = PFLUX(:,I_CH_NH3j) * XMD / (ZMI(JP_AER_NH3)*1E-3)
-PFLUX(:,I_CH_H2Oi) = PFLUX(:,I_CH_H2Oi) * XMD / (ZMI(JP_AER_H2O)*1E-3)
-PFLUX(:,I_CH_H2Oj) = PFLUX(:,I_CH_H2Oj) * XMD / (ZMI(JP_AER_H2O)*1E-3)
-!
-PFLUX(:,I_CH_OCi) = PFLUX(:,I_CH_OCi) * XMD / (ZMI(JP_AER_OC)*1E-3)
-PFLUX(:,I_CH_OCj) = PFLUX(:,I_CH_OCj) * XMD / (ZMI(JP_AER_OC)*1E-3)
-PFLUX(:,I_CH_BCi) = PFLUX(:,I_CH_BCi) * XMD / (ZMI(JP_AER_BC)*1E-3)
-PFLUX(:,I_CH_BCj) = PFLUX(:,I_CH_BCj) * XMD / (ZMI(JP_AER_BC)*1E-3)
-PFLUX(:,I_CH_DSTi) = PFLUX(:,I_CH_DSTi) * XMD / (ZMI(JP_AER_DST)*1E-3)
-PFLUX(:,I_CH_DSTj) = PFLUX(:,I_CH_DSTj) * XMD / (ZMI(JP_AER_DST)*1E-3)
-!
-! then conversion in  molecules.m-2.s-1
-PFLUX(:,I_CH_M0i) = PFLUX(:,I_CH_M0i) * ZCONVERSION(:)
-PFLUX(:,I_CH_M0j) = PFLUX(:,I_CH_M0j) * ZCONVERSION(:)
-!
-IF (LVARSIGI) PFLUX(:,I_CH_M6i) = PFLUX(:,I_CH_M6i) * ZCONVERSION(:) 
-IF (LVARSIGJ) PFLUX(:,I_CH_M6j) = PFLUX(:,I_CH_M6j) * ZCONVERSION(:)
-!
+! aerosol phase conversion kg/kg.m.s-1 into molecules.m-2.s-1
 PFLUX(:,I_CH_SO4i) = PFLUX(:,I_CH_SO4i) * ZCONVERSION(:) / (ZMI(JP_AER_SO4)*1E-3)
 PFLUX(:,I_CH_SO4j) = PFLUX(:,I_CH_SO4j) * ZCONVERSION(:) / (ZMI(JP_AER_SO4)*1E-3)
 PFLUX(:,I_CH_NO3i) = PFLUX(:,I_CH_NO3i) * ZCONVERSION(:) / (ZMI(JP_AER_NO3)*1E-3)
@@ -290,13 +267,22 @@ PFLUX(:,I_CH_NH3i) = PFLUX(:,I_CH_NH3i) * ZCONVERSION(:) / (ZMI(JP_AER_NH3)*1E-3
 PFLUX(:,I_CH_NH3j) = PFLUX(:,I_CH_NH3j) * ZCONVERSION(:) / (ZMI(JP_AER_NH3)*1E-3)
 PFLUX(:,I_CH_H2Oi) = PFLUX(:,I_CH_H2Oi) * ZCONVERSION(:) / (ZMI(JP_AER_H2O)*1E-3)
 PFLUX(:,I_CH_H2Oj) = PFLUX(:,I_CH_H2Oj) * ZCONVERSION(:) / (ZMI(JP_AER_H2O)*1E-3)
-PFLUX(:,I_CH_OCi) = PFLUX(:,I_CH_OCi)   * ZCONVERSION(:) / (ZMI(JP_AER_OC)*1E-3)
-PFLUX(:,I_CH_OCj) = PFLUX(:,I_CH_OCj)   * ZCONVERSION(:) / (ZMI(JP_AER_OC)*1E-3)
-PFLUX(:,I_CH_BCi) = PFLUX(:,I_CH_BCi)   * ZCONVERSION(:) / (ZMI(JP_AER_BC)*1E-3)
-PFLUX(:,I_CH_BCj) = PFLUX(:,I_CH_BCj)   * ZCONVERSION(:) / (ZMI(JP_AER_BC)*1E-3)
+!
+PFLUX(:,I_CH_OCi) = PFLUX(:,I_CH_OCi) * ZCONVERSION(:) / (ZMI(JP_AER_OC)*1E-3)
+PFLUX(:,I_CH_OCj) = PFLUX(:,I_CH_OCj) * ZCONVERSION(:) / (ZMI(JP_AER_OC)*1E-3)
+PFLUX(:,I_CH_BCi) = PFLUX(:,I_CH_BCi) * ZCONVERSION(:) / (ZMI(JP_AER_BC)*1E-3)
+PFLUX(:,I_CH_BCj) = PFLUX(:,I_CH_BCj) * ZCONVERSION(:) / (ZMI(JP_AER_BC)*1E-3)
 PFLUX(:,I_CH_DSTi) = PFLUX(:,I_CH_DSTi) * ZCONVERSION(:) / (ZMI(JP_AER_DST)*1E-3)
 PFLUX(:,I_CH_DSTj) = PFLUX(:,I_CH_DSTj) * ZCONVERSION(:) / (ZMI(JP_AER_DST)*1E-3)
 !
+! conversion M0 and M6  ppp.m.s-1 into  molecules.m-2.s-1
+PFLUX(:,I_CH_M0i) = PFLUX(:,I_CH_M0i) * ZCONVERSION(:)
+PFLUX(:,I_CH_M0j) = PFLUX(:,I_CH_M0j) * ZCONVERSION(:)
+!
+IF (LVARSIGI) PFLUX(:,I_CH_M6i) = PFLUX(:,I_CH_M6i) * ZCONVERSION(:) 
+IF (LVARSIGJ) PFLUX(:,I_CH_M6j) = PFLUX(:,I_CH_M6j) * ZCONVERSION(:)
+!
+!
 IF (LHOOK) CALL DR_HOOK('CH_AER_EMISSION',1,ZHOOK_HANDLE)
 !
 END SUBROUTINE CH_AER_EMISSION