diff --git a/src/LIB/SURCOUCHE/src/mode_init_ll.f90 b/src/LIB/SURCOUCHE/src/mode_init_ll.f90 index 6cd17f9c6963b90888e4781b9c1c55450be59db9..257cc2b9c3658f660ca168c621c762240801f868 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 754a30d12718d56d72cc93295de435f037f41046..7b1b5680a3ddc49ba167bd504198d24b701477d5 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 f3ba65ed160f87e0e3565d7e7003908a3fd0724b..2cbcf2ff6a928a12ac4fef39e2691d8bdc9ec2e7 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 4e306a0d0cc20d25b62887b04d73214af10aa50b..4d5dc7882232448c3a8a0eaea55584c972266613 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 86faf3c6f56f1acf3b50a7f7fc3aa94cb4294820..95f17a316b651ba7d5ae539b8b6f56a7a44747b7 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 ae75dc536e64c9223b6cf7cbe9a3e07399db4181..12396af04e82ffac61c6f2dad5cf46ff069b5459 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 b4044c86b79cec0bdaa52f3a69c0e968b622a9c9..b9378bd92f2dc92778cd6ab83e1bc8181067cc26 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 43257ca72e5ab481765afe3cd87e47147b63b28d..6ae1a2e708d4c6c8b6529506a66a6939cbbd4066 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