From 2037bb377759dfa655a1961e9fc616b8196c8f5f Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Wed, 9 Feb 2022 10:12:59 +0100
Subject: [PATCH] Philippe 09/02/2022: profilers: add message when some
variables not computed + bugfix: put values in variables in this case + move
some operations outside a do loop
(cherry picked from commit f78bf485f2a476d7a2167eee9abe7d3c05bb4860)
---
src/MNH/profilern.f90 | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/MNH/profilern.f90 b/src/MNH/profilern.f90
index c1eabd5e1..cd276826f 100644
--- a/src/MNH/profilern.f90
+++ b/src/MNH/profilern.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2002-2021 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2002-2022 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
@@ -85,6 +85,9 @@ END MODULE MODI_PROFILER_n
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
! P. Wautelet 13/09/2019: budget: simplify and modernize date/time management
! M. Taufour 05/07/2021: modify RARE for hydrometeors containing ice and add bright band calculation for RARE
+! P. Wautelet 09/02/2022: add message when some variables not computed
+! + bugfix: put values in variables in this case
+! + move some operations outside a do loop
! --------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -103,6 +106,7 @@ USE MODD_TIME, only: tdtexp
USE MODD_TIME_n, only: tdtcur
!
USE MODE_ll
+USE MODE_MSG
!
USE MODI_GPS_ZENITH_GRID
USE MODI_LIDAR
@@ -515,6 +519,14 @@ IF (GSTORE) THEN
TPROFILER%ZTD(IN,I)= ZZTD_PROFILER
TPROFILER%ZWD(IN,I)= ZZWD_PROFILER
TPROFILER%ZHD(IN,I)= ZZHD_PROFILER
+ ELSE
+ CMNHMSG(1) = 'altitude of profiler ' // TRIM( TPROFILER%NAME(I) ) // ' is too far from orography'
+ CMNHMSG(2) = 'some variables are therefore not computed (IWV, ZTD, ZWD, ZHD)'
+ CALL PRINT_MSG( NVERB_WARNING, 'GEN', 'PROFILER_n' )
+ TPROFILER%IWV(IN,I)= XUNDEF
+ TPROFILER%ZTD(IN,I)= XUNDEF
+ TPROFILER%ZWD(IN,I)= XUNDEF
+ TPROFILER%ZHD(IN,I)= XUNDEF
END IF
TPROFILER%ZON (IN,:,I) = ZU_PROFILER(:) * COS(ZGAM) + ZV_PROFILER(:) * SIN(ZGAM)
TPROFILER%MER (IN,:,I) = - ZU_PROFILER(:) * SIN(ZGAM) + ZV_PROFILER(:) * COS(ZGAM)
@@ -886,10 +898,7 @@ IF (GSTORE) THEN
CALL DISTRIBUTE_PROFILER(TPROFILER%CRARE(IN,JK,I))
CALL DISTRIBUTE_PROFILER(TPROFILER%CRARE_ATT(IN,JK,I))
CALL DISTRIBUTE_PROFILER(TPROFILER%CIZ(IN,JK,I))
- CALL DISTRIBUTE_PROFILER(TPROFILER%IWV(IN,I))
- CALL DISTRIBUTE_PROFILER(TPROFILER%ZTD(IN,I))
- CALL DISTRIBUTE_PROFILER(TPROFILER%ZHD(IN,I))
- CALL DISTRIBUTE_PROFILER(TPROFILER%ZWD(IN,I))
+
!
IF (LDIAG_IN_RUN) CALL DISTRIBUTE_PROFILER(TPROFILER%TKE_DISS(IN,JK,I))
!
@@ -901,6 +910,11 @@ IF (GSTORE) THEN
END DO
IF (SIZE(PTKE)>0) CALL DISTRIBUTE_PROFILER(TPROFILER%TKE (IN,JK,I))
ENDDO
+
+ CALL DISTRIBUTE_PROFILER(TPROFILER%IWV(IN,I))
+ CALL DISTRIBUTE_PROFILER(TPROFILER%ZTD(IN,I))
+ CALL DISTRIBUTE_PROFILER(TPROFILER%ZHD(IN,I))
+ CALL DISTRIBUTE_PROFILER(TPROFILER%ZWD(IN,I))
ENDDO
!
END IF
--
GitLab