From 2821c4226343c89765ba3b8b419863bf56cf4e52 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 8 Dec 2017 15:59:04 +0100
Subject: [PATCH] Philippe 08/12/2017: IO: removed all references to FMLOOK
---
src/LIB/SURCOUCHE/src/mode_fm.f90 | 36 +--------------------------
src/LIB/SURCOUCHE/src/modi_fm.f90 | 7 ------
src/MNH/compare_with_pgd_domain.f90 | 3 ---
src/MNH/compute_exner_from_ground.f90 | 2 --
src/MNH/compute_exner_from_top.f90 | 2 --
src/MNH/dry_mass.f90 | 1 -
src/MNH/get_sizex_lb.f90 | 1 -
src/MNH/get_sizey_lb.f90 | 1 -
src/MNH/horibl.f90 | 2 --
src/MNH/ini_dynamics.f90 | 1 -
src/MNH/ini_lb.f90 | 1 -
src/MNH/ini_sizen.f90 | 1 -
src/MNH/latlon_to_xy.f90 | 3 ---
src/MNH/ls_coupling.f90 | 1 -
src/MNH/mode_time.f90 | 6 +----
src/MNH/modeln.f90 | 1 -
src/MNH/prep_real_case.f90 | 1 -
src/MNH/read_all_data_mesonh_case.f90 | 2 --
src/MNH/read_exsegn.f90 | 3 +--
src/MNH/reset_exseg.f90 | 2 +-
src/MNH/resolved_cloud.f90 | 1 -
src/MNH/resolved_elecn.f90 | 1 -
src/MNH/set_frc.f90 | 1 -
src/MNH/set_geosbal.f90 | 1 -
src/MNH/set_rsou.f90 | 1 -
src/MNH/spawn_grid2.f90 | 1 -
src/MNH/spawn_zs.f90 | 1 -
src/MNH/ver_interp_to_mixed_grid.f90 | 1 -
src/MNH/write_desfmn.f90 | 6 ++---
src/MNH/xy_to_latlon.f90 | 3 ---
30 files changed, 6 insertions(+), 88 deletions(-)
diff --git a/src/LIB/SURCOUCHE/src/mode_fm.f90 b/src/LIB/SURCOUCHE/src/mode_fm.f90
index 2f2ff7782..d37ce4b88 100644
--- a/src/LIB/SURCOUCHE/src/mode_fm.f90
+++ b/src/LIB/SURCOUCHE/src/mode_fm.f90
@@ -28,7 +28,7 @@ PRIVATE
INTEGER, PARAMETER :: JPPIPE = 10
!INCLUDE 'mpif.h'
-PUBLIC SET_FMPACK_ll,FMLOOK_ll
+PUBLIC SET_FMPACK_ll
PUBLIC IO_FILE_OPEN_ll, IO_FILE_CLOSE_ll
CONTAINS
@@ -51,40 +51,6 @@ IF ( IP .EQ. 1 ) PRINT *,'INIT L1D,L2D,LPACK = ',L1D,L2D,LPACK
END SUBROUTINE SET_FMPACK_ll
-SUBROUTINE FMLOOK_ll(HFILEM,HFIPRI,KNUMBR,KRESP)
-!
-USE MODD_IO_ll, ONLY : ISTDOUT,TFILEDATA
-USE MODE_IO_MANAGE_STRUCT, ONLY: IO_FILE_FIND_BYNAME
-!
-CHARACTER(LEN=*), INTENT(IN) :: HFILEM
-CHARACTER(LEN=*), INTENT(IN) :: HFIPRI
-INTEGER, INTENT(OUT) :: KNUMBR
-INTEGER, INTENT(OUT) :: KRESP
-!
-INTEGER :: IRESP
-TYPE(TFILEDATA),POINTER :: TZFILE
-!
-CALL PRINT_MSG(NVERB_DEBUG,'IO','FMLOOK_ll','called for '//TRIM(HFILEM))
-!
-TZFILE => NULL()
-CALL IO_FILE_FIND_BYNAME(TRIM(HFILEM),TZFILE,IRESP)
-!
-IF (IRESP==0) THEN
- KNUMBR = TZFILE%NLU
- KRESP = NOERROR
-ELSE
- IF (HFILEM == HFIPRI) THEN
- KNUMBR = ISTDOUT
- KRESP = NOERROR
- ELSE
- CALL PRINT_MSG(NVERB_ERROR,'IO','FMLOOK_ll','file '//TRIM(HFILEM)//' not found')
- KRESP = IOERROR
- KNUMBR = -1
- END IF
-END IF
-!
-END SUBROUTINE FMLOOK_ll
-
SUBROUTINE IO_FILE_OPEN_ll(TPFILE,KRESP,OPARALLELIO,HPOSITION,HSTATUS)
!
USE MODD_CONF, ONLY: NMNHVERSION
diff --git a/src/LIB/SURCOUCHE/src/modi_fm.f90 b/src/LIB/SURCOUCHE/src/modi_fm.f90
index 3533bfb60..de8b5a86e 100644
--- a/src/LIB/SURCOUCHE/src/modi_fm.f90
+++ b/src/LIB/SURCOUCHE/src/modi_fm.f90
@@ -20,13 +20,6 @@ SUBROUTINE SET_FMPACK_ll(O1D,O2D,OPACK)
LOGICAL, INTENT(IN) :: O1D,O2D,OPACK
END SUBROUTINE SET_FMPACK_ll
!
-SUBROUTINE FMLOOK_ll(HFILEM,HFIPRI,KNUMBR,KRESP)
-CHARACTER(LEN=*), INTENT(IN) :: HFILEM
-CHARACTER(LEN=*), INTENT(IN) :: HFIPRI
-INTEGER, INTENT(OUT) :: KNUMBR
-INTEGER, INTENT(OUT) :: KRESP
-END SUBROUTINE FMLOOK_ll
-!
SUBROUTINE IO_FILE_OPEN_ll(TPFILE,KRESP,OPARALLELIO)
USE MODD_IO_ll, ONLY: TFILEDATA
TYPE(TFILEDATA),POINTER,INTENT(INOUT) :: TPFILE ! File structure
diff --git a/src/MNH/compare_with_pgd_domain.f90 b/src/MNH/compare_with_pgd_domain.f90
index e30056cd6..70d97fa25 100644
--- a/src/MNH/compare_with_pgd_domain.f90
+++ b/src/MNH/compare_with_pgd_domain.f90
@@ -45,8 +45,6 @@ END MODULE MODI_COMPARE_WITH_PGD_DOMAIN
!! EXTERNAL
!! --------
!!
-!! function FMLOOK :to retrieve a logical unit number associated with a file
-!!
!! IMPLICIT ARGUMENTS
!! ------------------
!!
@@ -111,7 +109,6 @@ REAL,DIMENSION(:), INTENT(IN) :: PYHAT ! y coordinate of flux points
!* 0.2 Declaration of local variables
! ------------------------------
REAL :: ZEPS ! a little number
-INTEGER :: IRESP ! return-code if problem eraised in FMLOOK
INTEGER :: ILUOUT0 ! logical number for listing file
INTEGER :: IIU, IJU
INTEGER :: IPGDIU, IPGDJU
diff --git a/src/MNH/compute_exner_from_ground.f90 b/src/MNH/compute_exner_from_ground.f90
index fa0f41127..2d3f5ec28 100644
--- a/src/MNH/compute_exner_from_ground.f90
+++ b/src/MNH/compute_exner_from_ground.f90
@@ -82,8 +82,6 @@ END MODULE MODI_COMPUTE_EXNER_FROM_GROUND3
!! EXTERNAL
!! --------
!!
-!! function FMLOOK :to retrieve a logical unit number associated with a file
-!!
!! IMPLICIT ARGUMENTS
!! ------------------
!!
diff --git a/src/MNH/compute_exner_from_top.f90 b/src/MNH/compute_exner_from_top.f90
index ea2bf803d..e1e36a91a 100644
--- a/src/MNH/compute_exner_from_top.f90
+++ b/src/MNH/compute_exner_from_top.f90
@@ -80,8 +80,6 @@ END MODULE MODI_COMPUTE_EXNER_FROM_TOP3D
!! EXTERNAL
!! --------
!!
-!! function FMLOOK :to retrieve a logical unit number associated with a file
-!!
!! IMPLICIT ARGUMENTS
!! ------------------
!!
diff --git a/src/MNH/dry_mass.f90 b/src/MNH/dry_mass.f90
index f020cb379..f85564bd2 100644
--- a/src/MNH/dry_mass.f90
+++ b/src/MNH/dry_mass.f90
@@ -65,7 +65,6 @@ END MODULE MODI_DRY_MASS
!! --------
!!
!! routine COMPUTE_EXNER_FROM_TOP : to compute the hydrostatic Exner function
-!! function FMLOOK :to retrieve a logical unit number associated with a file
!!
!! module MODI_COMPUTE_EXNER_FROM_TOP
!! SUM3D_ll : distributed function equivalent to SUM
diff --git a/src/MNH/get_sizex_lb.f90 b/src/MNH/get_sizex_lb.f90
index 71d99adcb..1d5ab66c2 100644
--- a/src/MNH/get_sizex_lb.f90
+++ b/src/MNH/get_sizex_lb.f90
@@ -65,7 +65,6 @@ END MODULE MODI_GET_SIZEX_LB
!!
!! EXTERNAL
!! --------
-!! FMLOOK : to retrieve a logical unit number
!! Module MODE_TOOLS_ll :
!! GET_INTERSECTION_ll : to get the global indices of the LB
!! arrays for each sub-domain.
diff --git a/src/MNH/get_sizey_lb.f90 b/src/MNH/get_sizey_lb.f90
index 8ae70b889..ffb87dd6e 100644
--- a/src/MNH/get_sizey_lb.f90
+++ b/src/MNH/get_sizey_lb.f90
@@ -65,7 +65,6 @@ END MODULE MODI_GET_SIZEY_LB
!!
!! EXTERNAL
!! --------
-!! FMLOOK : to retrieve a logical unit number
!! Module MODE_TOOLS_ll :
!! GET_INTERSECTION_ll : to get the global indices of the LB
!! arrays for each sub-domain.
diff --git a/src/MNH/horibl.f90 b/src/MNH/horibl.f90
index 6ac7750c2..aad9dafcc 100644
--- a/src/MNH/horibl.f90
+++ b/src/MNH/horibl.f90
@@ -102,8 +102,6 @@ END MODULE MODI_HORIBL
!! EXTERNAL
!! --------
!!
-!! subroutine FMLOOK_ll : to retrieve the logical unit number of the listing file
-!!
!! IMPLICIT ARGUMENTS
!! ------------------
!!
diff --git a/src/MNH/ini_dynamics.f90 b/src/MNH/ini_dynamics.f90
index e09837107..46cf49616 100644
--- a/src/MNH/ini_dynamics.f90
+++ b/src/MNH/ini_dynamics.f90
@@ -227,7 +227,6 @@ SUBROUTINE INI_DYNAMICS(PLON,PLAT,PRHODJ,PTHVREF,PMAP,PZZ, &
!! --------
!! TRID : to initialize pressure solver
!! RELAXDEF: to compute the relaxation coefficients
-!! FMLOOK : to retrieve logical unit number linked to a file
!! GET_DIM_EXT_ll : get extended sub-domain sizes
!!
!! Module MODI_TRID : interface for routine TRID
diff --git a/src/MNH/ini_lb.f90 b/src/MNH/ini_lb.f90
index 7afd3aabb..209ae76df 100644
--- a/src/MNH/ini_lb.f90
+++ b/src/MNH/ini_lb.f90
@@ -97,7 +97,6 @@ SUBROUTINE INI_LB(TPINIFILE,OLSOURCE,KSV, &
!!
!! EXTERNAL
!! --------
-!! FMLOOK : to retrieve logical number
!! FMREAD : to read data in LFIFM file
!! FMREAD_LB : to read LB data in LFIFM file
!!
diff --git a/src/MNH/ini_sizen.f90 b/src/MNH/ini_sizen.f90
index 08b4121da..0fd413234 100644
--- a/src/MNH/ini_sizen.f90
+++ b/src/MNH/ini_sizen.f90
@@ -59,7 +59,6 @@ END MODULE MODI_INI_SIZE_n
!!
!! EXTERNAL
!! --------
-!! FMLOOK_ll : to retrieve a logical unit number associated with a file
!! IO_READ_FIELD : to read a LFIFM file
!!
!! IMPLICIT ARGUMENTS
diff --git a/src/MNH/latlon_to_xy.f90 b/src/MNH/latlon_to_xy.f90
index 31890a4b9..a66e25ac4 100644
--- a/src/MNH/latlon_to_xy.f90
+++ b/src/MNH/latlon_to_xy.f90
@@ -24,9 +24,6 @@
!! EXTERNAL
!! --------
!!
-!! module FMLOOK : to retrieve a logical unit number
-!! associated with a file
-!!
!! module MODE_GRIDPROJ : contains projection routines
!! SM_LATLON and SM_XYHAT
!!
diff --git a/src/MNH/ls_coupling.f90 b/src/MNH/ls_coupling.f90
index 94bd8dfb0..4eb37c054 100644
--- a/src/MNH/ls_coupling.f90
+++ b/src/MNH/ls_coupling.f90
@@ -129,7 +129,6 @@ END MODULE MODI_LS_COUPLING
!!
!! EXTERNAL
!! --------
-!! FMLOOK : to retrieve a logical unit number
!! IO_READ_FIELD : to read data in file
!! IO_FILE_CLOSE_ll : to close a file
!! INI_LS : to initialize larger scale fields
diff --git a/src/MNH/mode_time.f90 b/src/MNH/mode_time.f90
index 53f0c76a2..2890fe4ff 100644
--- a/src/MNH/mode_time.f90
+++ b/src/MNH/mode_time.f90
@@ -69,11 +69,7 @@ CONTAINS
!
!!** METHOD
!! ------
-!! The logical unit number of output-listing file is retrieved (by FMLOOK)
-!! If a logical unit number have never been attributed to this output-listing
-!! file, a logical unit number is attributed (by FMATTR) and this file is
-!! opened
-!! Then the date and time are printed with or without a title.
+!! The date and time are printed with or without a title.
!! If it is an idealized case, no date is printed (only time).
!!
!! EXTERNAL
diff --git a/src/MNH/modeln.f90 b/src/MNH/modeln.f90
index 284321338..1da755cf0 100644
--- a/src/MNH/modeln.f90
+++ b/src/MNH/modeln.f90
@@ -65,7 +65,6 @@ END MODULE MODI_MODEL_n
!!
!! EXTERNAL
!! --------
-!! Subroutine FMLOOK: to recover the logical unit number linked to a FMfile
!! Subroutine IO_FILE_OPEN_ll: to open a file
!! Subroutine WRITE_DESFM: to write the descriptive part of a FMfile
!! Subroutine WRITE_LFIFM: to write the binary part of a FMfile
diff --git a/src/MNH/prep_real_case.f90 b/src/MNH/prep_real_case.f90
index c848fac7b..4d459f06c 100644
--- a/src/MNH/prep_real_case.f90
+++ b/src/MNH/prep_real_case.f90
@@ -263,7 +263,6 @@
!! initialized
!! Routine WRITE_DESFM1 : to write a DESFM file.
!! Routine WRITE_LFIFM1 : to write a LFIFM file.
-!! Routine FMLOOK : to retrieve the logical unit of a file.
!! Routine IO_FILE_CLOSE_ll : to close a FM-file (DESFM + LFIFM).
!!
!! Module MODE_GRIDPROJ : contains conformal projection routines
diff --git a/src/MNH/read_all_data_mesonh_case.f90 b/src/MNH/read_all_data_mesonh_case.f90
index 2850e8901..967d12345 100644
--- a/src/MNH/read_all_data_mesonh_case.f90
+++ b/src/MNH/read_all_data_mesonh_case.f90
@@ -61,8 +61,6 @@ END MODULE MODI_READ_ALL_DATA_MESONH_CASE
!! subroutine READ_PRC_FMFILE : to read the large scale fields on the MESO-NH
!! domain.
!!
-!! function FMLOOK :to retrieve a logical unit number associated with a file
-!!
!! Module MODI_READ_GRID_TIME_MESONH_CASE : interface for subroutine
!! READ_GRID_TIME_MESONH_CASE
!! Module MODI_SET_SUBDOMAIN : interface for subroutine SET_SUBDOMAIN
diff --git a/src/MNH/read_exsegn.f90 b/src/MNH/read_exsegn.f90
index 075ccbe3d..f1dcefe69 100644
--- a/src/MNH/read_exsegn.f90
+++ b/src/MNH/read_exsegn.f90
@@ -111,8 +111,7 @@ END MODULE MODI_READ_EXSEG_n
!!
!!** METHOD
!! ------
-!! Logical unit number of EXSEG file is retrieved by calling FMLOOK.
-!! Then, the descriptor file is read. Namelists (NAMXXXn) which contain
+!! The descriptor file is read. Namelists (NAMXXXn) which contain
!! variables linked to one nested model are at the beginning of the file.
!! Namelists (NAMXXX) which contain variables common to all models
!! are at the end of the file. When the model index is different from 1,
diff --git a/src/MNH/reset_exseg.f90 b/src/MNH/reset_exseg.f90
index 62ab1131c..f205b8aca 100644
--- a/src/MNH/reset_exseg.f90
+++ b/src/MNH/reset_exseg.f90
@@ -88,7 +88,7 @@ CHARACTER (LEN=*), INTENT(IN) :: HLUOUT ! Name for output listing
!
!* 0.2 declarations of local variables
!
-INTEGER :: IRESP,ILUNAM ! return code of FMLOOK and logical unit number
+INTEGER :: IRESP,ILUNAM ! return code and logical unit number
LOGICAL :: GFOUND ! Return code when searching namelist
CHARACTER(LEN=100):: YCOMMENT ! Comment string
INTEGER :: IGRID ! IGRID : grid indicator
diff --git a/src/MNH/resolved_cloud.f90 b/src/MNH/resolved_cloud.f90
index fe972ed79..1247a5b56 100644
--- a/src/MNH/resolved_cloud.f90
+++ b/src/MNH/resolved_cloud.f90
@@ -177,7 +177,6 @@ END MODULE MODI_RESOLVED_CLOUD
!!
!! EXTERNAL
!! --------
-!! Subroutine FMLOOK: to recover the logical unit number linked to a FMfile
!! Subroutine SLOW_TERMS: Computes the explicit microphysical sources
!! Subroutine FAST_TERMS: Performs the saturation adjustment for l
!! Subroutine RAIN_ICE : Computes the explicit microphysical sources for i
diff --git a/src/MNH/resolved_elecn.f90 b/src/MNH/resolved_elecn.f90
index 499776fdb..315c71bb5 100644
--- a/src/MNH/resolved_elecn.f90
+++ b/src/MNH/resolved_elecn.f90
@@ -135,7 +135,6 @@ END MODULE MODI_RESOLVED_ELEC_n
!!
!! EXTERNAL
!! --------
-!! Subroutine FMLOOK: to recover the logical unit number linked to a FMfile
!! Subroutine SLOW_TERMS: Computes the explicit microphysical sources
!! Subroutine FAST_TERMS: Performs the saturation adjustment for l
!! Subroutine RAIN_ICE : Computes the explicit microphysical sources for i
diff --git a/src/MNH/set_frc.f90 b/src/MNH/set_frc.f90
index f32526aaa..6461cdbc7 100644
--- a/src/MNH/set_frc.f90
+++ b/src/MNH/set_frc.f90
@@ -47,7 +47,6 @@ END MODULE MODI_SET_FRC
!!
!! EXTERNAL
!! --------
-!! FMLOOK : to retrieve a logical unit number
!! Module MODE_THERMO : contains thermodynamic routines
!! Module MODI_HEIGHT_PRESS: to compute height from pressure and
!! potential virtual temperature
diff --git a/src/MNH/set_geosbal.f90 b/src/MNH/set_geosbal.f90
index 02dd4a7e1..a6e10c6ca 100644
--- a/src/MNH/set_geosbal.f90
+++ b/src/MNH/set_geosbal.f90
@@ -182,7 +182,6 @@ END MODULE MODI_SET_GEOSBAL
!! X direction
!! EXTERNAL
!! --------
-!! FMLOOK : to retrieve logical unit number
!!
!! Module MODI_SHUMAN: interface for shuman operators
!!
diff --git a/src/MNH/set_rsou.f90 b/src/MNH/set_rsou.f90
index 3a895cb00..b4d647e20 100644
--- a/src/MNH/set_rsou.f90
+++ b/src/MNH/set_rsou.f90
@@ -182,7 +182,6 @@ END MODULE MODI_SET_RSOU
!!
!! EXTERNAL
!! --------
-!! FMLOOK : to retrieve a logical unit number
!! SET_MASS : to compute mass field on 3D-model grid
!! Module MODE_THERMO : contains thermodynamic routines
!! SM_FOES : To compute saturation vapor pressure from
diff --git a/src/MNH/spawn_grid2.f90 b/src/MNH/spawn_grid2.f90
index 98cef4efd..6b3a51a10 100644
--- a/src/MNH/spawn_grid2.f90
+++ b/src/MNH/spawn_grid2.f90
@@ -92,7 +92,6 @@ END MODULE MODI_SPAWN_GRID2
!! EXTERNAL
!! --------
!!
-!! FMLOOK : to recover a logical unit number
!! Module MODE_TIME : contains SM_PRINT_TIME routine
!! Routine BIKHARDT2 : to perform horizontal interpolations
!!
diff --git a/src/MNH/spawn_zs.f90 b/src/MNH/spawn_zs.f90
index 45794282e..7f0362255 100644
--- a/src/MNH/spawn_zs.f90
+++ b/src/MNH/spawn_zs.f90
@@ -72,7 +72,6 @@ END MODULE MODI_SPAWN_ZS
!! EXTERNAL
!! --------
!!
-!! FMLOOK : to recover a logical unit number
!! Routine BIKHARDT2 : to perform horizontal interpolations
!!
!!
diff --git a/src/MNH/ver_interp_to_mixed_grid.f90 b/src/MNH/ver_interp_to_mixed_grid.f90
index 8878143ce..7c776377f 100644
--- a/src/MNH/ver_interp_to_mixed_grid.f90
+++ b/src/MNH/ver_interp_to_mixed_grid.f90
@@ -99,7 +99,6 @@ END MODULE MODI_VER_INTERP_TO_MIXED_GRID
!! EXTERNAL
!! --------
!!
-!! function FMLOOK :to retrieve a logical unit number associated with a file
!! routine VER_INTERP : to vertically interpolate a field
!! routine COMPUTE_EXNER_FROM_GROUND : to compute hydrostatic Exner function
!! Module MODI_VER_INTERP : interface for function VER_INTERP
diff --git a/src/MNH/write_desfmn.f90 b/src/MNH/write_desfmn.f90
index 7b004bd8e..cadcddd33 100644
--- a/src/MNH/write_desfmn.f90
+++ b/src/MNH/write_desfmn.f90
@@ -49,7 +49,6 @@ END MODULE MODI_WRITE_DESFM_n
!!
!! EXTERNAL
!! --------
-!! FMLOOK : to retrieve the logical unit number of descriptor or LFI files
!!
!!
!! IMPLICIT ARGUMENTS
@@ -210,9 +209,8 @@ TYPE(TFILEDATA), INTENT(IN) :: TPDATAFILE ! Datafile
!
!* 0.2 declarations of local variables
!
-INTEGER :: IRESP,ILUSEG ! return code of FMLOOK and logical unit number of
- ! EXSEG file
-INTEGER :: ILUOUT ! Logical unit number for output-listing TLUOUT file
+INTEGER :: ILUSEG ! logical unit number of EXSEG file
+INTEGER :: ILUOUT ! Logical unit number for output-listing TLUOUT file
!
LOGICAL :: GHORELAX_UVWTH, &
GHORELAX_RV, GHORELAX_RC, GHORELAX_RR, &
diff --git a/src/MNH/xy_to_latlon.f90 b/src/MNH/xy_to_latlon.f90
index 5803210ff..e6decdff5 100644
--- a/src/MNH/xy_to_latlon.f90
+++ b/src/MNH/xy_to_latlon.f90
@@ -24,9 +24,6 @@
!! EXTERNAL
!! --------
!!
-!! module FMLOOK : to retrieve a logical unit number
-!! associated with a file
-!!
!! module MODE_GRIDPROJ : contains projection routines
!! SM_LATLON and SM_XYHAT
!!
--
GitLab