From 033f247d8d25dd0ad8d5eba82fdfae14eb8dca21 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Tue, 16 Feb 2021 15:32:56 +0100
Subject: [PATCH] Philippe 16/02/2021: bugfix: GMASK3D_RELAX was not computed
 if OHORELAX_UVWTH=F and needed by other variables

(cherry picked from commit aede627c644b55ea93cd6ff8d9c57bf93060bcbc)
---
 src/MNH/relaxation.f90 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/MNH/relaxation.f90 b/src/MNH/relaxation.f90
index 13fcc955d..0d5bde86d 100644
--- a/src/MNH/relaxation.f90
+++ b/src/MNH/relaxation.f90
@@ -256,6 +256,7 @@ END MODULE MODI_RELAXATION
 !!                 11/2011 (C.Lac)       Adaptation to FIT temporal scheme
 !!                 J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
 !  P. Wautelet 12/02/2021: bugfix: do not call budgets for all SV budgets if LRELAX2FW_ION=T
+!  P. Wautelet 16/02/2021: bugfix: GMASK3D_RELAX was not computed if OHORELAX_UVWTH=F and needed by other variables
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
@@ -566,6 +567,10 @@ IF ( ANY(GHORELAXR) .OR. ANY(GHORELAXSV) .OR. ANY(OHORELAX_SV) &
 !     ZKHW(:,:,JK) = PKWRELAX(:,:)
 !   END DO
 !  END IF
+!
+  DO JK=1,IKU
+    GMASK3D_RELAX(:,:,JK)=OMASK_RELAX(:,:)
+  END DO
 ENDIF
 !
 !
@@ -575,10 +580,6 @@ ENDIF
 !
 ! special treatment is needed to expand LB for U and V because of the C grid 
 IF ( OHORELAX_UVWTH ) THEN
-!
-  DO JK=1,IKU
-    GMASK3D_RELAX(:,:,JK)=OMASK_RELAX(:,:)
-  END DO
 !
   IDIMLB = SIZE(PLBXUM,1)
   IF ( IDIMLB /= 0) THEN
-- 
GitLab