From d145088e2d527393462e35252af3104cdc138a4d Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Thu, 31 Jan 2019 16:25:11 +0100
Subject: [PATCH] Philippe 31/01/2019: minor: remove references to OPEN_ll and
CLOSE_ll where not used anymore
---
src/LIB/SURCOUCHE/src/mode_init_ll.f90 | 14 ++------------
src/LIB/SURCOUCHE/src/mode_splittingz_ll.f90 | 20 ++------------------
src/MNH/ch_emission_flux0d.f90 | 5 ++---
src/MNH/ch_init_constn.f90 | 5 ++---
src/MNH/ch_open_input.f90 | 11 +++++------
src/MNH/pressurez.f90 | 1 -
src/MNH/write_lbn.f90 | 6 +++---
src/MNH/write_lfin.f90 | 2 +-
8 files changed, 17 insertions(+), 47 deletions(-)
diff --git a/src/LIB/SURCOUCHE/src/mode_init_ll.f90 b/src/LIB/SURCOUCHE/src/mode_init_ll.f90
index 6cd17f9c6..257cc2b9c 100644
--- a/src/LIB/SURCOUCHE/src/mode_init_ll.f90
+++ b/src/LIB/SURCOUCHE/src/mode_init_ll.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-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.
!-----------------------------------------------------------------
@@ -560,14 +560,6 @@
!
!-------------------------------------------------------------------------------
!
- !* 2. SET OUTPUT FILE :
- ! ---------------
-
- ! CALL OPEN_ll(UNIT=NIOUNIT,FILE=YOUTPUTFILE,ACTION='write',form&
- ! &='FORMATTED',MODE=SPECIFIC,IOSTAT=IRESP)
- !
- !-------------------------------------------------------------------------------
- !
!* 3. ALLOCATION :
! ----------
!
@@ -776,8 +768,6 @@ USE MODE_GA
!
!* 1. CALL TO MPI_FINALIZE
!
-! CALL CLOSE_ll(YOUTPUTFILE)
-
#ifdef MNH_GA
if (.not. GFIRST_GA ) then
call ga_sync()
diff --git a/src/LIB/SURCOUCHE/src/mode_splittingz_ll.f90 b/src/LIB/SURCOUCHE/src/mode_splittingz_ll.f90
index 754a30d12..7b1b5680a 100644
--- a/src/LIB/SURCOUCHE/src/mode_splittingz_ll.f90
+++ b/src/LIB/SURCOUCHE/src/mode_splittingz_ll.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2011-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.
!-----------------------------------------------------------------
@@ -188,14 +188,6 @@ CONTAINS
#ifndef MNH_USE_MPI_STATUSES_IGNORE
ALLOCATE(MNH_STATUSES_IGNORE(MPI_STATUS_SIZE,NPROC*2))
#endif
- !
- !-------------------------------------------------------------------------------
- !
- !* 2. SET OUTPUT FILE :
- ! ---------------
-
- ! CALL OPEN_ll(UNIT=NIOUNIT,FILE=YOUTPUTFILE,ACTION='write',form&
- ! &='FORMATTED',MODE=SPECIFIC,IOSTAT=IRESP)
!
!-------------------------------------------------------------------------------
!
@@ -591,14 +583,6 @@ CONTAINS
!
!-------------------------------------------------------------------------------
!
- !* 2. SET OUTPUT FILE :
- ! ---------------
-
- ! CALL OPEN_ll(UNIT=NIOUNIT,FILE=YOUTPUTFILE,ACTION='write',form&
- ! &='FORMATTED',MODE=SPECIFIC,IOSTAT=IRESP)
- !
- !-------------------------------------------------------------------------------
- !
!* 3. ALLOCATION :
! ----------
!
diff --git a/src/MNH/ch_emission_flux0d.f90 b/src/MNH/ch_emission_flux0d.f90
index f3ba65ed1..2cbcf2ff6 100644
--- a/src/MNH/ch_emission_flux0d.f90
+++ b/src/MNH/ch_emission_flux0d.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.
!-----------------------------------------------------------------
!! ############################
@@ -107,7 +107,6 @@ CHARACTER*80 :: YFORMAT ! format of the input data
INTEGER :: ICHEMIS ! number of variables for which a flux is given
! in the input file
INTEGER :: IIO ! I/O channel
-INTEGER :: IFAIL ! return code from CLOSE_ll
REAL :: ZALPHA ! interpolation weight
!
CHARACTER(LEN=3) :: YUNIT
diff --git a/src/MNH/ch_init_constn.f90 b/src/MNH/ch_init_constn.f90
index 4e306a0d0..4d5dc7882 100644
--- a/src/MNH/ch_init_constn.f90
+++ b/src/MNH/ch_init_constn.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2001-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.
!-----------------------------------------------------------------
!! ################################
@@ -111,7 +111,6 @@ CHARACTER(LEN=40), DIMENSION(:), ALLOCATABLE :: YHENRYNAME !species names
REAL , DIMENSION(:,:), ALLOCATABLE :: ZHENRYVAL
!chemical Henry constant value
!
-INTEGER :: IFAIL ! return code from CLOSE_ll
INTEGER :: JI, JN, JNREAL ! loop control variables
INTEGER :: INACT ! array pointer
TYPE(TFILEDATA),POINTER :: TZFILE
diff --git a/src/MNH/ch_open_input.f90 b/src/MNH/ch_open_input.f90
index 86faf3c6f..95f17a316 100644
--- a/src/MNH/ch_open_input.f90
+++ b/src/MNH/ch_open_input.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.
!-----------------------------------------------------------------
!! #########################
@@ -39,13 +39,12 @@ SUBROUTINE CH_OPEN_INPUT(HCHEM_INPUT_FILE,HKEYWORD,TPFILE,KLUOUT,KVERB)
!!
!!** METHOD
!! ------
-!! An unused input channel is selected using OPEN_ll.
!! The file HCHEM_INPUT_FILE will be rewinded
!! at each call and data will be read in using (A8)-format until the
!! given keyword is found. The following comment line will then
!! be read and printed and the input channel number will be returned.
-!! After reading the needed data, the user must assure that the file
-!! will be closed and that the unit will be freed using CLOSE_ll.
+!! After reading the needed data, the user must ensure that the file
+!! will be closed.
!!
!! REFERENCE
!! ---------
@@ -92,7 +91,7 @@ INTEGER, INTENT(IN) :: KVERB ! verbosity level
!
CHARACTER(LEN=79) :: YIN ! character string for line-by-line read
INTEGER :: ILU
-INTEGER :: IRESP ! return code from OPEN_ll
+INTEGER :: IRESP ! return code from IO_FILE_OPEN_ll
!
!-------------------------------------------------------------------------------
!
diff --git a/src/MNH/pressurez.f90 b/src/MNH/pressurez.f90
index ae75dc536..12396af04 100644
--- a/src/MNH/pressurez.f90
+++ b/src/MNH/pressurez.f90
@@ -233,7 +233,6 @@ USE MODD_PARAMETERS
USE MODD_REF, ONLY: LBOUSS
USE MODD_VAR_ll, ONLY: MPI_PRECISION, NMNH_COMM_WORLD , NPROC
!
-USE MODE_IO_ll, ONLY: CLOSE_ll
USE MODE_ll
USE MODE_MPPDB
USE MODE_MSG
diff --git a/src/MNH/write_lbn.f90 b/src/MNH/write_lbn.f90
index b4044c86b..b9378bd92 100644
--- a/src/MNH/write_lbn.f90
+++ b/src/MNH/write_lbn.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.
!-----------------------------------------------------------------
! ######################
@@ -94,7 +94,7 @@ USE MODD_PARAM_n
!
USE MODE_FMWRIT
USE MODE_ll
-USE MODE_IO_ll, ONLY: UPCASE, CLOSE_ll
+USE MODE_IO_ll, ONLY: UPCASE
USE MODE_MSG
USE MODE_MODELN_HANDLER
!
diff --git a/src/MNH/write_lfin.f90 b/src/MNH/write_lfin.f90
index 43257ca72..6ae1a2e70 100644
--- a/src/MNH/write_lfin.f90
+++ b/src/MNH/write_lfin.f90
@@ -242,7 +242,7 @@ USE MODE_FM, ONLY: IO_FILE_CLOSE_ll
USE MODE_FMWRIT
USE MODE_ll
USE MODD_IO_ll, ONLY: TFILEDATA
-USE MODE_IO_ll, ONLY: UPCASE,CLOSE_ll
+USE MODE_IO_ll, ONLY: UPCASE
USE MODE_FIELD
USE MODE_GATHER_ll
USE MODE_GRIDPROJ
--
GitLab