From 020950019fb60a028335a3fd08f166f1921e07b2 Mon Sep 17 00:00:00 2001
From: Juan Escobar <escj@aero.obs-mip.fr>
Date: Thu, 13 Feb 2020 18:33:44 +0100
Subject: [PATCH] Juan 12/02/2020: For DIAG + retrotraj , add option to
increase NHALO in NAM_CONF_DIAG
---
src/MNH/reset_exseg.f90 | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/MNH/reset_exseg.f90 b/src/MNH/reset_exseg.f90
index ba9b61d89..3b9415599 100644
--- a/src/MNH/reset_exseg.f90
+++ b/src/MNH/reset_exseg.f90
@@ -57,6 +57,7 @@ END MODULE MODI_RESET_EXSEG
!! Modifications 04/06/02 (P Jabouille) reset radiation and convective options
!! 02/2018 Q.Libois ECRAD
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
+!! J.Escobar : 11/02/2020 : for retrotrajectories in // , reset NHALO >> 1 if needed from NAM_CONF_DIAG
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -77,6 +78,10 @@ USE MODN_PARAM_KAFR_n
USE MODN_PARAM_RAD_n
USE MODN_PARAM_ECRAD_n
!
+USE MODD_CONF, ONLY: NHALO
+!
+USE MODD_VAR_ll, ONLY : IP
+!
IMPLICIT NONE
!
!
@@ -93,6 +98,8 @@ INTEGER :: IGRID ! IGRID : grid indicator
INTEGER :: ILENCH ! ILENCH : length of comment string
TYPE(TFILEDATA),POINTER :: TZNMLFILE! Namelist file
!
+NAMELIST/NAM_CONF_DIAG/NHALO
+!
!-------------------------------------------------------------------------------
!
!* 1. OPENING NAMELIST FILE
@@ -117,7 +124,7 @@ IF (NCONV_KF>=0) THEN
IF (GFOUND) THEN
CALL INIT_NAM_PARAM_KAFRn
READ(UNIT=ILUNAM,NML=NAM_PARAM_KAFRN)
- PRINT*, ' namelist NAM_PARAM_KAFRN read'
+ IF ( IP == 1 ) PRINT*, ' namelist NAM_PARAM_KAFRN read'
END IF
IF (LUSERV) THEN
LDIAGCONV=.TRUE.
@@ -131,7 +138,7 @@ IF (NCONV_KF>=0) THEN
END IF
END IF
!
-PRINT*,'RESET_EXSEG OUTPUT: NCONV_KF=',NCONV_KF,' CDCONV=',CDCONV,' CGETCONV=',CGETCONV
+IF ( IP == 1 ) PRINT*,'RESET_EXSEG OUTPUT: NCONV_KF=',NCONV_KF,' CDCONV=',CDCONV,' CGETCONV=',CGETCONV
!
!-------------------------------------------------------------------------------
!
@@ -152,7 +159,7 @@ IF(NRAD_3D>=1) THEN
CALL INIT_NAM_PARAM_RADn
READ(UNIT=ILUNAM,NML=NAM_PARAM_RADN)
CALL UPDATE_NAM_PARAM_RADn
- PRINT*, ' namelist NAM_PARAM_RADN read'
+ IF ( IP == 1 ) PRINT*, ' namelist NAM_PARAM_RADN read'
END IF
#ifdef MNH_ECRAD
CALL POSNAM(ILUNAM,'NAM_PARAM_ECRADN',GFOUND)
@@ -160,7 +167,7 @@ IF(NRAD_3D>=1) THEN
CALL INIT_NAM_PARAM_EcRADn
READ(UNIT=ILUNAM,NML=NAM_PARAM_ECRADN)
CALL UPDATE_NAM_PARAM_ECRADn
- PRINT*, ' namelist NAM_PARAM_ECRADN read'
+ IF ( IP == 1 ) PRINT*, ' namelist NAM_PARAM_ECRADN read'
END IF
#endif
ENDIF
@@ -175,7 +182,7 @@ IF(LEN_TRIM(CRAD_SAT) /= 0) THEN
CRAD='ECMW'
END IF
!
-PRINT*,'RESET_EXSEG OUTPUT: NRAD_3D =',NRAD_3D,' CRAD =',CRAD,' CGETRAD =',CGETRAD
+IF ( IP == 1 ) PRINT*,'RESET_EXSEG OUTPUT: NRAD_3D =',NRAD_3D,' CRAD =',CRAD,' CGETRAD =',CGETRAD
!
!-------------------------------------------------------------------------------
!
@@ -184,8 +191,17 @@ PRINT*,'RESET_EXSEG OUTPUT: NRAD_3D =',NRAD_3D,' CRAD =',CRAD,' CGETRAD =',CGETR
!
IF (LUSECHEM .AND. .NOT.LCHEMDIAG) LUSECHEM =.FALSE.
!
-PRINT*,'RESET_EXSEG OUTPUT: LUSECHEM =',LUSECHEM,' LCHEMDIAG =',LCHEMDIAG
-PRINT*,' '
+IF ( IP == 1 ) PRINT*,'RESET_EXSEG OUTPUT: LUSECHEM =',LUSECHEM,' LCHEMDIAG =',LCHEMDIAG
+IF ( IP == 1 ) PRINT*,' '
+!
+!-------------------------------------------------------------------------------
+!
+!* 5. For retrotrajectories in // , reset NHALO >> 1 if needed from NAM_CONF_DIAG
+! ---------------------------------------------------
+CALL POSNAM(ILUNAM,'NAM_CONF_DIAG',GFOUND)
+IF (GFOUND) THEN
+ READ(UNIT=ILUNAM,NML=NAM_CONF_DIAG)
+END IF
!
!-------------------------------------------------------------------------------
!
--
GitLab