From 52d9436bb971d925de6b64cb2395f8e0435a4b35 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Thu, 18 Feb 2021 11:23:06 +0100
Subject: [PATCH] Philippe 18/02/2021: minor small improvements
---
src/MNH/advection_metsv.f90 | 2 +-
src/MNH/advecuvw_rk.f90 | 3 +--
src/MNH/anel_balancen.f90 | 6 +-----
src/MNH/budget.f90 | 8 +++++---
src/MNH/contrav.f90 | 4 +---
src/MNH/ion_drift.f90 | 6 +++---
6 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/src/MNH/advection_metsv.f90 b/src/MNH/advection_metsv.f90
index a585c3f99..5426d3bde 100644
--- a/src/MNH/advection_metsv.f90
+++ b/src/MNH/advection_metsv.f90
@@ -464,7 +464,7 @@ END IF
ZTSTEP_PPM = PTSTEP / REAL(KSPLIT)
!
!
-!* 2.4 normalized contravariant components for splitted PPM time-step
+!* 2.4 normalized contravariant components for split PPM time-step
!
ZRUCPPM = ZRUCPPM*ZTSTEP_PPM
ZRVCPPM = ZRVCPPM*ZTSTEP_PPM
diff --git a/src/MNH/advecuvw_rk.f90 b/src/MNH/advecuvw_rk.f90
index 4bc7c2f27..79168aa8d 100644
--- a/src/MNH/advecuvw_rk.f90
+++ b/src/MNH/advecuvw_rk.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2021 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.
@@ -194,7 +194,6 @@ TYPE(LIST_ll), POINTER :: TZFIELDS0_ll ! list of fields to exchange
TYPE(LIST_ll), POINTER :: TZFIELDS4_ll ! list of fields to exchange
!
!
-REAL :: XPRECISION
!-------------------------------------------------------------------------------
!
!* 0. INITIALIZATION
diff --git a/src/MNH/anel_balancen.f90 b/src/MNH/anel_balancen.f90
index 743c5b5c7..540e56b76 100644
--- a/src/MNH/anel_balancen.f90
+++ b/src/MNH/anel_balancen.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2021 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.
@@ -169,8 +169,6 @@ INTEGER :: IRRI ! Number of solid water variables
REAL :: ZDRYMASST ! Mass of dry air Md
REAL :: ZREFMASS ! Total mass of the ref. atmosphere
REAL :: ZMASS_O_PHI0 ! Mass / Phi0
-LOGICAL :: GCLOSE_OUT ! switch for the LFI writing
-CHARACTER (LEN= 28) :: YFMFILE ! virtual FM file
INTEGER :: IMI ! model index
!JUAN
INTEGER :: IIU_B,IJU_B,IKU
@@ -266,8 +264,6 @@ ZMASS_O_PHI0 = 1. ! | which is here not needed |
IRR = 0 ! | |
IRRL = 0 ! | |
IRRI = 0 ! ==============================================
-GCLOSE_OUT=.FALSE.
-YFMFILE='UNUSED'
!
IMI = GET_CURRENT_MODEL_INDEX()
CALL PRESSUREZ(CLBCX,CLBCY,CPRESOPT,NITR,LITRADJ,ITCOUNT,XRELAX,IMI, &
diff --git a/src/MNH/budget.f90 b/src/MNH/budget.f90
index ebb03d466..692fe059c 100644
--- a/src/MNH/budget.f90
+++ b/src/MNH/budget.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2021 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.
@@ -58,8 +58,10 @@ subroutine Budget_store_init( tpbudget, hsource, pvars )
call Budget_source_id_find( tpbudget, hsource, iid )
if ( tpbudget%ntmpstoresource /= 0 ) then
- call Print_msg( NVERB_ERROR, 'BUD', 'Budget_store_init', 'ntmpstoresource already set (previous call to ' &
- //'Budget_store_end missing?) for '//trim( tpbudget%cname )//':'//trim( hsource ) )
+ cmnhmsg(1) = 'ntmpstoresource already set (previous call to '//'Budget_store_end missing?)'
+ cmnhmsg(2) = 'Set for: ' // Trim( tpbudget%cname ) // ':' // Trim( tpbudget%tsources(tpbudget%ntmpstoresource)%cmnhname )
+ cmnhmsg(3) = 'Working on: ' // Trim( tpbudget%cname ) // ':' // Trim( hsource )
+ call Print_msg( NVERB_ERROR, 'BUD', 'Budget_store_init' )
end if
if ( tpbudget%tsources(iid)%ldonotinit ) then
diff --git a/src/MNH/contrav.f90 b/src/MNH/contrav.f90
index a5b30eff1..50e814688 100644
--- a/src/MNH/contrav.f90
+++ b/src/MNH/contrav.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2021 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.
@@ -148,8 +148,6 @@ INTEGER:: IW,IE,IS,IN ! Coordinate of forth order diffusion area
TYPE(LIST_ll), POINTER :: TZFIELD_U, TZFIELD_V, TZFIELD_DZX, TZFIELD_DZY
TYPE(HALO2LIST_ll), POINTER :: TZHALO2_U, TZHALO2_V, TZHALO2_DZX, TZHALO2_DZY
INTEGER :: IINFO_ll
-!JUAN
-REAL :: XPRECISION
!-----------------------------------------------------------------------
!
!* 1. Compute the horizontal contravariant components
diff --git a/src/MNH/ion_drift.f90 b/src/MNH/ion_drift.f90
index b3187ca83..7d863c918 100644
--- a/src/MNH/ion_drift.f90
+++ b/src/MNH/ion_drift.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2010-2020 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2010-2021 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.
@@ -12,7 +12,7 @@ INTERFACE
SUBROUTINE ION_DRIFT(PDRIFTP, PDRIFTM, PSVT, HLBCX, HLBCY)
!
CHARACTER(LEN=4), DIMENSION(2), INTENT(IN) :: HLBCX,HLBCY
-REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PDRIFTP, PDRIFTM
+REAL, DIMENSION(:,:,:), INTENT(OUT) :: PDRIFTP, PDRIFTM
REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PSVT
!
END SUBROUTINE ION_DRIFT
@@ -65,7 +65,7 @@ IMPLICIT NONE
!* 0.1 declarations of arguments
!
CHARACTER(LEN=4), DIMENSION(2), INTENT(IN) :: HLBCX,HLBCY
-REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PDRIFTP, PDRIFTM
+REAL, DIMENSION(:,:,:), INTENT(OUT) :: PDRIFTP, PDRIFTM
REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PSVT
!
!
--
GitLab