From 8d99dfcf0530ff3a301638e5da952ac903e7810a Mon Sep 17 00:00:00 2001
From: Quentin Rodier <quentin.rodier@meteo.fr>
Date: Wed, 30 Jun 2021 17:35:33 +0200
Subject: [PATCH] Quentin 30/06/2021: bugfix OCEAN move constants change in
 ini_modeln to ensure change in every sub-model n

---
 src/MNH/ini_modeln.f90 |  6 ++++++
 src/MNH/init_mnh.f90   | 10 +---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/MNH/ini_modeln.f90 b/src/MNH/ini_modeln.f90
index b58702a54..ee46c558e 100644
--- a/src/MNH/ini_modeln.f90
+++ b/src/MNH/ini_modeln.f90
@@ -566,6 +566,12 @@ IF (CCLOUD == 'LIMA') THEN
   LHORELAX_SVC1R3=LHORELAX_SVLIMA
 END IF
 !
+! UPDATE CONSTANTS FOR OCEAN MODEL
+IF (LOCEAN) THEN
+  XP00=XP00OCEAN
+  XTH00=XTH00OCEAN
+END IF
+!
 !
 NULLIFY(TZINITHALO2D_ll)
 NULLIFY(TZINITHALO3D_ll)
diff --git a/src/MNH/init_mnh.f90 b/src/MNH/init_mnh.f90
index 9fe0836d0..d2d7b1949 100644
--- a/src/MNH/init_mnh.f90
+++ b/src/MNH/init_mnh.f90
@@ -76,8 +76,7 @@
 !*       0.    DECLARATIONS
 !              ------------
 USE MODD_CONF
-USE MODD_CST,   ONLY: XP00, XTH00, XP00OCEAN, XTH00OCEAN
-USE MODD_DYN_n, ONLY: CPRESOPT, NITR, LOCEAN ! only for spawning purpose
+USE MODD_DYN_n, ONLY: CPRESOPT, NITR ! only for spawning purpose
 USE MODD_IO,    ONLY: TFILE_OUTPUTLISTING, TPTR2FILE
 USE MODD_LBC_n, ONLY: CLBCX,CLBCY   ! only for spawning purpose
 USE MODD_LUNIT
@@ -181,13 +180,6 @@ END IF
 !
 IF (CPROGRAM=='DIAG') CALL RESET_EXSEG()
 !
-! UPDATE CONSTANTS FOR OCEAN MODEL
-DO JMI=1,JPMODELMAX
-  IF (LOCEAN) THEN
-    XP00=XP00OCEAN
-    XTH00=XTH00OCEAN
-  END IF
-END DO
 !-------------------------------------------------------------------------------
 !
 !
-- 
GitLab