diff --git a/src/MNH/dust_filter.f90 b/src/MNH/dust_filter.f90 index 71176c1e04bf52a55ba3e209defbb50fb6315fab..e0eb6d27abcbcf0eee307daaa67e055ddd122a21 100644 --- a/src/MNH/dust_filter.f90 +++ b/src/MNH/dust_filter.f90 @@ -163,7 +163,6 @@ DO JN=1,NMODE_DST ZM(:,:,:,NM6(JN)) = ZM(:,:,:,NM0(JN)) * (ZINIRADIUS(JN)**6) * & EXP(18 *(LOG(ZINISIGMA(JN)))**2) - IF (LVARSIG) THEN WHERE ((ZM(:,:,:,NM0(JN)) .LT. ZMMIN(NM0(JN))).OR.& (ZM(:,:,:,NM3(JN)) .LT. ZMMIN(NM3(JN))).OR.& (ZM(:,:,:,NM6(JN)) .LT. ZMMIN(NM6(JN)))) @@ -172,15 +171,6 @@ DO JN=1,NMODE_DST ZM(:,:,:,NM6(JN)) = ZMMIN(NM6(JN)) END WHERE - ELSE IF (.NOT.(LRGFIX_DST)) THEN - - WHERE ((ZM(:,:,:,NM0(JN)) .LT. ZMMIN(NM0(JN))).OR.& - (ZM(:,:,:,NM3(JN)) .LT. ZMMIN(NM3(JN)))) - ZM(:,:,:,NM0(JN)) = ZMMIN(NM0(JN)) - ZM(:,:,:,NM3(JN)) = ZMMIN(NM3(JN)) - END WHERE - ENDIF - ! return to concentration #/m3 => (#/molec_{air} IF (LVARSIG) THEN PSV(:,:,:,1+(JN-1)*3) = ZM(:,:,:,NM0(JN)) * XMD / & diff --git a/src/MNH/mode_dust_psd.f90 b/src/MNH/mode_dust_psd.f90 index 016abf4f5c41b1bdd3d86c030a9dfecfbdda06df..4c41122319591ef0eb5ae60361118a8d771c6747 100644 --- a/src/MNH/mode_dust_psd.f90 +++ b/src/MNH/mode_dust_psd.f90 @@ -260,15 +260,15 @@ DO JN=1,NMODE_DST * PRHODREF(:,:,:) !==>#/m3 ! Limit concentration to minimum values -! WHERE ((ZM(:,:,:,NM0(JN)) < ZMMIN(NM0(JN)) ).OR. & -! (ZM(:,:,:,NM3(JN)) < ZMMIN(NM3(JN)) )) -! ZM(:,:,:,NM0(JN)) = ZMMIN(NM0(JN)) -! ZM(:,:,:,NM3(JN)) = ZMMIN(NM3(JN)) -! PSVT(:,:,:,1+(JN-1)*2) = ZM(:,:,:,NM0(JN)) * XMD / & -! (XAVOGADRO * PRHODREF(:,:,:) ) -! PSVT(:,:,:,2+(JN-1)*2) = ZM(:,:,:,NM3(JN)) * XMD * XPI * 4./3. * ZRHOI / & -! (ZMI*PRHODREF(:,:,:)*XM3TOUM3) -! ENDWHERE + WHERE ((ZM(:,:,:,NM0(JN)) < ZMMIN(NM0(JN)) ).OR. & + (ZM(:,:,:,NM3(JN)) < ZMMIN(NM3(JN)) )) + ZM(:,:,:,NM0(JN)) = ZMMIN(NM0(JN)) + ZM(:,:,:,NM3(JN)) = ZMMIN(NM3(JN)) + PSVT(:,:,:,1+(JN-1)*2) = ZM(:,:,:,NM0(JN)) * XMD / & + (XAVOGADRO * PRHODREF(:,:,:) ) + PSVT(:,:,:,2+(JN-1)*2) = ZM(:,:,:,NM3(JN)) * XMD * XPI * 4./3. * ZRHOI / & + (ZMI*PRHODREF(:,:,:)*XM3TOUM3) + ENDWHERE END IF !