From 06299ad481c13808fa0f8ec6c0f13e56d24fc11a Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Thu, 14 Feb 2019 10:44:01 +0100
Subject: [PATCH] Philippe 14/02/2019: IO: remove CLUOUT/CLUOUT0, associated
variables and dummy arguments
---
src/MNH/anel_balancen.f90 | 8 ++---
src/MNH/change_gribex_var.f90 | 8 ++---
src/MNH/check_zhat.f90 | 6 ++--
src/MNH/check_zs.f90 | 8 ++---
src/MNH/compute_exner_from_ground.f90 | 7 ++--
src/MNH/compute_exner_from_top.f90 | 7 ++--
src/MNH/dry_mass.f90 | 8 ++---
src/MNH/free_atm_profile.f90 | 6 ++--
src/MNH/ini_deep_convection.f90 | 14 +++-----
src/MNH/ini_elec.f90 | 24 ++++++--------
src/MNH/ini_elecn.f90 | 27 +++++++---------
src/MNH/ini_micron.f90 | 8 ++---
src/MNH/ini_modeln.f90 | 23 +++++++-------
src/MNH/ini_one_wayn.f90 | 11 +++----
src/MNH/ini_prog_var.f90 | 18 +++++------
src/MNH/ini_radiations.f90 | 13 +++-----
src/MNH/ini_radiations_ecmwf.f90 | 29 ++++++++---------
src/MNH/ini_radiations_ecrad.f90 | 44 ++++++++++----------------
src/MNH/ini_segn.f90 | 12 +++----
src/MNH/ini_sizen.f90 | 20 ++++++------
src/MNH/ini_spectren.f90 | 20 ++++++------
src/MNH/init_mnh.f90 | 22 ++++++-------
src/MNH/mean_prof.f90 | 6 ++--
src/MNH/mnhclose_namelist.f90 | 5 ++-
src/MNH/mnhinit_io_surfn.f90 | 6 ++--
src/MNH/mnhopen_aux_io_surf.f90 | 3 +-
src/MNH/modd_lunit.f90 | 12 +++----
src/MNH/modd_lunitn.f90 | 9 ++----
src/MNH/mode_gridproj.f90 | 8 ++---
src/MNH/open_nestpgd_files.f90 | 8 ++---
src/MNH/open_prc_files.f90 | 7 ++--
src/MNH/prep_ideal_case.f90 | 5 ++-
src/MNH/prep_pgd.f90 | 5 +--
src/MNH/prep_real_case.f90 | 8 ++---
src/MNH/prep_surfex.f90 | 2 +-
src/MNH/read_all_data_grib_case.f90 | 6 ++--
src/MNH/read_chem_data_netcdf_case.f90 | 6 ++--
src/MNH/read_exspa.f90 | 8 ++---
src/MNH/read_hgridn.f90 | 6 ++--
src/MNH/read_precip_field.f90 | 11 +++----
src/MNH/read_ver_grid.f90 | 6 ++--
src/MNH/rel_forcingn.f90 | 7 ++--
src/MNH/reset_exseg.f90 | 13 +++-----
src/MNH/retrieve1_nest_infon.f90 | 11 ++-----
src/MNH/retrieve2_nest_infon.f90 | 6 ++--
src/MNH/set_cstn.f90 | 10 +++---
src/MNH/set_frc.f90 | 6 ++--
src/MNH/set_geosbal.f90 | 7 ++--
src/MNH/set_perturb.f90 | 6 ++--
src/MNH/set_refz.f90 | 6 ++--
src/MNH/set_rsou.f90 | 6 ++--
src/MNH/spawn_surf2_rain.f90 | 10 +++---
src/MNH/ver_dyn.f90 | 6 ++--
src/MNH/ver_int_dyn.f90 | 6 ++--
src/MNH/ver_int_thermo.f90 | 8 ++---
src/MNH/ver_interp_to_mixed_grid.f90 | 6 ++--
src/MNH/ver_prep_gribex_case.f90 | 11 ++-----
src/MNH/ver_thermo.f90 | 9 +++---
src/MNH/zoom_pgd.f90 | 4 +--
src/MNH/zsmt_pgd.f90 | 5 ++-
src/MNH/zsmt_pic.f90 | 10 ++----
61 files changed, 270 insertions(+), 353 deletions(-)
diff --git a/src/MNH/anel_balancen.f90 b/src/MNH/anel_balancen.f90
index 6c64978f6..ad0f32051 100644
--- a/src/MNH/anel_balancen.f90
+++ b/src/MNH/anel_balancen.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ##########################
@@ -56,9 +56,6 @@ END MODULE MODI_ANEL_BALANCE_n
!! Module MODD_CONF : contains configuration variables for all models.
!! NVERB : verbosity level for output-listing
!!
-!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
-!!
!! Module MODD_GRID_n : contains grid variables
!! XMAP,XXHAT,XYHAT,XZZ
!!
@@ -115,7 +112,6 @@ USE MODE_IO_ll
USE MODE_MODELN_HANDLER
!
USE MODD_CONF ! declarative modules
-USE MODD_LUNIT
USE MODD_PARAMETERS
USE MODD_GRID_n
USE MODD_DIM_n
diff --git a/src/MNH/change_gribex_var.f90 b/src/MNH/change_gribex_var.f90
index 48a9741de..0f4badbcd 100644
--- a/src/MNH/change_gribex_var.f90
+++ b/src/MNH/change_gribex_var.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
! #############################
MODULE MODI_CHANGE_GRIBEX_VAR
@@ -116,7 +116,7 @@ END MODULE MODI_CHANGE_GRIBEX_VAR
!! Module MODD_CONF1
!! NRR
!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
+!! TLUOUT0 : name of output-listing
!! Module MODD_CST : contains physical constants
!! XRD : gas constant for dry air
!! XRV : gas constant for vapor
@@ -167,7 +167,7 @@ USE MODD_CONF
USE MODD_CONF_n
USE MODD_CST
USE MODD_GRID_n
-USE MODD_LUNIT, ONLY: CLUOUT0, TLUOUT0
+USE MODD_LUNIT, ONLY: TLUOUT0
USE MODD_PARAMETERS
USE MODD_REF
!
diff --git a/src/MNH/check_zhat.f90 b/src/MNH/check_zhat.f90
index a0027bb66..ca9094fa9 100644
--- a/src/MNH/check_zhat.f90
+++ b/src/MNH/check_zhat.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2019 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.
@@ -45,7 +45,7 @@ END MODULE MODI_CHECK_ZHAT
!! Module MODD_CONF : contains configuration variables for all models.
!! NVERB : verbosity level for output-listing
!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
+!! TLUOUT0 : name of output-listing
!! Module MODD_GRID1
!! XZHAT
!! Module MODD_DIM1
@@ -101,7 +101,7 @@ REAL :: ZLEN1 ! Decay scale for smooth topography
REAL :: ZLEN2 ! Decay scale for small-scale topography deviation
!
INTEGER :: IRESP ! return-code if problems occured
-INTEGER :: ILUOUT0 ! logical unit for file CLUOUT0
+INTEGER :: ILUOUT0 ! logical unit for file TLUOUT0
LOGICAL :: GTHINSHELL
TYPE(TFILEDATA),POINTER :: TZFMFILE
!
diff --git a/src/MNH/check_zs.f90 b/src/MNH/check_zs.f90
index 200ea82d9..42b9aaa6f 100644
--- a/src/MNH/check_zs.f90
+++ b/src/MNH/check_zs.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
!###################
@@ -48,7 +48,7 @@ END MODULE MODI_CHECK_ZS
!! Module MODD_CONF : contains configuration variables for all models.
!! NVERB : verbosity level for output-listing
!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
+!! TLUOUT0 : name of output-listing
!! Module MODD_GRID1
!! XZS
!! Module MODD_DIM1
@@ -105,7 +105,7 @@ INTEGER, INTENT(IN) :: KJINF ! domain, compared to the old
! ------------------------------
!
INTEGER :: IRESP ! return-code if problems occured
-INTEGER :: ILUOUT0 ! logical unit for file CLUOUT0
+INTEGER :: ILUOUT0 ! logical unit for file TLUOUT0
!
INTEGER :: IDXRATIO = 0 ! aspect ratios during previous
INTEGER :: IDYRATIO = 0 ! spawning (if any)
diff --git a/src/MNH/compute_exner_from_ground.f90 b/src/MNH/compute_exner_from_ground.f90
index 1edd2e253..cbb64d037 100644
--- a/src/MNH/compute_exner_from_ground.f90
+++ b/src/MNH/compute_exner_from_ground.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! #####################################
@@ -83,8 +83,6 @@ END MODULE MODI_COMPUTE_EXNER_FROM_GROUND3
!! Module MODD_CONF : contains configuration variables for all models.
!! NVERB : verbosity level for output-listing
!! LTHINSHELL : logical for thinshell approximation
-!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
!! Module MODD_CST : contains physical constants
!! XG : gravity constant
!! XCPD: specific heat for dry air at constant pressure
@@ -115,7 +113,6 @@ END MODULE MODI_COMPUTE_EXNER_FROM_GROUND3
!
USE MODD_CONF
USE MODD_CST
-USE MODD_LUNIT
USE MODD_PARAMETERS
!
USE MODI_SHUMAN
diff --git a/src/MNH/compute_exner_from_top.f90 b/src/MNH/compute_exner_from_top.f90
index 05f7c026b..e195e725d 100644
--- a/src/MNH/compute_exner_from_top.f90
+++ b/src/MNH/compute_exner_from_top.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ##################################
@@ -81,8 +81,6 @@ END MODULE MODI_COMPUTE_EXNER_FROM_TOP3D
!! Module MODD_CONF : contains configuration variables for all models.
!! NVERB : verbosity level for output-listing
!! LTHINSHELL : logical for thinshell approximation
-!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
!! Module MODD_CST : contains physical constants
!! XG : gravity constant
!! XCPD: specific heat for dry air at constant pressure
@@ -113,7 +111,6 @@ END MODULE MODI_COMPUTE_EXNER_FROM_TOP3D
!
USE MODD_CONF
USE MODD_CST
-USE MODD_LUNIT
USE MODD_PARAMETERS
!
USE MODI_SHUMAN
diff --git a/src/MNH/dry_mass.f90 b/src/MNH/dry_mass.f90
index a5e0b31c7..0930b058b 100644
--- a/src/MNH/dry_mass.f90
+++ b/src/MNH/dry_mass.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ######spl
@@ -69,8 +69,8 @@ END MODULE MODI_DRY_MASS
!!
!! Module MODD_CONF : contains configuration variables for all models.
!! NVERB : verbosity level for output-listing
-!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
+!! Module MODD_LUNIT_n : contains logical unit names for all models
+!! TLUOUT : name of output-listing
!! Module MODD_GRID1 : contains grid variables for model1
!! XZZ : altitude of the w points
!! Module MODD_CST : contains physical constants
diff --git a/src/MNH/free_atm_profile.f90 b/src/MNH/free_atm_profile.f90
index 3dac2c8b7..fe785ac91 100644
--- a/src/MNH/free_atm_profile.f90
+++ b/src/MNH/free_atm_profile.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1997-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ############################
@@ -63,7 +63,7 @@ END MODULE MODI_FREE_ATM_PROFILE
!! Module MODD_CONF : contains configuration variables for all models.
!! NVERB : verbosity level for output-listing
!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
+!! TLUOUT0 : name of output-listing
!! Module MODD_GRID1 : contains grid variables for model1
!! XZS : orography of MESO-NH
!! XZHAT : GS levels
diff --git a/src/MNH/ini_deep_convection.f90 b/src/MNH/ini_deep_convection.f90
index e7f2bed91..476199193 100644
--- a/src/MNH/ini_deep_convection.f90
+++ b/src/MNH/ini_deep_convection.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ###############################
@@ -9,7 +9,7 @@
!
INTERFACE
!
- SUBROUTINE INI_DEEP_CONVECTION(TPINIFILE,HLUOUT,OINIDCONV,TPDTCUR, &
+ SUBROUTINE INI_DEEP_CONVECTION(TPINIFILE,OINIDCONV,TPDTCUR, &
KCOUNTCONV,PDTHCONV,PDRVCONV,PDRCCONV, &
PDRICONV,PPRCONV,PPRSCONV,PPACCONV, &
PUMFCONV,PDMFCONV,PMFCONV,PPRLFLXCONV,PPRSFLXCONV, &
@@ -22,8 +22,6 @@ USE MODD_IO_ll, ONLY : TFILEDATA
USE MODD_TIME
!
TYPE(TFILEDATA), INTENT(IN) :: TPINIFILE ! Initial file
-CHARACTER (LEN=*), INTENT(IN) :: HLUOUT ! name for output-listing
- ! of nested models
LOGICAL, INTENT(IN) :: OINIDCONV ! switch to initialize or read
TYPE (DATE_TIME), INTENT(IN) :: TPDTCUR ! Current date and time
CHARACTER (LEN=*), INTENT(IN) :: HGETSVCONV ! GET indicator for SVCONV
@@ -63,7 +61,7 @@ END INTERFACE
!
END MODULE MODI_INI_DEEP_CONVECTION
! ###################################################################################
- SUBROUTINE INI_DEEP_CONVECTION(TPINIFILE,HLUOUT,OINIDCONV,TPDTCUR, &
+ SUBROUTINE INI_DEEP_CONVECTION(TPINIFILE,OINIDCONV,TPDTCUR, &
KCOUNTCONV,PDTHCONV,PDRVCONV,PDRCCONV, &
PDRICONV,PPRCONV,PPRSCONV,PPACCONV, &
PUMFCONV,PDMFCONV,PMFCONV,PPRLFLXCONV,PPRSFLXCONV, &
@@ -110,7 +108,7 @@ END MODULE MODI_INI_DEEP_CONVECTION
!! P.Jabouille 04/04/02 add PMFCONV used for subgrid condensation
!! for a correct restart this variable has to be writen in FM file
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
-!!
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -142,8 +140,6 @@ IMPLICIT NONE
!* 0.1 Declarations of dummy arguments :
!
TYPE(TFILEDATA), INTENT(IN) :: TPINIFILE ! Initial file
-CHARACTER (LEN=*), INTENT(IN) :: HLUOUT ! name for output-listing
- ! of nested models
LOGICAL, INTENT(IN) :: OINIDCONV ! switch to initialize or read
TYPE (DATE_TIME), INTENT(IN) :: TPDTCUR ! Current date and time
CHARACTER (LEN=*), INTENT(IN) :: HGETSVCONV ! GET indicator for SVCONV
diff --git a/src/MNH/ini_elec.f90 b/src/MNH/ini_elec.f90
index c0b51e5dc..4dfdd8e47 100644
--- a/src/MNH/ini_elec.f90
+++ b/src/MNH/ini_elec.f90
@@ -1,17 +1,12 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2002-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 init 2006/05/18 13:07:25
-!-----------------------------------------------------------------
-! ################################################################
- SUBROUTINE INI_ELEC(KMI,HINIFILE,HLUOUT,PTSTEP,PDZMIN,KSPLITR, &
- PDXX,PDYY,PDZZ,PDZX,PDZY )
-! ################################################################
+! #########################################################
+ SUBROUTINE INI_ELEC(KMI,TPINIFILE,PTSTEP,PDZMIN,KSPLITR, &
+ PDXX,PDYY,PDZZ,PDZX,PDZY )
+! #########################################################
!
!!**** *INI_ELEC* - routine to initialize the electrical parameters
!!
@@ -42,7 +37,7 @@
!! MODIFICATIONS
!! -------------
!! Original 29/11/02
-!!
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -54,6 +49,7 @@ USE MODE_IO_ll
USE MODE_FM
USE MODE_FMREAD
!
+USE MODD_IO_ll, ONLY : TFILEDATA
USE MODD_LUNIT_n
USE MODD_NSV, ONLY : NSV,NSV_ELEC,NSV_ELECBEG,NSV_ELECEND
USE MODD_PARAMETERS
@@ -73,9 +69,7 @@ IMPLICIT NONE
!* 0.1 declarations of arguments
!
INTEGER, INTENT(IN) :: KMI ! Model Index
-CHARACTER (LEN=*) , INTENT(IN) :: HINIFILE ! name of the initial file
-CHARACTER (LEN=*), INTENT(IN) :: HLUOUT ! name for output-listing
- ! of nested models
+TYPE(TFILEDATA), INTENT(IN) :: TPINIFILE! Initial file
REAL, INTENT(IN) :: PTSTEP ! Time STEP
!
REAL, INTENT(IN) :: PDZMIN ! minimun vertical mesh size
diff --git a/src/MNH/ini_elecn.f90 b/src/MNH/ini_elecn.f90
index e67a08e8c..f668ebc3a 100644
--- a/src/MNH/ini_elecn.f90
+++ b/src/MNH/ini_elecn.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2009-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ######################
@@ -8,17 +8,15 @@
! ######################
!
INTERFACE
- SUBROUTINE INI_ELEC_n (KLUOUT, HELEC, HCLOUD, HLUOUT, TPINIFILE, &
- PTSTEP, PZZ, &
- PDXX, PDYY, PDZZ, PDZX, PDZY )
+ SUBROUTINE INI_ELEC_n (KLUOUT, HELEC, HCLOUD, TPINIFILE, &
+ PTSTEP, PZZ, &
+ PDXX, PDYY, PDZZ, PDZX, PDZY )
!
USE MODD_IO_ll, ONLY : TFILEDATA
!
INTEGER, INTENT(IN) :: KLUOUT ! Logical unit number for prints
CHARACTER (LEN=4), INTENT(IN) :: HELEC ! atmospheric electricity scheme
CHARACTER (LEN=4), INTENT(IN) :: HCLOUD ! microphysics scheme
-CHARACTER (LEN=*), INTENT(IN) :: HLUOUT ! name for output-listing
- ! of nested models
TYPE(TFILEDATA), INTENT(IN) :: TPINIFILE! Initial file
REAL, INTENT(IN) :: PTSTEP ! Time STEP
!
@@ -33,11 +31,11 @@ END SUBROUTINE INI_ELEC_n
END INTERFACE
END MODULE MODI_INI_ELEC_n
!
-! #################################################################
- SUBROUTINE INI_ELEC_n(KLUOUT, HELEC, HCLOUD, HLUOUT, TPINIFILE, &
- PTSTEP, PZZ, &
- PDXX, PDYY, PDZZ, PDZX, PDZY )
-! #################################################################
+! #########################################################
+ SUBROUTINE INI_ELEC_n(KLUOUT, HELEC, HCLOUD, TPINIFILE, &
+ PTSTEP, PZZ, &
+ PDXX, PDYY, PDZZ, PDZX, PDZY )
+! #########################################################
!
!! PURPOSE
!! -------
@@ -74,6 +72,7 @@ END MODULE MODI_INI_ELEC_n
!! J.-P. Pinty 15/11/13 Initialize the flash maps
!! 10/2016 (C.Lac) Add droplet deposition
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!!
!-------------------------------------------------------------------------------
!
@@ -128,8 +127,6 @@ IMPLICIT NONE
INTEGER, INTENT(IN) :: KLUOUT ! Logical unit number for prints
CHARACTER (LEN=4), INTENT(IN) :: HELEC ! atmospheric electricity scheme
CHARACTER (LEN=4), INTENT(IN) :: HCLOUD ! microphysics scheme
-CHARACTER (LEN=*), INTENT(IN) :: HLUOUT ! name for output-listing
- ! of nested models
TYPE(TFILEDATA), INTENT(IN) :: TPINIFILE! Initial file
REAL, INTENT(IN) :: PTSTEP ! Time STEP
!
@@ -225,7 +222,7 @@ IF(SIZE(XINPRR) == 0) RETURN
!* 2. Initialize MODD_PRECIP_n variables
! -----------------------------------
!
-CALL READ_PRECIP_FIELD (TPINIFILE, HLUOUT, CPROGRAM, CCONF, &
+CALL READ_PRECIP_FIELD (TPINIFILE, CPROGRAM, CCONF, &
CGETINPRC,CGETINPRR,CGETINPRS,CGETINPRG,CGETINPRH, &
XINPRC,XACPRC,XINDEP,XACDEP,XINPRR,XINPRR3D,XEVAP3D, &
XACPRR, XINPRS, XACPRS, XINPRG, XACPRG, XINPRH, XACPRH)
diff --git a/src/MNH/ini_micron.f90 b/src/MNH/ini_micron.f90
index e77c68926..e45a6b56b 100644
--- a/src/MNH/ini_micron.f90
+++ b/src/MNH/ini_micron.f90
@@ -52,6 +52,7 @@ END MODULE MODI_INI_MICRO_n
!! C.LAc 10/2016 Add budget for droplet deposition
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
!! P.Wautelet 01/2019: bug: add missing allocations
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!!
!! --------------------------------------------------------------------------
!
@@ -61,7 +62,6 @@ END MODULE MODI_INI_MICRO_n
!
USE MODD_CONF, ONLY : CCONF,CPROGRAM
USE MODD_IO_ll, ONLY : TFILEDATA
-USE MODD_LUNIT_n, ONLY : CLUOUT
USE MODD_GET_n, ONLY : CGETRCT,CGETRRT, CGETRST, CGETRGT, CGETRHT, CGETCLOUD
USE MODD_DIM_n, ONLY : NIMAX_ll, NJMAX_ll
USE MODD_PARAMETERS, ONLY : JPVEXT, JPHEXT
@@ -258,7 +258,7 @@ IF(SIZE(XINPRR) == 0) RETURN
!* 3. INITIALIZE MODD_PRECIP_n variables
! ----------------------------------
!
-CALL READ_PRECIP_FIELD(TPINIFILE,CLUOUT,CPROGRAM,CCONF, &
+CALL READ_PRECIP_FIELD(TPINIFILE,CPROGRAM,CCONF, &
CGETRCT,CGETRRT,CGETRST,CGETRGT,CGETRHT, &
XINPRC,XACPRC,XINDEP,XACDEP,XINPRR,XINPRR3D,XEVAP3D,&
XACPRR,XINPRS,XACPRS,XINPRG,XACPRG, XINPRH,XACPRH )
@@ -328,8 +328,8 @@ END IF
!
IMI = GET_CURRENT_MODEL_INDEX()
!IF (CELEC /= 'NONE') THEN
-! CALL INI_ELEC(IMI,CINIFILE,CLUOUT,XTSTEP,ZDZMIN,NSPLITR, &
-! XDXX,XDYY,XDZZ,XDZX,XDZY )
+! CALL INI_ELEC(IMI,TPINIFILE,XTSTEP,ZDZMIN,NSPLITR, &
+! XDXX,XDYY,XDZZ,XDZX,XDZY )
!END IF
!
!
diff --git a/src/MNH/ini_modeln.f90 b/src/MNH/ini_modeln.f90
index efe5d36da..9e1d3bf88 100644
--- a/src/MNH/ini_modeln.f90
+++ b/src/MNH/ini_modeln.f90
@@ -9,12 +9,11 @@
!
INTERFACE
!
- SUBROUTINE INI_MODEL_n(KMI,HLUOUT,TPINIFILE)
+ SUBROUTINE INI_MODEL_n(KMI,TPINIFILE)
!
USE MODD_IO_ll, ONLY : TFILEDATA
!
INTEGER, INTENT(IN) :: KMI ! Model Index
-CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! name for output-listing of nested models
TYPE(TFILEDATA), INTENT(IN) :: TPINIFILE ! Initial file
!
END SUBROUTINE INI_MODEL_n
@@ -23,7 +22,7 @@ END INTERFACE
!
END MODULE MODI_INI_MODEL_n
! ############################################
- SUBROUTINE INI_MODEL_n(KMI,HLUOUT,TPINIFILE)
+ SUBROUTINE INI_MODEL_n(KMI,TPINIFILE)
! ############################################
!
!!**** *INI_MODEL_n* - routine to initialize the nested model _n
@@ -280,6 +279,7 @@ END MODULE MODI_INI_MODEL_n
!! 01/18 J.Colin Add DRAG
!! P.Wautelet 29/01/2019: bug: add missing zero-size allocations
! P. Wautelet 07/02/2019: force TYPE to a known value for IO_FILE_ADD2LIST
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!---------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -456,7 +456,6 @@ IMPLICIT NONE
!
!
INTEGER, INTENT(IN) :: KMI ! Model Index
-CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! name for output-listing of nested models
TYPE(TFILEDATA), INTENT(IN) :: TPINIFILE ! Initial file
!
!* 0.2 declarations of local variables
@@ -1823,9 +1822,9 @@ IF (CELEC == 'NONE') THEN
! --------------------------------------
!
ELSE
- CALL INI_ELEC_n(ILUOUT, CELEC, CCLOUD, HLUOUT, TPINIFILE, &
- XTSTEP, XZZ, &
- XDXX, XDYY, XDZZ, XDZX, XDZY )
+ CALL INI_ELEC_n(ILUOUT, CELEC, CCLOUD, TPINIFILE, &
+ XTSTEP, XZZ, &
+ XDXX, XDYY, XDZZ, XDZX, XDZY )
!
WRITE (UNIT=ILUOUT,&
FMT='(/,"ELECTRIC VARIABLES ARE BETWEEN INDEX",I2," AND ",I2)')&
@@ -1998,7 +1997,7 @@ IF ( KMI > 1) THEN
DPTR_XLBYRM=>XLBYRM
DPTR_XLBXSVM=>XLBXSVM
DPTR_XLBYSVM=>XLBYSVM
- CALL INI_ONE_WAY_n(NDAD(KMI),CLUOUT,XTSTEP,KMI,1, &
+ CALL INI_ONE_WAY_n(NDAD(KMI),XTSTEP,KMI,1, &
DPTR_XBMX1,DPTR_XBMX2,DPTR_XBMX3,DPTR_XBMX4,DPTR_XBMY1,DPTR_XBMY2,DPTR_XBMY3,DPTR_XBMY4, &
DPTR_XBFX1,DPTR_XBFX2,DPTR_XBFX3,DPTR_XBFX4,DPTR_XBFY1,DPTR_XBFY2,DPTR_XBFY3,DPTR_XBFY4, &
NDXRATIO_ALL(KMI),NDYRATIO_ALL(KMI),NDTRATIO(KMI), &
@@ -2071,7 +2070,7 @@ IF (CRAD /= 'NONE') THEN
ELSE
GINIRAD =.FALSE.
END IF
- CALL INI_RADIATIONS(TPINIFILE,HLUOUT,GINIRAD,TDTCUR,TDTEXP,XZZ, &
+ CALL INI_RADIATIONS(TPINIFILE,GINIRAD,TDTCUR,TDTEXP,XZZ, &
XDXX, XDYY, &
XSINDEL,XCOSDEL,XTSIDER,XCORSOL, &
XSLOPANG,XSLOPAZI, &
@@ -2242,7 +2241,7 @@ IF (CRAD == 'ECMW') THEN
ZBARE(:,:) = 0.
END IF
!
- CALL INI_RADIATIONS_ECMWF (TPINIFILE%CNAME,HLUOUT, &
+ CALL INI_RADIATIONS_ECMWF (TPINIFILE%CNAME, &
XZHAT,XPABST,XTHT,XTSRAD,XLAT,XLON,TDTCUR,TDTEXP, &
CLW,NDLON,NFLEV,NFLUX,NRAD,NSWB_OLD,CAER,NAER,NSTATM, &
XSTATM,ZSEA,ZTOWN,ZBARE,XOZON, XAER,XDST_WL, LSUBG_COND )
@@ -2270,7 +2269,7 @@ ELSE IF (CRAD == 'ECRA') THEN
ZBARE(:,:) = 0.
END IF
!
- CALL INI_RADIATIONS_ECRAD (TPINIFILE%CNAME,HLUOUT, &
+ CALL INI_RADIATIONS_ECRAD (TPINIFILE%CNAME, &
XZHAT,XPABST,XTHT,XTSRAD,XLAT,XLON,TDTCUR,TDTEXP, &
CLW,NDLON,NFLEV,NFLUX,NRAD,NSWB_OLD,CAER,NAER,NSTATM, &
XSTATM,ZSEA,ZTOWN,ZBARE,XOZON, XAER,XDST_WL, LSUBG_COND )
@@ -2304,7 +2303,7 @@ IF (CDCONV /= 'NONE' .OR. CSCONV == 'KAFR') THEN
IF (NVERB>=10) THEN
WRITE(ILUOUT,*) 'XDTCONV has been set to : ',XDTCONV
END IF
- CALL INI_DEEP_CONVECTION (TPINIFILE,HLUOUT,GINIDCONV,TDTCUR, &
+ CALL INI_DEEP_CONVECTION (TPINIFILE,GINIDCONV,TDTCUR, &
NCOUNTCONV,XDTHCONV,XDRVCONV,XDRCCONV, &
XDRICONV,XPRCONV,XPRSCONV,XPACCONV, &
XUMFCONV,XDMFCONV,XMFCONV,XPRLFLXCONV,XPRSFLXCONV,&
diff --git a/src/MNH/ini_one_wayn.f90 b/src/MNH/ini_one_wayn.f90
index 4182d6a2e..d98086895 100644
--- a/src/MNH/ini_one_wayn.f90
+++ b/src/MNH/ini_one_wayn.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1999-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! #######################
@@ -9,7 +9,7 @@
!
INTERFACE
!
- SUBROUTINE INI_ONE_WAY_n( KDAD,HLUOUT,PTSTEP,KMI,KTCOUNT, &
+ SUBROUTINE INI_ONE_WAY_n( KDAD,PTSTEP,KMI,KTCOUNT, &
PBMX1,PBMX2,PBMX3,PBMX4,PBMY1,PBMY2,PBMY3,PBMY4, &
PBFX1,PBFX2,PBFX3,PBFX4,PBFY1,PBFY2,PBFY3,PBFY4, &
KDXRATIO,KDYRATIO,KDTRATIO, &
@@ -26,7 +26,6 @@ INTERFACE
!
!
INTEGER, INTENT(IN) :: KDAD ! Number of the DAD model
-CHARACTER (LEN=*),INTENT(IN) :: HLUOUT ! name of the output-listing
REAL, INTENT(IN) :: PTSTEP ! Time step
INTEGER, INTENT(IN) :: KMI ! model number
INTEGER, INTENT(IN) :: KTCOUNT ! Temporal loop COUNTer
@@ -72,7 +71,7 @@ END MODULE MODI_INI_ONE_WAY_n
!
! ####################################################################
-SUBROUTINE INI_ONE_WAY_n(KDAD,HLUOUT,PTSTEP,KMI,KTCOUNT, &
+SUBROUTINE INI_ONE_WAY_n(KDAD,PTSTEP,KMI,KTCOUNT, &
PBMX1,PBMX2,PBMX3,PBMX4,PBMY1,PBMY2,PBMY3,PBMY4, &
PBFX1,PBFX2,PBFX3,PBFX4,PBFY1,PBFY2,PBFY3,PBFY4, &
KDXRATIO,KDYRATIO,KDTRATIO, &
@@ -140,6 +139,7 @@ SUBROUTINE INI_ONE_WAY_n(KDAD,HLUOUT,PTSTEP,KMI,KTCOUNT, &
!! J.Escobar : 18/12/2015 : Correction of bug in bound in // for NHALO <>1
!! B.VIE 2016 : LIMA
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!!
!------------------------------------------------------------------------------
!
@@ -172,7 +172,6 @@ IMPLICIT NONE
!
!
INTEGER, INTENT(IN) :: KDAD ! Number of the DAD model
-CHARACTER (LEN=*),INTENT(IN) :: HLUOUT ! name for output-listing
REAL, INTENT(IN) :: PTSTEP ! Time step
INTEGER, INTENT(IN) :: KMI ! model number
INTEGER, INTENT(IN) :: KTCOUNT ! Temporal loop COUNTer
diff --git a/src/MNH/ini_prog_var.f90 b/src/MNH/ini_prog_var.f90
index 30d9a922a..75d6242b8 100644
--- a/src/MNH/ini_prog_var.f90
+++ b/src/MNH/ini_prog_var.f90
@@ -7,9 +7,8 @@
MODULE MODI_INI_PROG_VAR
! ########################
INTERFACE
- SUBROUTINE INI_PROG_VAR(HLUOUT,PTKE_MX,PSV_MX,HCHEMFILE)
+ SUBROUTINE INI_PROG_VAR(PTKE_MX, PSV_MX, HCHEMFILE)
!
-CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Name of the output-listing
REAL,DIMENSION(:,:,:), INTENT(IN) :: PTKE_MX
REAL,DIMENSION(:,:,:,:),INTENT(IN) :: PSV_MX
CHARACTER(LEN=*), INTENT(IN),OPTIONAL :: HCHEMFILE ! Name of the chem file
@@ -17,9 +16,9 @@ END SUBROUTINE INI_PROG_VAR
END INTERFACE
END MODULE MODI_INI_PROG_VAR
!
-! ########################################################
- SUBROUTINE INI_PROG_VAR(HLUOUT,PTKE_MX,PSV_MX,HCHEMFILE)
-! ########################################################
+! ###################################################
+ SUBROUTINE INI_PROG_VAR(PTKE_MX, PSV_MX, HCHEMFILE)
+! ###################################################
!
!!**** *INI_PROG_VAR* - initialization the prognostic variables not yet
!! initialized
@@ -45,8 +44,8 @@ END MODULE MODI_INI_PROG_VAR
!!
!! Module MODD_CONF : contains configuration variables for all models.
!! NVERB : verbosity level for output-listing
-!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
+!! Module MODD_LUNIT_n : contains logical unit names for all models
+!! TLUOUT : name of output-listing
!! Module MODD_FIELD1 : contains the prognostic fields of model1
!! XUM
!! XVM
@@ -95,6 +94,7 @@ END MODULE MODI_INI_PROG_VAR
!! Mai 2017 (M. Leriche) Get wet dep. sv in Meso-NH init file
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
! P. Wautelet 07/02/2019: force TYPE to a known value for IO_FILE_ADD2LIST
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -141,15 +141,13 @@ IMPLICIT NONE
!
!* 0.1 declaration of arguments
!
-CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Name of the output-listing
REAL,DIMENSION(:,:,:), INTENT(IN) :: PTKE_MX
REAL,DIMENSION(:,:,:,:),INTENT(IN) :: PSV_MX
CHARACTER(LEN=*), INTENT(IN),OPTIONAL :: HCHEMFILE ! Name of the chem file
!
!* 0.2 declaration of local variables
!
-INTEGER :: ILUOUT ! Logical unit number
- ! associated with HLUOUT
+INTEGER :: ILUOUT
INTEGER :: IRESP
!
INTEGER :: IIMAX,IJMAX,IKMAX ! Dimensions of the chem file
diff --git a/src/MNH/ini_radiations.f90 b/src/MNH/ini_radiations.f90
index 698a17878..a9af173cf 100644
--- a/src/MNH/ini_radiations.f90
+++ b/src/MNH/ini_radiations.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2003-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ##########################
@@ -9,7 +9,7 @@
!
INTERFACE
!
- SUBROUTINE INI_RADIATIONS(TPINIFILE,HLUOUT,OINIRAD,TPDTCUR,TPDTEXP,&
+ SUBROUTINE INI_RADIATIONS(TPINIFILE,OINIRAD,TPDTCUR,TPDTEXP, &
PZZ,PDXX,PDYY, &
PSINDEL,PCOSDEL,PTSIDER,PCORSOL,PSLOPANG,PSLOPAZI, &
PDTHRAD,PDIRFLASWD,PSCAFLASWD, &
@@ -22,8 +22,6 @@ USE MODD_IO_ll, ONLY : TFILEDATA
USE MODD_TYPE_DATE
!
TYPE(TFILEDATA), INTENT(IN) :: TPINIFILE ! Initial file
-CHARACTER (LEN=*), INTENT(IN) :: HLUOUT ! name for output-listing
- ! of nested models
LOGICAL, INTENT(IN) :: OINIRAD ! switch to initialize or read
! the radiation informations
TYPE (DATE_TIME), INTENT(IN) :: TPDTCUR ! Current date and time
@@ -69,7 +67,7 @@ END MODULE MODI_INI_RADIATIONS
!
!
! ####################################################################
- SUBROUTINE INI_RADIATIONS(TPINIFILE,HLUOUT,OINIRAD,TPDTCUR,TPDTEXP,&
+ SUBROUTINE INI_RADIATIONS(TPINIFILE,OINIRAD,TPDTCUR,TPDTEXP, &
PZZ,PDXX,PDYY, &
PSINDEL,PCOSDEL,PTSIDER,PCORSOL,PSLOPANG,PSLOPAZI, &
PDTHRAD,PDIRFLASWD,PSCAFLASWD, &
@@ -109,6 +107,7 @@ END MODULE MODI_INI_RADIATIONS
!! TDTEXP to have a perpetual day ie. the diurnal cycle is retained
!! but the day stays the same during the whole run
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -135,8 +134,6 @@ IMPLICIT NONE
!* 0.1 Declarations of dummy arguments :
!
TYPE(TFILEDATA), INTENT(IN) :: TPINIFILE ! Initial file
-CHARACTER (LEN=*), INTENT(IN) :: HLUOUT ! name for output-listing
- ! of nested models
LOGICAL, INTENT(IN) :: OINIRAD ! switch to initialize or read
! the radiation informations
TYPE (DATE_TIME), INTENT(IN) :: TPDTCUR ! Current date and time
diff --git a/src/MNH/ini_radiations_ecmwf.f90 b/src/MNH/ini_radiations_ecmwf.f90
index 6c6b9e9fd..17eb3c7d9 100644
--- a/src/MNH/ini_radiations_ecmwf.f90
+++ b/src/MNH/ini_radiations_ecmwf.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ##########################
@@ -9,16 +9,14 @@
!
INTERFACE
!
- SUBROUTINE INI_RADIATIONS_ECMWF(HINIFILE,HLUOUT, &
- PZHAT,PPABST,PTHT,PTSRAD,PLAT,PLON,TPDTCUR,TPDTEXP, &
- HLW,KDLON,KFLEV,KFLUX,KRAD,KSWB,HAER,KAER,KSTATM, &
- PSTATM,PSEA,PTOWN,PBARE,POZON, PAER,PDST_WL, OSUBG_COND )
+ SUBROUTINE INI_RADIATIONS_ECMWF(HINIFILE, &
+ PZHAT, PPABST, PTHT, PTSRAD, PLAT, PLON, TPDTCUR, TPDTEXP, &
+ HLW, KDLON, KFLEV, KFLUX, KRAD, KSWB, HAER, KAER, KSTATM, &
+ PSTATM, PSEA, PTOWN, PBARE, POZON, PAER, PDST_WL, OSUBG_COND )
!
USE MODD_TYPE_DATE
!
CHARACTER (LEN=*), INTENT(IN) :: HINIFILE ! Name of the initial file
-CHARACTER (LEN=*), INTENT(IN) :: HLUOUT ! name for output-listing
- ! of nested models
CHARACTER (LEN=*), INTENT(IN) :: HAER ! aerosol optical thickness climatology
CHARACTER (LEN=4), INTENT(IN) :: HLW ! LW scheme used
!
@@ -60,12 +58,12 @@ END INTERFACE
END MODULE MODI_INI_RADIATIONS_ECMWF
!
!
-! #######################################################################
- SUBROUTINE INI_RADIATIONS_ECMWF(HINIFILE,HLUOUT, &
- PZHAT,PPABST,PTHT,PTSRAD,PLAT,PLON,TPDTCUR,TPDTEXP, &
- HLW,KDLON,KFLEV,KFLUX,KRAD,KSWB,HAER,KAER,KSTATM, &
- PSTATM,PSEA,PTOWN,PBARE,POZON, PAER, PDST_WL,OSUBG_COND )
-! #######################################################################
+! ###################################################################
+ SUBROUTINE INI_RADIATIONS_ECMWF(HINIFILE, &
+ PZHAT, PPABST, PTHT, PTSRAD, PLAT, PLON, TPDTCUR, TPDTEXP, &
+ HLW, KDLON, KFLEV, KFLUX, KRAD, KSWB, HAER, KAER, KSTATM, &
+ PSTATM, PSEA, PTOWN, PBARE, POZON, PAER, PDST_WL, OSUBG_COND )
+! ###################################################################
!
!!**** *INI_RADIATIONS * - initialisation for ECMWF radiation scheme in the MesoNH framework
!!
@@ -173,6 +171,7 @@ END MODULE MODI_INI_RADIATIONS_ECMWF
!! (V. Masson) replaces cover fractions by sea/town/bare soil fractions
!! J.Escobar 30/03/2017 : Management of compilation of ECMWF_RAD in REAL*8 with MNH_REAL=R4
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -217,8 +216,6 @@ IMPLICIT NONE
!* 0.1 Declarations of dummy arguments :
!
CHARACTER (LEN=*), INTENT(IN) :: HINIFILE ! Name of the initial file
-CHARACTER (LEN=*), INTENT(IN) :: HLUOUT ! name for output-listing
- ! of nested models
CHARACTER (LEN=*), INTENT(IN) :: HAER ! aerosol optical thickness climatology
CHARACTER (LEN=4), INTENT(IN) :: HLW ! LW scheme used
!
diff --git a/src/MNH/ini_radiations_ecrad.f90 b/src/MNH/ini_radiations_ecrad.f90
index f4115e2c5..d24b8b329 100644
--- a/src/MNH/ini_radiations_ecrad.f90
+++ b/src/MNH/ini_radiations_ecrad.f90
@@ -1,29 +1,22 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2018-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG1 2007/06/15 17:47:18
-!-----------------------------------------------------------------
! ##########################
MODULE MODI_INI_RADIATIONS_ECRAD
! ##########################
!
INTERFACE
!
- SUBROUTINE INI_RADIATIONS_ECRAD(HINIFILE,HLUOUT, &
- PZHAT,PPABST,PTHT,PTSRAD,PLAT,PLON,TPDTCUR,TPDTEXP, &
- HLW,KDLON,KFLEV,KFLUX,KRAD,KSWB_OLD,HAER,KAER,KSTATM, &
- PSTATM,PSEA,PTOWN,PBARE,POZON, PAER,PDST_WL, OSUBG_COND )
+ SUBROUTINE INI_RADIATIONS_ECRAD(HINIFILE, &
+ PZHAT, PPABST, PTHT, PTSRAD, PLAT, PLON, TPDTCUR, TPDTEXP, &
+ HLW, KDLON, KFLEV, KFLUX, KRAD, KSWB_OLD, HAER, KAER, KSTATM, &
+ PSTATM, PSEA, PTOWN, PBARE, POZON, PAER, PDST_WL, OSUBG_COND )
!
USE MODD_TYPE_DATE
CHARACTER (LEN=*), INTENT(IN) :: HINIFILE ! Name of the initial file
-CHARACTER (LEN=*), INTENT(IN) :: HLUOUT ! name for output-listing
- ! of nested models
CHARACTER (LEN=*), INTENT(IN) :: HAER ! aerosol optical thickness climatology
CHARACTER (LEN=4), INTENT(IN) :: HLW ! LW scheme used
!
@@ -65,12 +58,12 @@ END INTERFACE
END MODULE MODI_INI_RADIATIONS_ECRAD
!
!
-! #######################################################################
- SUBROUTINE INI_RADIATIONS_ECRAD(HINIFILE,HLUOUT, &
- PZHAT,PPABST,PTHT,PTSRAD,PLAT,PLON,TPDTCUR,TPDTEXP, &
- HLW,KDLON,KFLEV,KFLUX,KRAD,KSWB_OLD,HAER,KAER,KSTATM, &
- PSTATM,PSEA,PTOWN,PBARE,POZON, PAER,PDST_WL, OSUBG_COND )
-! #######################################################################
+! ####################################################################
+ SUBROUTINE INI_RADIATIONS_ECRAD(HINIFILE, &
+ PZHAT, PPABST, PTHT, PTSRAD, PLAT, PLON, TPDTCUR, TPDTEXP, &
+ HLW, KDLON, KFLEV, KFLUX, KRAD, KSWB_OLD, HAER, KAER, KSTATM, &
+ PSTATM, PSEA, PTOWN, PBARE, POZON, PAER, PDST_WL, OSUBG_COND )
+! ####################################################################
!
! INI_RADIATIONS_ECRAD - Initialization of ECRAD code
!
@@ -92,8 +85,7 @@ END MODULE MODI_INI_RADIATIONS_ECRAD
! MODIFICATIONS
! -------------
!
-! TO DO
-
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!
!* 0. DECLARATIONS
! ------------
@@ -123,8 +115,6 @@ IMPLICIT NONE
!* 0.1 Declarations of dummy arguments :
!
CHARACTER (LEN=*), INTENT(IN) :: HINIFILE ! Name of the initial file
-CHARACTER (LEN=*), INTENT(IN) :: HLUOUT ! name for output-listing
- ! of nested models
CHARACTER (LEN=*), INTENT(IN) :: HAER ! aerosol optical thickness climatology
CHARACTER (LEN=4), INTENT(IN) :: HLW ! LW scheme used
!
@@ -164,10 +154,10 @@ LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for sub-grid condensation
NULOUT = TLUOUT%NLU
! Initialization of ECMWF still neede because many things intialized through this routine
-CALL INI_RADIATIONS_ECMWF (HINIFILE,HLUOUT, &
- PZHAT,PPABST,PTHT,PTSRAD,PLAT,PLON,TPDTCUR,TPDTEXP, &
- HLW,KDLON,KFLEV,KFLUX,KRAD,KSWB_OLD,HAER,KAER,KSTATM, &
- PSTATM,PSEA,PTOWN,PBARE,POZON, PAER,PDST_WL, OSUBG_COND )
+CALL INI_RADIATIONS_ECMWF( HINIFILE, &
+ PZHAT, PPABST, PTHT, PTSRAD, PLAT, PLON, TPDTCUR, TPDTEXP, &
+ HLW, KDLON, KFLEV, KFLUX, KRAD, KSWB_OLD, HAER, KAER, KSTATM, &
+ PSTATM, PSEA, PTOWN, PBARE, POZON, PAER, PDST_WL, OSUBG_COND )
! ECRAD specific variables
diff --git a/src/MNH/ini_segn.f90 b/src/MNH/ini_segn.f90
index ba3fb3458..b011e0892 100644
--- a/src/MNH/ini_segn.f90
+++ b/src/MNH/ini_segn.f90
@@ -9,12 +9,11 @@
!
INTERFACE
!
-SUBROUTINE INI_SEG_n(KMI,HLUOUT,TPINIFILE,HINIFILEPGD,PTSTEP_ALL)
+SUBROUTINE INI_SEG_n(KMI,TPINIFILE,HINIFILEPGD,PTSTEP_ALL)
!
USE MODD_IO_ll, ONLY : TFILEDATA
!
INTEGER, INTENT(IN) :: KMI !Model index
-CHARACTER (LEN=*), INTENT(OUT) :: HLUOUT !Name for output-listing of nested models
TYPE(TFILEDATA), POINTER, INTENT(OUT) :: TPINIFILE !Initial file
CHARACTER (LEN=28), INTENT(OUT) :: HINIFILEPGD
REAL,DIMENSION(:), INTENT(INOUT) :: PTSTEP_ALL ! Time STEP of ALL models
@@ -29,7 +28,7 @@ END MODULE MODI_INI_SEG_n
!
!
! #############################################################
- SUBROUTINE INI_SEG_n(KMI,HLUOUT,TPINIFILE,HINIFILEPGD,PTSTEP_ALL)
+ SUBROUTINE INI_SEG_n(KMI,TPINIFILE,HINIFILEPGD,PTSTEP_ALL)
! #############################################################
!
!!**** *INI_SEG_n * - routine to read and update the descriptor files for
@@ -164,6 +163,7 @@ END MODULE MODI_INI_SEG_n
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
!! 07/2017 add GBLOWSNOW (V. Vionnet)
! P. Wautelet 07/02/2019: force TYPE to a known value for IO_FILE_ADD2LIST
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -200,7 +200,6 @@ IMPLICIT NONE
!* 0.1 declarations of arguments
!
INTEGER, INTENT(IN) :: KMI !Model index
-CHARACTER (LEN=*), INTENT(OUT) :: HLUOUT !Name for output-listing of nested models
TYPE(TFILEDATA), POINTER, INTENT(OUT) :: TPINIFILE !Initial file
CHARACTER (LEN=28), INTENT(OUT) :: HINIFILEPGD
REAL,DIMENSION(:), INTENT(INOUT) :: PTSTEP_ALL ! Time STEP of ALL models
@@ -211,7 +210,7 @@ LOGICAL :: GFOUND ! Return code when searching namelist
CHARACTER (LEN=28) :: YINIFILE ! name of initial file
CHARACTER (LEN=2) :: YMI ! string for model index
INTEGER :: ILUOUT ! Logical unit number
- ! associated with CLUOUT
+ ! associated with TLUOUT
!
INTEGER :: IRESP,ILUSEG ! File management variables
CHARACTER (LEN=5) :: YCONF ! Local variables which have
@@ -260,8 +259,7 @@ TZFILE_DES => NULL()
! ---------------------------------------
!
WRITE(YMI,'(I2.0)') KMI
-HLUOUT='OUTPUT_LISTING'//ADJUSTL(YMI)
-CALL IO_FILE_ADD2LIST(LUNIT_MODEL(KMI)%TLUOUT,HLUOUT,'OUTPUTLISTING','WRITE')
+CALL IO_FILE_ADD2LIST(LUNIT_MODEL(KMI)%TLUOUT,'OUTPUT_LISTING'//ADJUSTL(YMI),'OUTPUTLISTING','WRITE')
TLUOUT => LUNIT_MODEL(KMI)%TLUOUT !Necessary because TLUOUT was initially pointing to NULL
CALL IO_FILE_OPEN_ll(TLUOUT)
!
diff --git a/src/MNH/ini_sizen.f90 b/src/MNH/ini_sizen.f90
index 3cfad7f7e..e3e757376 100644
--- a/src/MNH/ini_sizen.f90
+++ b/src/MNH/ini_sizen.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! #################
@@ -9,12 +9,11 @@
!
INTERFACE
!
-SUBROUTINE INI_SIZE_n(KMI,HLUOUT,TPINIFILE,HINIFILEPGD)
+SUBROUTINE INI_SIZE_n( KMI, TPINIFILE, HINIFILEPGD )
!
USE MODD_IO_ll, ONLY : TFILEDATA
!
INTEGER, INTENT(IN) :: KMI !Model Index
-CHARACTER (LEN=*), INTENT(IN) :: HLUOUT !Name for output-listing of nested models
TYPE(TFILEDATA), INTENT(IN) :: TPINIFILE !Initial file
CHARACTER (LEN=*), INTENT(IN) :: HINIFILEPGD
!
@@ -24,9 +23,9 @@ END INTERFACE
!
END MODULE MODI_INI_SIZE_n
!-----------------------------------------------------------------
-! #######################################################
- SUBROUTINE INI_SIZE_n(KMI,HLUOUT,TPINIFILE,HINIFILEPGD)
-! #######################################################
+! ####################################################
+ SUBROUTINE INI_SIZE_n( KMI, TPINIFILE, HINIFILEPGD )
+! ####################################################
!
!!
!!**** *INI_SIZE_n* - routine to initialize the sizes ratio positions of nested model _n
@@ -40,7 +39,7 @@ END MODULE MODI_INI_SIZE_n
!! ------
!! The first part of the initialization of the model _n is performed as
!! follows :
-!! - The logical unit number associated to output_listing file HLUOUT is
+!! - The logical unit number associated to output_listing file TLUOUT is
!! retrieved and module MODD_LUNIT_n is initialized.
!! - Then the description of the segment to perform for the model _n is
!! retrieved :
@@ -95,6 +94,7 @@ END MODULE MODI_INI_SIZE_n
!! June 2006 (D. Gazen) _n: no more read of updated var.
!! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!!
!-------------------------------------------------------------------------------
!
@@ -108,7 +108,7 @@ USE MODD_DIM_n, ONLY: NIMAX_ll, NJMAX_ll, NKMAX
USE MODD_DYN, ONLY: LCORIO
USE MODD_IO_ll, ONLY: GSMONOPROC, TFILEDATA
USE MODD_LBC_n, ONLY: CLBCX, CLBCY
-USE MODD_LUNIT_n, ONLY: CLUOUT, CINIFILE, CINIFILEPGD, TLUOUT
+USE MODD_LUNIT_n, ONLY: CINIFILE, CINIFILEPGD, TLUOUT
USE MODD_NESTING, ONLY: CMY_NAME, CDAD_NAME, NDAD, NDXRATIO_ALL, NDYRATIO_ALL, &
NXOR_ALL, NYOR_ALL, NXEND_ALL,NYEND_ALL
USE MODD_PARAMETERS, ONLY: JPMODELMAX, JPHEXT,JPVEXT
@@ -126,7 +126,6 @@ IMPLICIT NONE
!* 0.1 declarations of arguments
!
INTEGER, INTENT(IN) :: KMI !Model Index
-CHARACTER (LEN=*), INTENT(IN) :: HLUOUT !Name for output-listing of nested models
TYPE(TFILEDATA), INTENT(IN) :: TPINIFILE !Initial file
CHARACTER (LEN=*), INTENT(IN) :: HINIFILEPGD
!
@@ -142,7 +141,6 @@ INTEGER :: IJPHEXT
! --------------------------------------------------------
!
ILUOUT = TLUOUT%NLU
-CLUOUT = HLUOUT
CINIFILEPGD=HINIFILEPGD
!
!-------------------------------------------------------------------------------
diff --git a/src/MNH/ini_spectren.f90 b/src/MNH/ini_spectren.f90
index d2564f410..93075f50a 100644
--- a/src/MNH/ini_spectren.f90
+++ b/src/MNH/ini_spectren.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! #######################
@@ -9,12 +9,11 @@
!
INTERFACE
!
- SUBROUTINE INI_SPECTRE_n(KMI,HLUOUT,TPINIFILE)
+ SUBROUTINE INI_SPECTRE_n(KMI,TPINIFILE)
!
USE MODD_IO_ll, ONLY: TFILEDATA
!
INTEGER, INTENT(IN) :: KMI ! Model index
- CHARACTER (LEN=*), INTENT(IN) :: HLUOUT ! Name for output-listing of nested models
TYPE(TFILEDATA), INTENT(IN) :: TPINIFILE ! Initial file
!
END SUBROUTINE INI_SPECTRE_n
@@ -22,9 +21,9 @@ END SUBROUTINE INI_SPECTRE_n
END INTERFACE
!
END MODULE MODI_INI_SPECTRE_n
-! ######################################################
- SUBROUTINE INI_SPECTRE_n(KMI,HLUOUT,TPINIFILE)
-! ######################################################
+! #######################################
+ SUBROUTINE INI_SPECTRE_n(KMI,TPINIFILE)
+! #######################################
!
!!**** *INI_SPECTRE_n* - routine to initialize SPECTRE (based on ini_modeln.f90)
!!
@@ -34,8 +33,8 @@ END MODULE MODI_INI_SPECTRE_n
!! J.P Chaboureau * L.A*
!! 10/2016 (C.Lac) Cleaning of the modules
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
-!!
-
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
+!
!---------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -135,7 +134,6 @@ IMPLICIT NONE
!
!
INTEGER, INTENT(IN) :: KMI ! Model index
-CHARACTER (LEN=*), INTENT(IN) :: HLUOUT ! Name for output-listing of nested models
TYPE(TFILEDATA), INTENT(IN) :: TPINIFILE ! Initial file
!
!* 0.2 declarations of local variables
@@ -891,7 +889,7 @@ IF ( KMI > 1) THEN
DPTR_XLBYRM=>XLBYRM
DPTR_XLBXSVM=>XLBXSVM
DPTR_XLBYSVM=>XLBYSVM
- CALL INI_ONE_WAY_n(NDAD(KMI),HLUOUT,XTSTEP,KMI,1, &
+ CALL INI_ONE_WAY_n(NDAD(KMI),XTSTEP,KMI,1, &
DPTR_XBMX1,DPTR_XBMX2,DPTR_XBMX3,DPTR_XBMX4,DPTR_XBMY1,DPTR_XBMY2,DPTR_XBMY3,DPTR_XBMY4, &
DPTR_XBFX1,DPTR_XBFX2,DPTR_XBFX3,DPTR_XBFX4,DPTR_XBFY1,DPTR_XBFY2,DPTR_XBFY3,DPTR_XBFY4, &
NDXRATIO_ALL(KMI),NDYRATIO_ALL(KMI),NDTRATIO(KMI), &
diff --git a/src/MNH/init_mnh.f90 b/src/MNH/init_mnh.f90
index 2d0e7ed3e..debf3b7a0 100644
--- a/src/MNH/init_mnh.f90
+++ b/src/MNH/init_mnh.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ###############
@@ -47,8 +47,6 @@
!!
!! Module MODD_CONF : NMODEL,NVERB
!!
-!! Module MODD_LUNIT : CLUOUT0
-!!
!! REFERENCE
!! ---------
!! Book2 of documentation (routine INIT_MNH)
@@ -72,6 +70,7 @@
!! J.Escobar 2/03/2016 bypass , reset NHALO=1 for SPAWNING
!! 06/2016 (G.Delautier) phasage surfex 8
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -108,8 +107,6 @@ IMPLICIT NONE
!* 0.1 Local variables
!
INTEGER :: JMI ! Loop index
-CHARACTER(LEN=16), DIMENSION(JPMODELMAX) :: YLUOUT ! Name for output-listing
- ! of nested models
CHARACTER(LEN=28),DIMENSION(JPMODELMAX) :: YINIFILEPGD
INTEGER :: ILUOUT0,IRESP ! Logical unit number for
! output-listing common
@@ -130,7 +127,6 @@ CHARACTER(LEN=4), DIMENSION(:), POINTER :: DPTR_CLBCX,DPTR_CLBCY
!
!
IF (CPROGRAM/='REAL ') THEN
- CLUOUT0 = 'OUTPUT_LISTING0'
CALL IO_FILE_ADD2LIST(TLUOUT0,'OUTPUT_LISTING0','OUTPUTLISTING','WRITE')
CALL IO_FILE_OPEN_ll(TLUOUT0)
!Set output file for PRINT_MSG
@@ -171,11 +167,11 @@ IF (CPROGRAM=='SPAWN ' .OR. CPROGRAM=='DIAG ' .OR. CPROGRAM=='SPEC ' .OR. CPRO
END IF
!
CALL GOTO_MODEL(1)
-CALL INI_SEG_n(1,YLUOUT(1),LUNIT_MODEL(1)%TINIFILE,YINIFILEPGD(1),ZTSTEP_ALL)
+CALL INI_SEG_n(1,LUNIT_MODEL(1)%TINIFILE,YINIFILEPGD(1),ZTSTEP_ALL)
!
DO JMI=2,NMODEL
CALL GOTO_MODEL(JMI)
- CALL INI_SEG_n(JMI,YLUOUT(JMI),LUNIT_MODEL(JMI)%TINIFILE,YINIFILEPGD(JMI),ZTSTEP_ALL)
+ CALL INI_SEG_n(JMI,LUNIT_MODEL(JMI)%TINIFILE,YINIFILEPGD(JMI),ZTSTEP_ALL)
END DO
!
IF (CPROGRAM=='SPAWN ') THEN
@@ -183,7 +179,7 @@ IF (CPROGRAM=='SPAWN ') THEN
NHALO = 1
END IF
!
-IF (CPROGRAM=='DIAG') CALL RESET_EXSEG(YLUOUT(1))
+IF (CPROGRAM=='DIAG') CALL RESET_EXSEG()
!
!-------------------------------------------------------------------------------
!
@@ -193,7 +189,7 @@ IF (CPROGRAM=='DIAG') CALL RESET_EXSEG(YLUOUT(1))
!
DO JMI=1,NMODEL
CALL GOTO_MODEL(JMI)
- CALL INI_SIZE_n(JMI,YLUOUT(JMI),LUNIT_MODEL(JMI)%TINIFILE,YINIFILEPGD(JMI))
+ CALL INI_SIZE_n(JMI,LUNIT_MODEL(JMI)%TINIFILE,YINIFILEPGD(JMI))
END DO
!
IF (CPROGRAM=='SPAWN ') THEN
@@ -234,11 +230,11 @@ DO JMI=1,NMODEL
CALL GO_TOMODEL_ll(JMI,IINFO_ll)
CALL GOTO_MODEL(JMI)
IF (CPROGRAM/='SPEC ') THEN
- CALL INI_MODEL_n(JMI,YLUOUT(JMI),LUNIT_MODEL(JMI)%TINIFILE)
+ CALL INI_MODEL_n(JMI,LUNIT_MODEL(JMI)%TINIFILE)
!Call necessary to update the TFIELDLIST pointers to the data
CALL FIELDLIST_GOTO_MODEL(JMI,JMI)
ELSE
- CALL INI_SPECTRE_n(JMI,YLUOUT(JMI),LUNIT_MODEL(JMI)%TINIFILE)
+ CALL INI_SPECTRE_n(JMI,LUNIT_MODEL(JMI)%TINIFILE)
END IF
END DO
!
diff --git a/src/MNH/mean_prof.f90 b/src/MNH/mean_prof.f90
index 121f80c25..773ee9a8c 100644
--- a/src/MNH/mean_prof.f90
+++ b/src/MNH/mean_prof.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1997-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! #####################
@@ -62,7 +62,7 @@ END MODULE MODI_MEAN_PROF
!! Module MODD_CONF : contains configuration variables for all models.
!! NVERB : verbosity level for output-listing
!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
+!! TLUOUT0 : name of output-listing
!! Module MODD_GRID1 : contains grid variables for model1
!! XZS : orography of MESO-NH
!! XZHAT : GS levels
diff --git a/src/MNH/mnhclose_namelist.f90 b/src/MNH/mnhclose_namelist.f90
index 28193c6ef..1e7544b0a 100644
--- a/src/MNH/mnhclose_namelist.f90
+++ b/src/MNH/mnhclose_namelist.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2003-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! #############################
@@ -77,7 +77,6 @@ INTEGER :: IRESP ! IRESP : return-code if a problem appears
!
INTEGER :: IMI ! model index
INTEGER :: ILUOUT ! output listing logical unit
-CHARACTER(LEN=16) :: YLUOUT ! output listing file name
!-------------------------------------------------------------------------------
!
IF (.NOT.ASSOCIATED(TNAM)) CALL PRINT_MSG(NVERB_FATAL,'IO','CLOSE_FILE_MNH','TNAM not associated')
diff --git a/src/MNH/mnhinit_io_surfn.f90 b/src/MNH/mnhinit_io_surfn.f90
index bf67169ff..f242171c8 100644
--- a/src/MNH/mnhinit_io_surfn.f90
+++ b/src/MNH/mnhinit_io_surfn.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2003-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! #########################
@@ -61,7 +61,7 @@ USE MODD_IO_SURF_MNH, ONLY: TOUT, TPINFILE, COUTFILE,
NMASK, CMASK, NIU, NJU, NIB, NJB, NIE, NJE, CACTION, &
NMASK_ALL, NIU_ALL, NJU_ALL, NIB_ALL, NJB_ALL, &
NIE_ALL, NJE_ALL, NHALO
-USE MODD_LUNIT, ONLY: CLUOUT0, TPGDFILE, TLUOUT0, TOUTDATAFILE
+USE MODD_LUNIT, ONLY: TPGDFILE, TLUOUT0, TOUTDATAFILE
USE MODD_LUNIT_n, ONLY: CMASK_SURFEX, TINIFILE, TINIFILEPGD, TLUOUT
USE MODD_MNH_SURFEX_n, ONLY: YSURF_CUR
USE MODD_PARAMETERS, ONLY: JPHEXT
diff --git a/src/MNH/mnhopen_aux_io_surf.f90 b/src/MNH/mnhopen_aux_io_surf.f90
index 0bf06bb0f..2c4a223fb 100644
--- a/src/MNH/mnhopen_aux_io_surf.f90
+++ b/src/MNH/mnhopen_aux_io_surf.f90
@@ -2,6 +2,7 @@
!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.
+!-----------------------------------------------------------------
! #########################
MODULE MODI_MNHOPEN_AUX_IO_SURF
! #########################
@@ -65,7 +66,7 @@ USE MODD_CONF, ONLY: CPROGRAM
USE MODD_IO_SURF_MNH, ONLY: TOUT, TPINFILE, COUTFILE, NMASK_ALL, CMASK, NIU_ALL, &
NJU_ALL, NIB_ALL, NJB_ALL, NIE_ALL, NJE_ALL, CACTION, &
NMASK, NIU, NJU, NIB, NJB, NIE, NJE
-USE MODD_LUNIT, ONLY: CLUOUT0, TPGDFILE, TLUOUT0, TOUTDATAFILE
+USE MODD_LUNIT, ONLY: TPGDFILE, TLUOUT0, TOUTDATAFILE
USE MODD_LUNIT_n, ONLY: TLUOUT
USE MODD_PARAMETERS, ONLY: JPHEXT
!
diff --git a/src/MNH/modd_lunit.f90 b/src/MNH/modd_lunit.f90
index 36027e7cf..a409e852d 100644
--- a/src/MNH/modd_lunit.f90
+++ b/src/MNH/modd_lunit.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! #################
@@ -22,16 +22,17 @@
!! REFERENCE
!! ---------
!! Book2 of documentation of Meso-NH (MODD_LUNIT)
-!!
+!!
!! AUTHOR
!! ------
-!! V. Ducrocq *Meteo France*
+!! V. Ducrocq *Meteo France*
!!
!! MODIFICATIONS
!! -------------
-!! Original 05/05/94
+!! Original 05/05/94
!! V. Masson 01/2004 add file names for use in externalized surface
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -41,7 +42,6 @@ USE MODD_IO_ll, ONLY: TFILEDATA
!
IMPLICIT NONE
!
-CHARACTER(LEN=16),SAVE :: CLUOUT0 ! Name of output_listing file
TYPE(TFILEDATA),POINTER :: TLUOUT0 => NULL() ! output_listing file
TYPE(TFILEDATA),POINTER :: TOUTDATAFILE => NULL() ! output data file being written
TYPE(TFILEDATA),POINTER :: TPGDFILE => NULL() ! PGD file
diff --git a/src/MNH/modd_lunitn.f90 b/src/MNH/modd_lunitn.f90
index 10fe48a5f..9462e7bbf 100644
--- a/src/MNH/modd_lunitn.f90
+++ b/src/MNH/modd_lunitn.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ###################
@@ -35,6 +35,7 @@
!! Modification 10/03/95 (I.Mallet) add the coupling files names
!! Modification 25/09/95 (J.Stein) add the output diachronic file
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -54,8 +55,6 @@ TYPE LUNIT_t
TYPE(TFILEDATA),POINTER :: TINIFILEPGD => NULL() ! PGD associated to input FM-file
CHARACTER(LEN=24) :: COUTFILE = '' ! Generic name of the output FM-files
TYPE(TFILEDATA),POINTER :: TDIAFILE => NULL() ! diachronic output file
-!
- CHARACTER(LEN=16) :: CLUOUT = '' ! Name of output_listing file
TYPE(TFILEDATA),POINTER :: TLUOUT => NULL() ! output_listing file
!JUAN
CHARACTER(LEN=28),DIMENSION(:),POINTER :: CCPLFILE =>NULL() ! Names of the
@@ -75,7 +74,6 @@ CHARACTER(LEN=28), POINTER :: CINIFILEPGD =>NULL()
TYPE(TFILEDATA), POINTER :: TINIFILEPGD => NULL()
CHARACTER(LEN=24), POINTER :: COUTFILE=>NULL()
TYPE(TFILEDATA), POINTER :: TDIAFILE=>NULL()
-CHARACTER(LEN=16), POINTER :: CLUOUT=>NULL()
TYPE(TFILEDATA), POINTER :: TLUOUT=>NULL()
CHARACTER(LEN=28),DIMENSION(:), POINTER :: CCPLFILE=>NULL()
TYPE(TPTR2FILE), DIMENSION(:), POINTER :: TCPLFILE=>NULL()
@@ -107,7 +105,6 @@ CINIFILEPGD=>LUNIT_MODEL(KTO)%CINIFILEPGD
TINIFILEPGD=>LUNIT_MODEL(KTO)%TINIFILEPGD
COUTFILE=>LUNIT_MODEL(KTO)%COUTFILE
TDIAFILE=>LUNIT_MODEL(KTO)%TDIAFILE
-CLUOUT=>LUNIT_MODEL(KTO)%CLUOUT
TLUOUT=>LUNIT_MODEL(KTO)%TLUOUT
CCPLFILE=>LUNIT_MODEL(KTO)%CCPLFILE
TCPLFILE=>LUNIT_MODEL(KTO)%TCPLFILE
diff --git a/src/MNH/mode_gridproj.f90 b/src/MNH/mode_gridproj.f90
index f6de1038d..814e5cf77 100644
--- a/src/MNH/mode_gridproj.f90
+++ b/src/MNH/mode_gridproj.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ####################
@@ -1429,8 +1429,8 @@ END SUBROUTINE SM_XYHAT_A
!! Module MODD_CST : contains Physical constants
!! XPI : Pi;
!!
-!! Module MODD_LUNIT : contains logical unit names
-!! CLUOUT0 : Output listing file name
+!! Module MODD_LUNIT_n : contains logical unit names
+!! TLUOUT : Output listing file name
!!
!! REFERENCE
!! ---------
diff --git a/src/MNH/open_nestpgd_files.f90 b/src/MNH/open_nestpgd_files.f90
index 2274e9174..18d8f5f51 100644
--- a/src/MNH/open_nestpgd_files.f90
+++ b/src/MNH/open_nestpgd_files.f90
@@ -41,7 +41,7 @@ END MODULE MODI_OPEN_NESTPGD_FILES
!! ------------------
!!
!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
+!! TLUOUT0 : output-listing
!!
!! REFERENCE
!! ---------
@@ -70,6 +70,7 @@ END MODULE MODI_OPEN_NESTPGD_FILES
! P. Wautelet 07/02/2019: force TYPE to a known value for IO_FILE_ADD2LIST
! P. Wautelet 07/02/2019: remove OPARALLELIO argument from open and close files subroutines
! (nsubfiles_ioz is now determined in IO_FILE_ADD2LIST)
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -152,12 +153,11 @@ TZPRE_NEST_PGD => NULL()
! -----------------
!
HPRE_NEST_PGD='PRE_NEST_PGD1.nam'
-CLUOUT0='OUTPUT_LISTING0'
!
!-------------------------------------------------------------------------------
!
-!* 2. OPENNING OF CLUOUT0
-! -------------------
+!* 2. OPENING OF TLUOUT0
+! ------------------
!
CALL IO_FILE_ADD2LIST(TLUOUT0,'OUTPUT_LISTING0','OUTPUTLISTING','WRITE')
CALL IO_FILE_OPEN_ll(TLUOUT0)
diff --git a/src/MNH/open_prc_files.f90 b/src/MNH/open_prc_files.f90
index a5114c836..42cee97ca 100644
--- a/src/MNH/open_prc_files.f90
+++ b/src/MNH/open_prc_files.f90
@@ -43,7 +43,7 @@ END MODULE MODI_OPEN_PRC_FILES
!! PURPOSE
!! -------
!!
-!! This routine set the default name of CLUOUT0
+!! This routine creates TLUOUT0
!! This routine read in 'PRE_REAL1.nam' the names of the files used in
!! PREP_REAL_CASE: Aladin or Mesonh input file, physiographic data file,
!! output listing file and MESO-NH output file.
@@ -65,7 +65,7 @@ END MODULE MODI_OPEN_PRC_FILES
!! Module MODD_CONF : contains configuration variables for all models.
!! NVERB : verbosity level for output-listing
!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
+!! TLUOUT0 : output-listing
!! Module MODD_LUNIT1 :
!! CINIFILE : name of MESO-NH file
!!
@@ -94,6 +94,7 @@ END MODULE MODI_OPEN_PRC_FILES
! P. Wautelet 07/02/2019: force TYPE to a known value for IO_FILE_ADD2LIST
! P. Wautelet 07/02/2019: remove OPARALLELIO argument from open and close files subroutines
! (nsubfiles_ioz is now determined in IO_FILE_ADD2LIST)
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -164,8 +165,6 @@ HCHEMFILE=' '
HCHEMFILETYPE='MESONH'
HSURFFILE=' '
HSURFFILETYPE='MESONH'
-CLUOUT0 ='OUTPUT_LISTING0 '
-CLUOUT = CLUOUT0
!
!-------------------------------------------------------------------------------
!
diff --git a/src/MNH/prep_ideal_case.f90 b/src/MNH/prep_ideal_case.f90
index d6f245f7b..7a64a4869 100644
--- a/src/MNH/prep_ideal_case.f90
+++ b/src/MNH/prep_ideal_case.f90
@@ -312,6 +312,7 @@
!! 01/2018 (G.Delautier) SURFEX 8.1
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
! P. Wautelet 07/02/2019: force TYPE to a known value for IO_FILE_ADD2LIST
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -664,9 +665,7 @@ CALL DEFAULT_EXPRE
! and open these files :
!
!
-CLUOUT = 'OUTPUT_LISTING1'
-CLUOUT0 = CLUOUT
-CALL IO_FILE_ADD2LIST(TLUOUT0,CLUOUT0,'OUTPUTLISTING','WRITE')
+CALL IO_FILE_ADD2LIST(TLUOUT0,'OUTPUT_LISTING1','OUTPUTLISTING','WRITE')
CALL IO_FILE_OPEN_ll(TLUOUT0)
NLUOUT = TLUOUT0%NLU
!Set output files for PRINT_MSG
diff --git a/src/MNH/prep_pgd.f90 b/src/MNH/prep_pgd.f90
index 8617ff5c1..c06a62092 100644
--- a/src/MNH/prep_pgd.f90
+++ b/src/MNH/prep_pgd.f90
@@ -2,6 +2,7 @@
!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.
+!-----------------------------------------------------------------
! ################
PROGRAM PREP_PGD
! ################
@@ -76,6 +77,7 @@
! P. Wautelet 07/02/2019: force TYPE to a known value for IO_FILE_ADD2LIST
! P. Wautelet 07/02/2019: remove OPARALLELIO argument from open and close files subroutines
! (nsubfiles_ioz is now determined in IO_FILE_ADD2LIST)
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!
!----------------------------------------------------------------------------
!
@@ -84,7 +86,7 @@
!
USE MODD_CONF, ONLY : CPROGRAM, L1D, L2D, LPACK, LCARTESIAN
USE MODD_CONF_n,ONLY : CSTORAGE_TYPE
-USE MODD_LUNIT, ONLY : CLUOUT0,TLUOUT0
+USE MODD_LUNIT, ONLY : TLUOUT0
USE MODD_LUNIT_n,ONLY : LUNIT_MODEL
USE MODD_PARAMETERS, ONLY : XUNDEF
USE MODD_IO_ll, ONLY : NIO_VERB,NVERB_DEBUG,TFILEDATA,TFILE_OUTPUTLISTING,TFILE_SURFEX
@@ -166,7 +168,6 @@ CALL INITIO_ll()
!
NHALO=15
!
-CLUOUT0='OUTPUT_LISTING0' ! Name of the output-listing.
CALL IO_FILE_ADD2LIST(TLUOUT0,'OUTPUT_LISTING0','OUTPUTLISTING','WRITE')
CALL IO_FILE_OPEN_ll(TLUOUT0)
!
diff --git a/src/MNH/prep_real_case.f90 b/src/MNH/prep_real_case.f90
index 9caff1432..06d09417c 100644
--- a/src/MNH/prep_real_case.f90
+++ b/src/MNH/prep_real_case.f90
@@ -287,7 +287,6 @@
!! Module MODD_CONF1 : contains configuration variables for model 1.
!! NRR : number of moist variables
!! Module MODD_LUNIT : contains logical unit and names of files.
-!! CLUOUT0 : name of output-listing
!! Module MODD_LUNIT : contains logical unit and names of files (model1).
!! CINIFILE: name of the FM file which will be used for the MESO-NH run.
!! Module MODD_GRID1 : contains grid variables.
@@ -380,6 +379,7 @@
!! B.VIE 2016 : LIMA
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
! P. Wautelet 07/02/2019: force TYPE to a known value for IO_FILE_ADD2LIST
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -402,7 +402,7 @@ USE MODD_HURR_CONF
USE MODD_IO_ll, ONLY: TFILEDATA,NIO_VERB,NVERB_DEBUG,TFILE_SURFEX
USE MODD_LBC_n
USE MODD_LSFIELD_n
-USE MODD_LUNIT, ONLY: CLUOUT0,TPGDFILE,TLUOUT0,TOUTDATAFILE
+USE MODD_LUNIT, ONLY: TPGDFILE,TLUOUT0,TOUTDATAFILE
USE MODD_LUNIT_n, ONLY: CINIFILE,TINIFILE,TLUOUT
USE MODD_METRICS_n
USE MODD_MNH_SURFEX_n
@@ -959,14 +959,14 @@ ZDYN = ZTIME2 - ZTIME1
ZTIME1 = ZTIME2
!
IF(LEN_TRIM(YCHEMFILE)>0 .AND. YCHEMFILETYPE=='MESONH')THEN
- CALL INI_PROG_VAR(CLUOUT0,XTKE_MX,XSV_MX,YCHEMFILE)
+ CALL INI_PROG_VAR(XTKE_MX,XSV_MX,YCHEMFILE)
LHORELAX_SVCHEM = (NSV_CHEM > 0)
LHORELAX_SVCHIC = (NSV_CHIC > 0)
LHORELAX_SVDST = (NSV_DST > 0)
LHORELAX_SVSLT = (NSV_SLT > 0)
LHORELAX_SVAER = (NSV_AER > 0)
ELSE
- CALL INI_PROG_VAR(CLUOUT0,XTKE_MX,XSV_MX)
+ CALL INI_PROG_VAR(XTKE_MX,XSV_MX)
END IF
!
IF (ALLOCATED(XSV_MX)) DEALLOCATE(XSV_MX)
diff --git a/src/MNH/prep_surfex.f90 b/src/MNH/prep_surfex.f90
index 06ea465e8..5de5ce5c6 100644
--- a/src/MNH/prep_surfex.f90
+++ b/src/MNH/prep_surfex.f90
@@ -36,7 +36,7 @@ USE MODD_CONF, ONLY : CPROGRAM,&
L1D, L2D, LPACK
USE MODD_CONF_n, ONLY : CSTORAGE_TYPE
USE MODD_IO_ll, ONLY : TFILEDATA, NIO_VERB, NVERB_DEBUG, TFILE_SURFEX
-USE MODD_LUNIT, ONLY : CLUOUT0, TPGDFILE, TLUOUT0
+USE MODD_LUNIT, ONLY : TPGDFILE, TLUOUT0
USE MODD_LUNIT_n, ONLY : CINIFILE, TINIFILE
USE MODD_MNH_SURFEX_n
USE MODD_PARAMETERS, ONLY : JPMODELMAX,JPHEXT,JPVEXT, NUNDEF, XUNDEF
diff --git a/src/MNH/read_all_data_grib_case.f90 b/src/MNH/read_all_data_grib_case.f90
index 8f4e4835a..fdcbbf4e4 100644
--- a/src/MNH/read_all_data_grib_case.f90
+++ b/src/MNH/read_all_data_grib_case.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1998-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1998-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! #################################
@@ -75,7 +75,7 @@ END MODULE MODI_READ_ALL_DATA_GRIB_CASE
!! Module MODD_CONF : contains configuration variables for all models.
!! NVERB : verbosity level for output-listing
!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
+!! TLUOUT0 : name of output-listing
!! Module MODD_PGDDIM : contains dimension of PGD fields
!! NPGDIMAX: dimension along x (no external point)
!! NPGDJMAX: dimension along y (no external point)
diff --git a/src/MNH/read_chem_data_netcdf_case.f90 b/src/MNH/read_chem_data_netcdf_case.f90
index 23bf979a7..c230fd1f5 100644
--- a/src/MNH/read_chem_data_netcdf_case.f90
+++ b/src/MNH/read_chem_data_netcdf_case.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 2012-2017 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2012-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ################################
@@ -71,7 +71,7 @@ END MODULE MODI_READ_CHEM_DATA_NETCDF_CASE
!! Module MODD_CONF : contains configuration variables for all models.
!! NVERB : verbosity level for output-listing
!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
+!! TLUOUT0 : name of output-listing
!! Module MODD_PGDDIM : contains dimension of PGD fields
!! NPGDIMAX: dimension along x (no external point)
!! NPGDJMAX: dimension along y (no external point)
diff --git a/src/MNH/read_exspa.f90 b/src/MNH/read_exspa.f90
index 4ca2bb66d..1eb9bd915 100644
--- a/src/MNH/read_exspa.f90
+++ b/src/MNH/read_exspa.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
!######################
@@ -94,6 +94,7 @@ END MODULE MODI_READ_EXSPA
!! Modification 30/03/12 (S.Bielli) add NAM_NCOUT for netcdf output (removed 08/07/2016)
!! Modification 08/07/2016 (P.Wautelet) removed MNH_NCWRIT define
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!
!-------------------------------------------------------------------------------
!
@@ -201,8 +202,7 @@ YSPANBR = '00'
YDADINIFILE = ' '
YDADSPAFILE = ' '
!
-LUNIT_MODEL(2)%CLUOUT = 'OUTPUT_LISTING2'
-CALL IO_FILE_ADD2LIST(LUNIT_MODEL(2)%TLUOUT,LUNIT_MODEL(2)%CLUOUT,'OUTPUTLISTING','WRITE')
+CALL IO_FILE_ADD2LIST(LUNIT_MODEL(2)%TLUOUT,'OUTPUT_LISTING2','OUTPUTLISTING','WRITE')
CALL IO_FILE_OPEN_ll(LUNIT_MODEL(2)%TLUOUT)
!
!Set output file for PRINT_MSG
diff --git a/src/MNH/read_hgridn.f90 b/src/MNH/read_hgridn.f90
index 7dd64e89a..77aa6acd7 100644
--- a/src/MNH/read_hgridn.f90
+++ b/src/MNH/read_hgridn.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2019 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.
@@ -55,8 +55,8 @@ END MODULE MODI_READ_HGRID_n
!! NJMAX
!! Module MODD_PARAMETERS :
!! JPHEXT
-!! Module MODD_LUNIT :
-!! CLUOUT
+!! Module MODD_LUNIT_n :
+!! TLUOUT
!!
!! REFERENCE
!! ---------
diff --git a/src/MNH/read_precip_field.f90 b/src/MNH/read_precip_field.f90
index 782175957..9450008a6 100644
--- a/src/MNH/read_precip_field.f90
+++ b/src/MNH/read_precip_field.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! #############################
@@ -11,7 +11,7 @@
!
INTERFACE
!
- SUBROUTINE READ_PRECIP_FIELD(TPINIFILE,HLUOUT,HPROGRAM,HCONF, &
+ SUBROUTINE READ_PRECIP_FIELD(TPINIFILE,HPROGRAM,HCONF, &
HGETRCT,HGETRRT,HGETRST,HGETRGT,HGETRHT, &
PINPRC,PACPRC,PINDEP,PACDEP,PINPRR,PINPRR3D,PEVAP3D, &
PACPRR,PINPRS,PACPRS,PINPRG,PACPRG,PINPRH,PACPRH )
@@ -21,7 +21,6 @@ USE MODD_IO_ll, ONLY : TFILEDATA
!* 0.1 declarations of arguments
!
TYPE(TFILEDATA), INTENT(IN) :: TPINIFILE ! Initial file
-CHARACTER (LEN=*), INTENT(IN) :: HLUOUT ! name for output-listing of nested models
CHARACTER (LEN=*), INTENT(IN) :: HPROGRAM !
CHARACTER (LEN=*), INTENT(IN) :: HCONF !
!
@@ -50,7 +49,7 @@ END INTERFACE
END MODULE MODI_READ_PRECIP_FIELD
!
! ##############################################################################
- SUBROUTINE READ_PRECIP_FIELD(TPINIFILE,HLUOUT,HPROGRAM,HCONF, &
+ SUBROUTINE READ_PRECIP_FIELD(TPINIFILE,HPROGRAM,HCONF, &
HGETRCT,HGETRRT,HGETRST,HGETRGT,HGETRHT, &
PINPRC,PACPRC,PINDEP,PACDEP,PINPRR,PINPRR3D,PEVAP3D, &
PACPRR,PINPRS,PACPRS,PINPRG,PACPRG,PINPRH,PACPRH )
@@ -93,6 +92,7 @@ END MODULE MODI_READ_PRECIP_FIELD
!! (C.Lac) 04/03/13 add YGETxxx for FIT scheme
!! 10/2016 (C.Lac) Add droplet deposition
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!!
!-----------------------------------------------------------------------------
!
@@ -111,7 +111,6 @@ IMPLICIT NONE
!* 0.1 declarations of arguments
!
TYPE(TFILEDATA), INTENT(IN) :: TPINIFILE ! Initial file
-CHARACTER (LEN=*), INTENT(IN) :: HLUOUT ! name for output-listing of nested models
CHARACTER (LEN=*), INTENT(IN) :: HPROGRAM !
CHARACTER (LEN=*), INTENT(IN) :: HCONF !
!
diff --git a/src/MNH/read_ver_grid.f90 b/src/MNH/read_ver_grid.f90
index e03293b38..42183bf94 100644
--- a/src/MNH/read_ver_grid.f90
+++ b/src/MNH/read_ver_grid.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! #########################
@@ -70,7 +70,7 @@ END MODULE MODI_READ_VER_GRID
!! Module MODD_CONF : contains configuration variables for all models.
!! NVERB : verbosity level for output-listing
!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
+!! TLUOUT0 : name of output-listing
!! Module MODD_GRID1
!! XZHAT
!! Module MODD_DIM1
diff --git a/src/MNH/rel_forcingn.f90 b/src/MNH/rel_forcingn.f90
index 007380464..b85cff608 100644
--- a/src/MNH/rel_forcingn.f90
+++ b/src/MNH/rel_forcingn.f90
@@ -1,7 +1,8 @@
-!MNH_LIC Copyright 2010-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2010-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
! #####################
MODULE MODI_REL_FORCING_n
! #####################
@@ -70,7 +71,7 @@ END MODULE MODI_REL_FORCING_n
!! TDTADVFRC: date of each advecting-forcing profile
!! XUFRC,XVFRC,XWFRC,XTHFRC,XRVFRC: advecting-forcing variables
!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
+!! TLUOUT0 : name of output-listing
!! Module MODD_PARAMETERS: declaration of parameter variables
!! JPVEXT: define the number of marginal points out of the
!! physical domain along the vertical direction.
diff --git a/src/MNH/reset_exseg.f90 b/src/MNH/reset_exseg.f90
index ba9b61d89..ca4903a6d 100644
--- a/src/MNH/reset_exseg.f90
+++ b/src/MNH/reset_exseg.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 2000-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2000-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! #######################
@@ -9,9 +9,7 @@
!
INTERFACE
!
- SUBROUTINE RESET_EXSEG(HLUOUT)
-!
-CHARACTER (LEN=*), INTENT(IN) :: HLUOUT ! Name for output listing
+ SUBROUTINE RESET_EXSEG()
!
END SUBROUTINE RESET_EXSEG
!
@@ -20,7 +18,7 @@ END INTERFACE
END MODULE MODI_RESET_EXSEG
!
! ##############################
- SUBROUTINE RESET_EXSEG(HLUOUT)
+ SUBROUTINE RESET_EXSEG()
! ##############################
!
!!**** *RESET_EXSEG* - routine used to mofify the EXSEG1.nam informations
@@ -57,6 +55,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
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -82,8 +81,6 @@ IMPLICIT NONE
!
!* 0.1 declarations of arguments
!
-CHARACTER (LEN=*), INTENT(IN) :: HLUOUT ! Name for output listing
-!
!* 0.2 declarations of local variables
!
INTEGER :: IRESP,ILUNAM ! return code and logical unit number
diff --git a/src/MNH/retrieve1_nest_infon.f90 b/src/MNH/retrieve1_nest_infon.f90
index 03b49bc76..a49173180 100644
--- a/src/MNH/retrieve1_nest_infon.f90
+++ b/src/MNH/retrieve1_nest_infon.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 spawn 2006/05/18 13:07:25
-!-----------------------------------------------------------------
! ################################
MODULE MODI_RETRIEVE1_NEST_INFO_n
! ################################
@@ -72,8 +67,6 @@ END MODULE MODI_RETRIEVE1_NEST_INFO_n
!! NIMAX, NJMAX
!! Module MODD_PARAMETERS :
!! JPHEXT
-!! Module MODD_LUNIT :
-!! CLUOUT
!!
!! REFERENCE
!! ---------
diff --git a/src/MNH/retrieve2_nest_infon.f90 b/src/MNH/retrieve2_nest_infon.f90
index 9464e0431..8ab5618e7 100644
--- a/src/MNH/retrieve2_nest_infon.f90
+++ b/src/MNH/retrieve2_nest_infon.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ################################
@@ -71,7 +71,7 @@ END MODULE MODI_RETRIEVE2_NEST_INFO_n
!! Module MODD_PARAMETERS :
!! JPHEXT
!! Module MODD_LUNIT :
-!! CLUOUT
+!! TLUOUT0
!!
!! REFERENCE
!! ---------
diff --git a/src/MNH/set_cstn.f90 b/src/MNH/set_cstn.f90
index 66ad7d4cc..a75a5d7dd 100644
--- a/src/MNH/set_cstn.f90
+++ b/src/MNH/set_cstn.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ####################
@@ -133,8 +133,8 @@ END MODULE MODI_SET_CSTN
!! XRD : Gas constant for dry air
!! XCPD : Specific heat for dry air at constant pressure
!!
-!! Module MODD_LUNIT1 : contains logical unit names
-!! CLUOUT : name of output-listing
+!! Module MODD_LUNIT_n : contains logical unit names
+!! TLUOUT : name of output-listing
!!
!! Module MODD_CONF : contains configuration variables for all models.
!! NVERB : verbosity level for output-listing
@@ -173,7 +173,7 @@ USE MODD_CONF
USE MODD_CST
USE MODD_GRID_n
USE MODD_IO_ll, ONLY : TFILEDATA
-USE MODD_LUNIT_n, ONLY: CLUOUT, TLUOUT
+USE MODD_LUNIT_n, ONLY: TLUOUT
USE MODD_PARAMETERS, ONLY: JPHEXT
!
USE MODE_FM
diff --git a/src/MNH/set_frc.f90 b/src/MNH/set_frc.f90
index a78aed447..539bd74ea 100644
--- a/src/MNH/set_frc.f90
+++ b/src/MNH/set_frc.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ###################
@@ -56,7 +56,7 @@ END MODULE MODI_SET_FRC
!! XRV : Gas constant for vapor
!! XRD : Gas constant for dry air
!! Module MODD_LUNIT1 : contains logical unit names
-!! CLUOUT : name of output-listing
+!! TLUOUT : name of output-listing
!! Module MODD_GRID1: declaration of grid variables
!! XZHAT: height levels without orography
!! Module MODD_CONF : contains configuration variables for all models
diff --git a/src/MNH/set_geosbal.f90 b/src/MNH/set_geosbal.f90
index 4c0316cd6..10287c546 100644
--- a/src/MNH/set_geosbal.f90
+++ b/src/MNH/set_geosbal.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2010-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ####################
@@ -195,9 +195,6 @@ END MODULE MODI_SET_GEOSBAL
!! XP00 : reference pressure
!! XOMEGA : earth rotation
!!
-!! Module MODD_LUNIT1 : contains logical unit names
-!! CLUOUT : name of output-listing
-!!
!! Module MODD_CONF : contains configuration variables for all models.
!!
!! L2D : logical for 2D model version
diff --git a/src/MNH/set_perturb.f90 b/src/MNH/set_perturb.f90
index 866feb3ba..1689ac4b1 100644
--- a/src/MNH/set_perturb.f90
+++ b/src/MNH/set_perturb.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! #######################
@@ -110,7 +110,7 @@ USE MODD_FIELD_n
USE MODD_GRID_n
USE MODD_IO_ll, ONLY: TFILEDATA
USE MODD_LBC_n
-USE MODD_LUNIT_n, ONLY: CLUOUT, TLUOUT
+USE MODD_LUNIT_n, ONLY: TLUOUT
USE MODD_LSFIELD_n
USE MODD_PARAMETERS
USE MODD_REF_n
diff --git a/src/MNH/set_refz.f90 b/src/MNH/set_refz.f90
index d0b12152e..b8b10b3b7 100644
--- a/src/MNH/set_refz.f90
+++ b/src/MNH/set_refz.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ####################
@@ -82,7 +82,7 @@ END MODULE MODI_SET_REFZ
!! Module MODD_CONF : contains configuration variables for all models.
!! NVERB : verbosity level for output-listing
!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
+!! TLUOUT0 : name of output-listing
!! Module MODD_REF : contains anelastic reference state variables
!! XEXNTOP : reference state Exner function at model top
!! XRHODREFZ: reference state profile of rhod
diff --git a/src/MNH/set_rsou.f90 b/src/MNH/set_rsou.f90
index 8a16aa38e..509989b14 100644
--- a/src/MNH/set_rsou.f90
+++ b/src/MNH/set_rsou.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ####################
@@ -206,7 +206,7 @@ END MODULE MODI_SET_RSOU
!! XCPD : Specific heat for dry air at constant pressure
!!
!! Module MODD_LUNIT1 : contains logical unit names
-!! CLUOUT : name of output-listing
+!! TLUOUT : name of output-listing
!!
!! Module MODD_CONF : contains configuration variables for all models.
!! NVERB : verbosity level for output-listing
diff --git a/src/MNH/spawn_surf2_rain.f90 b/src/MNH/spawn_surf2_rain.f90
index 2a776304a..a1f774f4f 100644
--- a/src/MNH/spawn_surf2_rain.f90
+++ b/src/MNH/spawn_surf2_rain.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 2004-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2004-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
!###########################
@@ -91,7 +91,7 @@ END MODULE MODI_SPAWN_SURF2_RAIN
!! ---------
!!
!! Book1 of the documentation
-!!
+!!
!!
!! AUTHOR
!! ------
@@ -109,6 +109,7 @@ END MODULE MODI_SPAWN_SURF2_RAIN
!! C.Lac 10/2016 : Add droplet deposition for fog
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
!! J.Escobar 05/03/2018 : bypass gridnesting special case KD(X/Y)RATIO == 1 not parallelized
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -119,7 +120,6 @@ USE MODD_CONF, ONLY : CCONF,CPROGRAM
USE MODD_FIELD_n, ONLY : XTHT
USE MODD_IO_ll, ONLY: TFILEDATA
USE MODD_LBC_n, ONLY : LBC_MODEL
-USE MODD_LUNIT_n, ONLY : CLUOUT
USE MODD_SPAWN
!
USE MODE_MODELN_HANDLER
@@ -413,7 +413,7 @@ IF (PRESENT(TPSONFILE)) THEN
ALLOCATE(ZACPRH1(0,0))
YGETRHT='SKIP'
END IF
- CALL READ_PRECIP_FIELD(TPSONFILE,CLUOUT,CPROGRAM,CCONF, &
+ CALL READ_PRECIP_FIELD(TPSONFILE,CPROGRAM,CCONF, &
YGETRCT,YGETRRT,YGETRST,YGETRGT,YGETRHT, &
ZINPRC1,ZACPRC1,ZINDEP1,ZACDEP1,ZINPRR1,ZINPRR3D1,ZEVAP3D1, &
ZACPRR1,ZINPRS1,ZACPRS1, &
diff --git a/src/MNH/ver_dyn.f90 b/src/MNH/ver_dyn.f90
index b3ddda0d0..009e8bd33 100644
--- a/src/MNH/ver_dyn.f90
+++ b/src/MNH/ver_dyn.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ###################
@@ -87,7 +87,7 @@ END MODULE MODI_VER_DYN
!! ------------------
!!
!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
+!! TLUOUT0 : name of output-listing
!! Module MODD_FIELD1 : contains prognostics variables
!! XUM : U (:,:,:) at t-dt
!! XVM : V (:,:,:,:) at t-dt
diff --git a/src/MNH/ver_int_dyn.f90 b/src/MNH/ver_int_dyn.f90
index 4a564f410..1065cdc10 100644
--- a/src/MNH/ver_int_dyn.f90
+++ b/src/MNH/ver_int_dyn.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ######spl
@@ -70,7 +70,7 @@ END MODULE MODI_VER_INT_DYN
!! Module MODD_CONF : contains configuration variables for all models.
!! NVERB : verbosity level for output-listing
!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
+!! TLUOUT0 : name of output-listing
!! Module MODD_GRID1 : contains grid variables for model1
!! XZS : orography of MESO-NH
!! XZZ : altitude of the w points in the MESO-NH grid.
diff --git a/src/MNH/ver_int_thermo.f90 b/src/MNH/ver_int_thermo.f90
index cb815488f..03ac8e95b 100644
--- a/src/MNH/ver_int_thermo.f90
+++ b/src/MNH/ver_int_thermo.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ##########################
@@ -100,7 +100,7 @@ END MODULE MODI_VER_INT_THERMO
!! Module MODD_CONF1
!! NRR
!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
+!! TLUOUT0 : name of output-listing
!! Module MODD_GRID1 : contains grid variables for model1
!! XZS : orography of MESO-NH
!! XZZ : altitude of the w points in the MESO-NH grid.
@@ -145,7 +145,7 @@ USE MODD_CONF_n
USE MODD_CST
USE MODD_GRID_n
USE MODD_IO_ll, ONLY: TFILEDATA
-USE MODD_LUNIT, ONLY: CLUOUT0, TLUOUT0
+USE MODD_LUNIT, ONLY: TLUOUT0
USE MODD_PARAMETERS
USE MODD_VER_INTERP_LIN
!
diff --git a/src/MNH/ver_interp_to_mixed_grid.f90 b/src/MNH/ver_interp_to_mixed_grid.f90
index 7325b1acd..13f9ba705 100644
--- a/src/MNH/ver_interp_to_mixed_grid.f90
+++ b/src/MNH/ver_interp_to_mixed_grid.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ####################################
@@ -109,7 +109,7 @@ END MODULE MODI_VER_INTERP_TO_MIXED_GRID
!! Module MODD_CONF1
!! NRR
!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
+!! TLUOUT0 : name of output-listing
!! Module MODD_CST : contains physical constants
!! XRD : gas constant for dry air
!! XRV : gas constant for vapor
diff --git a/src/MNH/ver_prep_gribex_case.f90 b/src/MNH/ver_prep_gribex_case.f90
index 4368fc4c1..1c6ea2b2a 100644
--- a/src/MNH/ver_prep_gribex_case.f90
+++ b/src/MNH/ver_prep_gribex_case.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision
-! MASDEV4_7 prep_real 2006/05/23 14:49:51
-!-----------------------------------------------------------------
! ################################
MODULE MODI_VER_PREP_GRIBEX_CASE
! ################################
@@ -52,7 +47,7 @@ END MODULE MODI_VER_PREP_GRIBEX_CASE
!! Module MODD_CONF1 : contains configuration variables for all models.
!! NVERB : verbosity level for output-listing
!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
+!! TLUOUT0 : name of output-listing
!! Module MODD_CST : contains physical constants
!! XRD : gas constant for dry air
!! XRV : gas constant for vapor
diff --git a/src/MNH/ver_thermo.f90 b/src/MNH/ver_thermo.f90
index 1a13b3ad1..94f06c8a8 100644
--- a/src/MNH/ver_thermo.f90
+++ b/src/MNH/ver_thermo.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ######################
@@ -94,7 +94,7 @@ END MODULE MODI_VER_THERMO
!! Module MODD_CONF1 : contains configuration variables for model 1.
!! NRR : number of moist variables
!! Module MODD_LUNIT : contains logical unit names for all models
-!! CLUOUT0 : name of output-listing
+!! TLUOUT0 : name of output-listing
!! Module MODD_CST : contains physical constants
!! XRD : gas constant for dry air
!! XRV : gas constant for vapor
@@ -163,8 +163,7 @@ USE MODD_GRID_n
USE MODD_IO_ll, ONLY: TFILEDATA,TFILE_DUMMY
USE MODD_LBC_n
USE MODD_LSFIELD_n
-USE MODD_LUNIT, ONLY: CLUOUT0,TLUOUT0
-USE MODD_LUNIT_n, ONLY: CLUOUT
+USE MODD_LUNIT, ONLY: TLUOUT0
USE MODD_PARAMETERS
USE MODD_REF_n
!
diff --git a/src/MNH/zoom_pgd.f90 b/src/MNH/zoom_pgd.f90
index e00cc34e6..26370ed71 100644
--- a/src/MNH/zoom_pgd.f90
+++ b/src/MNH/zoom_pgd.f90
@@ -41,6 +41,7 @@
!! 08/07/2016 P.Wautelet Removed MNH_NCWRIT define
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
! P. Wautelet 07/02/2019: force TYPE to a known value for IO_FILE_ADD2LIST
+! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
!!
!----------------------------------------------------------------------------
!
@@ -49,7 +50,7 @@
!
USE MODD_CONF, ONLY : CPROGRAM, L1D, L2D, LPACK
USE MODD_IO_ll, ONLY: NIO_VERB,NVERB_DEBUG,TFILE_OUTPUTLISTING,TFILEDATA
-USE MODD_LUNIT, ONLY : CLUOUT0, TLUOUT0, TOUTDATAFILE
+USE MODD_LUNIT, ONLY : TLUOUT0, TOUTDATAFILE
USE MODD_PARAMETERS, ONLY : XUNDEF, NUNDEF, JPVEXT, JPHEXT, JPMODELMAX
USE MODD_PARAM_n, ONLY : CSURF
USE MODD_DIM_n, ONLY : NIMAX, NJMAX
@@ -122,7 +123,6 @@ CALL INI_CST
!
CALL INITIO_ll()
!
-CLUOUT0='OUTPUT_LISTING0' ! name of the output-listing
CALL IO_FILE_ADD2LIST(TLUOUT0,'OUTPUT_LISTING0','OUTPUTLISTING','WRITE')
CALL IO_FILE_OPEN_ll(TLUOUT0)
TFILE_OUTPUTLISTING => TLUOUT0
diff --git a/src/MNH/zsmt_pgd.f90 b/src/MNH/zsmt_pgd.f90
index 14a4be23b..fc93dfacc 100644
--- a/src/MNH/zsmt_pgd.f90
+++ b/src/MNH/zsmt_pgd.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 2005-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2005-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
! ######################
MODULE MODI_ZSMT_PGD
@@ -66,7 +66,6 @@ END MODULE MODI_ZSMT_PGD
!* 0. DECLARATIONS
!
USE MODD_IO_ll, ONLY : TFILEDATA
-USE MODD_LUNIT, ONLY : CLUOUT0
USE MODD_PARAMETERS, ONLY : JPHEXT, XUNDEF
!
USE MODI_MNHGET_SURF_PARAM_n
diff --git a/src/MNH/zsmt_pic.f90 b/src/MNH/zsmt_pic.f90
index e036a4c82..403b2a463 100644
--- a/src/MNH/zsmt_pic.f90
+++ b/src/MNH/zsmt_pic.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2005-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 newsrc 2006/05/18 13:07:25
-!-----------------------------------------------------------------
! ######################
MODULE MODI_ZSMT_PIC
! ######################
@@ -61,7 +56,6 @@ END MODULE MODI_ZSMT_PIC
!
!* 0. DECLARATIONS
!
-USE MODD_LUNIT, ONLY : CLUOUT0
USE MODD_PARAMETERS, ONLY : XUNDEF
USE MODD_GRID_n, ONLY : XZS,XZSMT
!
--
GitLab