From 59d5bd2fa52ae48d27adcb178362d5e61622a5f1 Mon Sep 17 00:00:00 2001 From: Quentin Rodier <quentin.rodier@meteo.fr> Date: Thu, 6 Jun 2019 10:27:12 +0200 Subject: [PATCH] Soline B 6/06/2019: minor correction on sea salt: deposition and sea salt order (cherry picked from commit 9d331e85eba3d4f72cccfaf15f440d45475d70b0) --- src/SURFEX/coupling_sltn.F90 | 12 ++++++------ src/SURFEX/mode_dslt_surf.F90 | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/SURFEX/coupling_sltn.F90 b/src/SURFEX/coupling_sltn.F90 index 284fc0935..4437552ac 100644 --- a/src/SURFEX/coupling_sltn.F90 +++ b/src/SURFEX/coupling_sltn.F90 @@ -297,21 +297,21 @@ DO JN = 1, JPMODE_SLT IF (LVARSIG_SLT) THEN ! cas 3 moment PSFSLT(:,2+(JN-1)*3) = ZSFSLT_MDE(:,JORDER_SLT(JN)) & - * ((SLT%XEMISRADIUS_SLT(JORDER_SLT(JN))**3) & - * EXP(4.5 * LOG(SLT%XEMISSIG_SLT(JORDER_SLT(JN)))**2)) & + * ((SLT%XEMISRADIUS_SLT(JN)**3) & + * EXP(4.5 * LOG(SLT%XEMISSIG_SLT(JN))**2)) & * ZCONVERTFACM3_SLT ELSEIF (LRGFIX_SLT) THEN ! cas 1 moment PSFSLT(:,JN) = ZSFSLT_MDE(:,JORDER_SLT(JN)) & - * (SLT%XEMISRADIUS_SLT(JORDER_SLT(JN))**3) & - * EXP(4.5 * LOG(SLT%XEMISSIG_SLT(JORDER_SLT(JN)))**2) & + * (SLT%XEMISRADIUS_SLT(JN)**3) & + * EXP(4.5 * LOG(SLT%XEMISSIG_SLT(JN))**2) & * ZCONVERTFACM3_SLT ELSE ! cas 2 moments PSFSLT(:,2+(JN-1)*2) = ZSFSLT_MDE(:,JORDER_SLT(JN)) & - * ((SLT%XEMISRADIUS_SLT(JORDER_SLT(JN))**3) & - * EXP(4.5 * LOG(SLT%XEMISSIG_SLT(JORDER_SLT(JN)))**2)) & + * ((SLT%XEMISRADIUS_SLT(JN)**3) & + * EXP(4.5 * LOG(SLT%XEMISSIG_SLT(JN))**2)) & * ZCONVERTFACM3_SLT ! -- PIERRE / MARINE SSA - MODIF -- END IF diff --git a/src/SURFEX/mode_dslt_surf.F90 b/src/SURFEX/mode_dslt_surf.F90 index c5e6d2fab..408f179f1 100644 --- a/src/SURFEX/mode_dslt_surf.F90 +++ b/src/SURFEX/mode_dslt_surf.F90 @@ -301,7 +301,7 @@ DO JN=1,SIZE(KM0) ZSIGMA(:) = PEMISSIG(JN) ZM(:,J0) = ZM(:,J3) / & - ((PEMISRADIUS(KM3(JN))**3)*EXP(4.5 * LOG(ZSIGMA(:))**2)) + ((PEMISRADIUS(JN)**3)*EXP(4.5 * LOG(ZSIGMA(:))**2)) ELSE ! compute M6 from M0, M3 and SIGMA -- GitLab