From 48a5a86dc5c0e0d4725a835283972e73b27b6e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Riette?= <sebastien.riette@meteo.fr>
Date: Tue, 28 Nov 2023 11:09:50 +0100
Subject: [PATCH] S. Riette 28 Nov 2023: #ifdef modified in
mode_ice4_sedimentation_split.F90 to ease parsing
---
.../micro/mode_ice4_sedimentation_split.F90 | 21 ++++++++++++-------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/common/micro/mode_ice4_sedimentation_split.F90 b/src/common/micro/mode_ice4_sedimentation_split.F90
index 6fa50a842..19baa141b 100644
--- a/src/common/micro/mode_ice4_sedimentation_split.F90
+++ b/src/common/micro/mode_ice4_sedimentation_split.F90
@@ -388,11 +388,22 @@ DO WHILE (ZANYREMAINT)
ENDIF
ENDDO
ENDDO
-#ifdef REPRO48
-#else
ELSEIF(KSPE==5) THEN
! ******* for snow
ZWSED(:,:) = 0.
+#ifdef REPRO48
+ !The following lines must be kept equal to the computation in the general case ("for other species" case below)
+ ZFSED=ICEP%XFSEDS
+ ZEXSED=ICEP%XEXSEDS
+ DO JK = IKTB,IKTE
+ DO JIJ = IIJB,IIJE
+ IF(PRXT(JIJ,JK)>ICED%XRTMIN(KSPE) .AND. ZREMAINT(JIJ)>0.) THEN
+ ZWSED(JIJ, JK) = ZFSED * PRXT(JIJ, JK)**ZEXSED &
+ & * PRHODREF(JIJ, JK)**(ZEXSED-ICED%XCEXVT)
+ ENDIF
+ ENDDO
+ ENDDO
+#else
DO JK = IKTB,IKTE
DO JIJ = IIJB,IIJE
IF(PRXT(JIJ,JK)> ICED%XRTMIN(KSPE) .AND. ZREMAINT(JIJ)>0.) THEN
@@ -419,12 +430,6 @@ DO WHILE (ZANYREMAINT)
CASE(3)
ZFSED=ICEP%XFSEDR
ZEXSED=ICEP%XEXSEDR
-#ifdef REPRO48
- CASE(5)
- ZFSED=ICEP%XFSEDS
- ZEXSED=ICEP%XEXSEDS
-#else
-#endif
CASE(6)
ZFSED=ICEP%XFSEDG
ZEXSED=ICEP%XEXSEDG
--
GitLab