From 74df66d6a78b78053a5a7401e1f72cbfa7a90ff9 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Thu, 23 Jan 2020 16:56:43 +0100
Subject: [PATCH] Philippe 23/01/2020: split mode_field.f90 in modd_field.f90
and mode_field.f90
---
src/LIB/SURCOUCHE/src/modd_field.f90 | 150 +++++++++++++++
src/LIB/SURCOUCHE/src/mode_field.f90 | 180 +++---------------
src/LIB/SURCOUCHE/src/mode_io_field_read.f90 | 5 +-
src/LIB/SURCOUCHE/src/mode_io_field_write.f90 | 5 +-
.../SURCOUCHE/src/mode_io_manage_struct.f90 | 8 +-
src/LIB/SURCOUCHE/src/mode_io_read_lfi.f90 | 4 +-
src/LIB/SURCOUCHE/src/mode_io_read_nc4.f90 | 4 +-
src/LIB/SURCOUCHE/src/mode_io_tools.f90 | 5 +-
src/LIB/SURCOUCHE/src/mode_io_tools_nc4.f90 | 6 +-
src/LIB/SURCOUCHE/src/mode_io_write_lfi.f90 | 4 +-
src/LIB/SURCOUCHE/src/mode_io_write_nc4.f90 | 17 +-
src/MNH/advection_metsv.f90 | 4 +-
src/MNH/c2r2_adjust.f90 | 4 +-
src/MNH/call_rttov11.f90 | 3 +-
src/MNH/call_rttov8.f90 | 3 +-
src/MNH/compare_dad.f90 | 5 +-
src/MNH/compute_r00.f90 | 4 +-
src/MNH/eddyUV_flux_one_wayn.f90 | 22 +--
src/MNH/eddy_flux_one_wayn.f90 | 22 +--
src/MNH/free_atm_profile.f90 | 4 +-
src/MNH/goto_model_wrapper.f90 | 5 +-
src/MNH/ini_aircraft_balloon.f90 | 4 +-
src/MNH/ini_deep_convection.f90 | 5 +-
src/MNH/ini_lb.f90 | 4 +-
src/MNH/ini_prog_var.f90 | 4 +-
src/MNH/ini_segn.f90 | 4 +-
src/MNH/ini_size_spawn.f90 | 5 +-
src/MNH/ini_surf_rad.f90 | 5 +-
src/MNH/init_for_convlfi.f90 | 16 +-
src/MNH/init_ground_paramn.f90 | 5 +-
src/MNH/init_mnh.f90 | 4 +-
src/MNH/khko_notadjust.f90 | 4 +-
src/MNH/lima_adjust.f90 | 4 +-
src/MNH/lima_ccn_activation.f90 | 4 +-
src/MNH/lima_warm_nucl.f90 | 4 +-
src/MNH/menu_diachro.f90 | 5 +-
src/MNH/paspol.f90 | 4 +-
src/MNH/prandtl.f90 | 5 +-
src/MNH/prep_ideal_case.f90 | 4 +-
src/MNH/prep_nest_pgd.f90 | 4 +-
src/MNH/prep_pgd.f90 | 4 +-
src/MNH/prep_real_case.f90 | 4 +-
src/MNH/prep_surfex.f90 | 4 +-
src/MNH/radiations.f90 | 4 +-
src/MNH/rain_c2r2_khko.f90 | 4 +-
src/MNH/read_dummy_gr_fieldn.f90 | 4 +-
src/MNH/read_field.f90 | 13 +-
src/MNH/read_hgrid.f90 | 5 +-
src/MNH/read_hgridn.f90 | 5 +-
src/MNH/read_prc_fmfile.f90 | 5 +-
src/MNH/read_precip_field.f90 | 6 +-
src/MNH/read_surf_mnh.f90 | 136 ++++++-------
src/MNH/set_grid.f90 | 5 +-
src/MNH/shallow_mf_pack.f90 | 4 +-
src/MNH/spawn_field2.f90 | 4 +-
src/MNH/tke_eps_sources.f90 | 4 +-
src/MNH/turb.f90 | 8 +-
src/MNH/turb_cloud_index.f90 | 4 +-
src/MNH/turb_hor_dyn_corr.f90 | 4 +-
src/MNH/turb_hor_sv_flux.f90 | 4 +-
src/MNH/turb_hor_thermo_corr.f90 | 4 +-
src/MNH/turb_hor_thermo_flux.f90 | 4 +-
src/MNH/turb_hor_uv.f90 | 4 +-
src/MNH/turb_hor_uw.f90 | 4 +-
src/MNH/turb_hor_vw.f90 | 4 +-
src/MNH/turb_ver.f90 | 4 +-
src/MNH/turb_ver_dyn_flux.f90 | 4 +-
src/MNH/turb_ver_sv_flux.f90 | 4 +-
src/MNH/turb_ver_thermo_corr.f90 | 4 +-
src/MNH/turb_ver_thermo_flux.f90 | 4 +-
src/MNH/uv_to_zonal_and_merid.f90 | 18 +-
src/MNH/ver_thermo.f90 | 4 +-
src/MNH/write_balloonn.f90 | 4 +-
src/MNH/write_budget.f90 | 2 +-
src/MNH/write_diachro.f90 | 4 +-
src/MNH/write_dummy_gr_fieldn.f90 | 4 +-
src/MNH/write_lbn.f90 | 4 +-
src/MNH/write_lfifm1_for_diag.f90 | 5 +-
src/MNH/write_lfifm1_for_diag_supp.f90 | 5 +-
src/MNH/write_lfin.f90 | 5 +-
src/MNH/write_surf_mnh.f90 | 155 +++++++--------
src/MNH/zsmt_pgd.f90 | 4 +-
82 files changed, 533 insertions(+), 510 deletions(-)
create mode 100644 src/LIB/SURCOUCHE/src/modd_field.f90
diff --git a/src/LIB/SURCOUCHE/src/modd_field.f90 b/src/LIB/SURCOUCHE/src/modd_field.f90
new file mode 100644
index 000000000..58e16d47f
--- /dev/null
+++ b/src/LIB/SURCOUCHE/src/modd_field.f90
@@ -0,0 +1,150 @@
+!MNH_LIC Copyright 2016-2020 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.
+!-----------------------------------------------------------------
+! Original version:
+! P. Wautelet: 05/2016-04/2018: new data structures and calls for I/O
+! Modifications:
+! P. Wautelet 12/04/2019: added pointers for C1D, L1D, N1D, X5D and X6D structures in TFIELDDATA
+! P. Wautelet 12/07/2019: add pointers for T1D structure in TFIELDDATA
+! P. Wautelet 23/01/2020: split in modd_field.f90 and mode_field.f90
+!-----------------------------------------------------------------
+module modd_field
+
+use modd_parameters, only: NGRIDUNKNOWN, NMNHNAMELGTMAX, NSTDNAMELGTMAX
+use modd_type_date, only: date_time
+#if defined(MNH_IOCDF4)
+use NETCDF, only: NF90_FILL_INT, NF90_FILL_REAL
+#endif
+
+implicit none
+
+INTEGER,PARAMETER :: MAXFIELDS = 250
+INTEGER,PARAMETER :: TYPEUNDEF = -1, TYPEINT = 1, TYPELOG = 2, TYPEREAL = 3, TYPECHAR = 4, TYPEDATE = 5
+!
+TYPE TFIELDPTR_C0D
+ CHARACTER(LEN=:), POINTER :: DATA => NULL()
+END TYPE TFIELDPTR_C0D
+!
+TYPE TFIELDPTR_C1D
+ CHARACTER(LEN=:),DIMENSION(:),POINTER :: DATA => NULL()
+END TYPE TFIELDPTR_C1D
+!
+TYPE TFIELDPTR_L0D
+ LOGICAL, POINTER :: DATA => NULL()
+END TYPE TFIELDPTR_L0D
+!
+TYPE TFIELDPTR_L1D
+ LOGICAL,DIMENSION(:), POINTER :: DATA => NULL()
+END TYPE TFIELDPTR_L1D
+!
+TYPE TFIELDPTR_N0D
+ INTEGER, POINTER :: DATA => NULL()
+END TYPE TFIELDPTR_N0D
+!
+TYPE TFIELDPTR_N1D
+ INTEGER,DIMENSION(:), POINTER :: DATA => NULL()
+END TYPE TFIELDPTR_N1D
+!
+TYPE TFIELDPTR_N2D
+ INTEGER,DIMENSION(:,:), POINTER :: DATA => NULL()
+END TYPE TFIELDPTR_N2D
+!
+TYPE TFIELDPTR_N3D
+ INTEGER,DIMENSION(:,:,:),POINTER :: DATA => NULL()
+END TYPE TFIELDPTR_N3D
+!
+TYPE TFIELDPTR_X0D
+ REAL, POINTER :: DATA => NULL()
+END TYPE TFIELDPTR_X0D
+!
+TYPE TFIELDPTR_X1D
+ REAL,DIMENSION(:), POINTER :: DATA => NULL()
+END TYPE TFIELDPTR_X1D
+!
+TYPE TFIELDPTR_X2D
+ REAL,DIMENSION(:,:), POINTER :: DATA => NULL()
+END TYPE TFIELDPTR_X2D
+!
+TYPE TFIELDPTR_X3D
+ REAL,DIMENSION(:,:,:),POINTER :: DATA => NULL()
+END TYPE TFIELDPTR_X3D
+!
+TYPE TFIELDPTR_X4D
+ REAL,DIMENSION(:,:,:,:),POINTER :: DATA => NULL()
+END TYPE TFIELDPTR_X4D
+!
+TYPE TFIELDPTR_X5D
+ REAL,DIMENSION(:,:,:,:,:),POINTER :: DATA => NULL()
+END TYPE TFIELDPTR_X5D
+!
+TYPE TFIELDPTR_X6D
+ REAL,DIMENSION(:,:,:,:,:,:),POINTER :: DATA => NULL()
+END TYPE TFIELDPTR_X6D
+!
+TYPE TFIELDPTR_T0D
+ TYPE(DATE_TIME), POINTER :: DATA => NULL()
+END TYPE TFIELDPTR_T0D
+!
+TYPE TFIELDPTR_T1D
+ TYPE(DATE_TIME), DIMENSION(:), POINTER :: DATA => NULL()
+END TYPE TFIELDPTR_T1D
+!
+!Structure describing the characteristics of a field
+TYPE :: TFIELDDATA
+ CHARACTER(LEN=NMNHNAMELGTMAX) :: CMNHNAME = '' !Name of the field (for MesoNH, non CF convention)
+ CHARACTER(LEN=NSTDNAMELGTMAX) :: CSTDNAME = '' !Standard name (CF convention)
+ CHARACTER(LEN=32) :: CLONGNAME = '' !Long name (CF convention)
+ CHARACTER(LEN=40) :: CUNITS = '' !Canonical units (CF convention)
+ CHARACTER(LEN=2) :: CDIR = '' !Type of the data field (XX,XY,--...)
+ CHARACTER(LEN=4) :: CLBTYPE = 'NONE' !Type of the lateral boundary (LBX,LBY,LBXU,LBYV)
+ CHARACTER(LEN=100) :: CCOMMENT = '' !Comment (for MesoNH, non CF convention)
+ INTEGER :: NGRID = NGRIDUNKNOWN !Localization on the model grid
+ INTEGER :: NTYPE = TYPEUNDEF !Datatype
+ INTEGER :: NDIMS = 0 !Number of dimensions
+ LOGICAL :: LTIMEDEP = .FALSE. !Is the field time-dependent?
+ !
+#if defined(MNH_IOCDF4)
+ INTEGER :: NFILLVALUE = NF90_FILL_INT !Fill value for integer fields
+ REAL :: XFILLVALUE = NF90_FILL_REAL !Fill value for real fields
+ !NF90_FILL_REAL is the default fill value
+ !used by netCDF to pre-fill real and also double
+ !variables
+#else
+ INTEGER :: NFILLVALUE = -2147483647 !Fill value for integer fields
+ REAL :: XFILLVALUE = 9.9692099683868690e+36 !Fill value for real fields
+#endif
+ INTEGER :: NVALIDMIN = -2147483646 !Minimum valid value for integer fields
+ INTEGER :: NVALIDMAX = 2147483647 !Maximum valid value for integer fields
+ REAL :: XVALIDMIN = -1.E36 !Minimum valid value for real fields
+ REAL :: XVALIDMAX = 1.E36 !Maximum valid value for real fields
+ !
+ TYPE(TFIELDPTR_C0D),DIMENSION(:),ALLOCATABLE :: TFIELD_C0D !Pointer to the character string fields (one per nested mesh)
+ TYPE(TFIELDPTR_C1D),DIMENSION(:),ALLOCATABLE :: TFIELD_C1D !Pointer to the character string 1D fields (one per nested mesh)
+ !
+ TYPE(TFIELDPTR_L0D),DIMENSION(:),ALLOCATABLE :: TFIELD_L0D !Pointer to the scalar logical fields (one per nested mesh)
+ TYPE(TFIELDPTR_L1D),DIMENSION(:),ALLOCATABLE :: TFIELD_L1D !Pointer to the logical 1D fields (one per nested mesh)
+ !
+ TYPE(TFIELDPTR_N0D),DIMENSION(:),ALLOCATABLE :: TFIELD_N0D !Pointer to the scalar integer fields (one per nested mesh)
+ TYPE(TFIELDPTR_N1D),DIMENSION(:),ALLOCATABLE :: TFIELD_N1D !Pointer to the integer 1D fields (one per nested mesh)
+ TYPE(TFIELDPTR_N2D),DIMENSION(:),ALLOCATABLE :: TFIELD_N2D !Pointer to the integer 2D fields (one per nested mesh)
+ TYPE(TFIELDPTR_N3D),DIMENSION(:),ALLOCATABLE :: TFIELD_N3D !Pointer to the integer 3D fields (one per nested mesh)
+ !
+ TYPE(TFIELDPTR_X0D),DIMENSION(:),ALLOCATABLE :: TFIELD_X0D !Pointer to the scalar real fields (one per nested mesh)
+ TYPE(TFIELDPTR_X1D),DIMENSION(:),ALLOCATABLE :: TFIELD_X1D !Pointer to the real 1D fields (one per nested mesh)
+ TYPE(TFIELDPTR_X2D),DIMENSION(:),ALLOCATABLE :: TFIELD_X2D !Pointer to the real 2D fields (one per nested mesh)
+ TYPE(TFIELDPTR_X3D),DIMENSION(:),ALLOCATABLE :: TFIELD_X3D !Pointer to the real 3D fields (one per nested mesh)
+ TYPE(TFIELDPTR_X4D),DIMENSION(:),ALLOCATABLE :: TFIELD_X4D !Pointer to the real 4D fields (one per nested mesh)
+ TYPE(TFIELDPTR_X5D),DIMENSION(:),ALLOCATABLE :: TFIELD_X5D !Pointer to the real 5D fields (one per nested mesh)
+ TYPE(TFIELDPTR_X6D),DIMENSION(:),ALLOCATABLE :: TFIELD_X6D !Pointer to the real 6D fields (one per nested mesh)
+ !
+ TYPE(TFIELDPTR_T0D),DIMENSION(:),ALLOCATABLE :: TFIELD_T0D !Pointer to the scalar date/time fields (one per nested mesh)
+ TYPE(TFIELDPTR_T1D),DIMENSION(:),ALLOCATABLE :: TFIELD_T1D !Pointer to the date/time 1D fields (one per nested mesh)
+END TYPE TFIELDDATA
+!
+integer, save :: NMODEL_ALLOCATED
+LOGICAL, SAVE :: LFIELDLIST_ISINIT = .FALSE.
+TYPE(TFIELDDATA),DIMENSION(MAXFIELDS),SAVE :: TFIELDLIST
+
+end module modd_field
diff --git a/src/LIB/SURCOUCHE/src/mode_field.f90 b/src/LIB/SURCOUCHE/src/mode_field.f90
index f7dc6bd26..a56b26490 100644
--- a/src/LIB/SURCOUCHE/src/mode_field.f90
+++ b/src/LIB/SURCOUCHE/src/mode_field.f90
@@ -11,168 +11,32 @@
! C. Lac 02/2019: add rain fraction as an output field
! S. Bielli 02/2019: sea salt: significant sea wave height influences salt emission; 5 salt modes
! P. Wautelet 06/03/2019: correct ZWS entry
-! P. Wautelet 12/04/2019: added pointers for C1D, L1D, N1D, X5D and X6D structures in TFIELDDATA
! P. Wautelet 06/06/2019: bug correction in FIELDLIST_GOTO_MODEL (XLSTHM was overwritten if LUSERV=.FALSE. due to wrong IF block)
! P. Wautelet 19/06/2019: add Fieldlist_nmodel_resize subroutine + provide KMODEL to INI_FIELD_LIST when known
-! P. Wautelet 12/07/2019: add pointers for T1D structure in TFIELDDATA
+! P. Wautelet 23/01/2020: split in modd_field.f90 and mode_field.f90
!-----------------------------------------------------------------
-MODULE MODE_FIELD
-!
-USE MODD_CONF, ONLY : CPROGRAM
-USE MODD_IO, ONLY : NVERB_DEBUG, NVERB_INFO, NVERB_WARNING, NVERB_ERROR, NVERB_FATAL
-USE MODD_PARAMETERS, only: JPMODELMAX, NGRIDUNKNOWN, NMNHNAMELGTMAX, NSTDNAMELGTMAX
-USE MODD_TYPE_DATE, ONLY : DATE_TIME
-#if defined(MNH_IOCDF4)
-USE NETCDF, ONLY : NF90_FILL_INT, NF90_FILL_REAL
-#endif
-!
-USE MODE_MSG
-!
-IMPLICIT NONE
-!
-#if 0
-!if enabled: crash of GCC 8.3 and 9.1 (and others?) in mode_io_field_read.f90
+module mode_field
+
+use modd_conf, only: cprogram
+use modd_field
+use modd_io, only: NVERB_DEBUG, NVERB_INFO, NVERB_WARNING, NVERB_ERROR, NVERB_FATAL
+use modd_parameters, only: JPMODELMAX
+
+use mode_msg
+
+implicit none
+
private
-!
-public :: TYPEUNDEF, TYPEINT, TYPELOG, TYPEREAL, TYPECHAR, TYPEDATE
-public :: TFIELDDATA
-public :: TFIELDLIST
-public :: INI_FIELD_LIST
-public :: FIND_FIELD_ID_FROM_MNHNAME
-public :: ALLOC_FIELD_SCALARS
-public :: FIELDLIST_GOTO_MODEL
+
+public :: Ini_field_list
+public :: Find_field_id_from_mnhname
+public :: Alloc_field_scalars
+public :: Fieldlist_goto_model
public :: Fieldlist_nmodel_resize
-#endif
-!
-INTEGER,PARAMETER :: MAXFIELDS = 250
-INTEGER,PARAMETER :: TYPEUNDEF = -1, TYPEINT = 1, TYPELOG = 2, TYPEREAL = 3, TYPECHAR = 4, TYPEDATE = 5
-!
-TYPE TFIELDPTR_C0D
- CHARACTER(LEN=:), POINTER :: DATA => NULL()
-END TYPE TFIELDPTR_C0D
-!
-TYPE TFIELDPTR_C1D
- CHARACTER(LEN=:),DIMENSION(:),POINTER :: DATA => NULL()
-END TYPE TFIELDPTR_C1D
-!
-TYPE TFIELDPTR_L0D
- LOGICAL, POINTER :: DATA => NULL()
-END TYPE TFIELDPTR_L0D
-!
-TYPE TFIELDPTR_L1D
- LOGICAL,DIMENSION(:), POINTER :: DATA => NULL()
-END TYPE TFIELDPTR_L1D
-!
-TYPE TFIELDPTR_N0D
- INTEGER, POINTER :: DATA => NULL()
-END TYPE TFIELDPTR_N0D
-!
-TYPE TFIELDPTR_N1D
- INTEGER,DIMENSION(:), POINTER :: DATA => NULL()
-END TYPE TFIELDPTR_N1D
-!
-TYPE TFIELDPTR_N2D
- INTEGER,DIMENSION(:,:), POINTER :: DATA => NULL()
-END TYPE TFIELDPTR_N2D
-!
-TYPE TFIELDPTR_N3D
- INTEGER,DIMENSION(:,:,:),POINTER :: DATA => NULL()
-END TYPE TFIELDPTR_N3D
-!
-TYPE TFIELDPTR_X0D
- REAL, POINTER :: DATA => NULL()
-END TYPE TFIELDPTR_X0D
-!
-TYPE TFIELDPTR_X1D
- REAL,DIMENSION(:), POINTER :: DATA => NULL()
-END TYPE TFIELDPTR_X1D
-!
-TYPE TFIELDPTR_X2D
- REAL,DIMENSION(:,:), POINTER :: DATA => NULL()
-END TYPE TFIELDPTR_X2D
-!
-TYPE TFIELDPTR_X3D
- REAL,DIMENSION(:,:,:),POINTER :: DATA => NULL()
-END TYPE TFIELDPTR_X3D
-!
-TYPE TFIELDPTR_X4D
- REAL,DIMENSION(:,:,:,:),POINTER :: DATA => NULL()
-END TYPE TFIELDPTR_X4D
-!
-TYPE TFIELDPTR_X5D
- REAL,DIMENSION(:,:,:,:,:),POINTER :: DATA => NULL()
-END TYPE TFIELDPTR_X5D
-!
-TYPE TFIELDPTR_X6D
- REAL,DIMENSION(:,:,:,:,:,:),POINTER :: DATA => NULL()
-END TYPE TFIELDPTR_X6D
-!
-TYPE TFIELDPTR_T0D
- TYPE(DATE_TIME), POINTER :: DATA => NULL()
-END TYPE TFIELDPTR_T0D
-!
-TYPE TFIELDPTR_T1D
- TYPE(DATE_TIME), DIMENSION(:), POINTER :: DATA => NULL()
-END TYPE TFIELDPTR_T1D
-!
-!Structure describing the characteristics of a field
-TYPE TFIELDDATA
- CHARACTER(LEN=NMNHNAMELGTMAX) :: CMNHNAME = '' !Name of the field (for MesoNH, non CF convention)
- CHARACTER(LEN=NSTDNAMELGTMAX) :: CSTDNAME = '' !Standard name (CF convention)
- CHARACTER(LEN=32) :: CLONGNAME = '' !Long name (CF convention)
- CHARACTER(LEN=40) :: CUNITS = '' !Canonical units (CF convention)
- CHARACTER(LEN=2) :: CDIR = '' !Type of the data field (XX,XY,--...)
- CHARACTER(LEN=4) :: CLBTYPE = 'NONE' !Type of the lateral boundary (LBX,LBY,LBXU,LBYV)
- CHARACTER(LEN=100) :: CCOMMENT = '' !Comment (for MesoNH, non CF convention)
- INTEGER :: NGRID = NGRIDUNKNOWN !Localization on the model grid
- INTEGER :: NTYPE = TYPEUNDEF !Datatype
- INTEGER :: NDIMS = 0 !Number of dimensions
- LOGICAL :: LTIMEDEP = .FALSE. !Is the field time-dependent?
- !
-#if defined(MNH_IOCDF4)
- INTEGER :: NFILLVALUE = NF90_FILL_INT !Fill value for integer fields
- REAL :: XFILLVALUE = NF90_FILL_REAL !Fill value for real fields
- !NF90_FILL_REAL is the default fill value
- !used by netCDF to pre-fill real and also double
- !variables
-#else
- INTEGER :: NFILLVALUE = -2147483647 !Fill value for integer fields
- REAL :: XFILLVALUE = 9.9692099683868690e+36 !Fill value for real fields
-#endif
- INTEGER :: NVALIDMIN = -2147483646 !Minimum valid value for integer fields
- INTEGER :: NVALIDMAX = 2147483647 !Maximum valid value for integer fields
- REAL :: XVALIDMIN = -1.E36 !Minimum valid value for real fields
- REAL :: XVALIDMAX = 1.E36 !Maximum valid value for real fields
- !
- TYPE(TFIELDPTR_C0D),DIMENSION(:),ALLOCATABLE :: TFIELD_C0D !Pointer to the character string fields (one per nested mesh)
- TYPE(TFIELDPTR_C1D),DIMENSION(:),ALLOCATABLE :: TFIELD_C1D !Pointer to the character string 1D fields (one per nested mesh)
- !
- TYPE(TFIELDPTR_L0D),DIMENSION(:),ALLOCATABLE :: TFIELD_L0D !Pointer to the scalar logical fields (one per nested mesh)
- TYPE(TFIELDPTR_L1D),DIMENSION(:),ALLOCATABLE :: TFIELD_L1D !Pointer to the logical 1D fields (one per nested mesh)
- !
- TYPE(TFIELDPTR_N0D),DIMENSION(:),ALLOCATABLE :: TFIELD_N0D !Pointer to the scalar integer fields (one per nested mesh)
- TYPE(TFIELDPTR_N1D),DIMENSION(:),ALLOCATABLE :: TFIELD_N1D !Pointer to the integer 1D fields (one per nested mesh)
- TYPE(TFIELDPTR_N2D),DIMENSION(:),ALLOCATABLE :: TFIELD_N2D !Pointer to the integer 2D fields (one per nested mesh)
- TYPE(TFIELDPTR_N3D),DIMENSION(:),ALLOCATABLE :: TFIELD_N3D !Pointer to the integer 3D fields (one per nested mesh)
- !
- TYPE(TFIELDPTR_X0D),DIMENSION(:),ALLOCATABLE :: TFIELD_X0D !Pointer to the scalar real fields (one per nested mesh)
- TYPE(TFIELDPTR_X1D),DIMENSION(:),ALLOCATABLE :: TFIELD_X1D !Pointer to the real 1D fields (one per nested mesh)
- TYPE(TFIELDPTR_X2D),DIMENSION(:),ALLOCATABLE :: TFIELD_X2D !Pointer to the real 2D fields (one per nested mesh)
- TYPE(TFIELDPTR_X3D),DIMENSION(:),ALLOCATABLE :: TFIELD_X3D !Pointer to the real 3D fields (one per nested mesh)
- TYPE(TFIELDPTR_X4D),DIMENSION(:),ALLOCATABLE :: TFIELD_X4D !Pointer to the real 4D fields (one per nested mesh)
- TYPE(TFIELDPTR_X5D),DIMENSION(:),ALLOCATABLE :: TFIELD_X5D !Pointer to the real 5D fields (one per nested mesh)
- TYPE(TFIELDPTR_X6D),DIMENSION(:),ALLOCATABLE :: TFIELD_X6D !Pointer to the real 6D fields (one per nested mesh)
- !
- TYPE(TFIELDPTR_T0D),DIMENSION(:),ALLOCATABLE :: TFIELD_T0D !Pointer to the scalar date/time fields (one per nested mesh)
- TYPE(TFIELDPTR_T1D),DIMENSION(:),ALLOCATABLE :: TFIELD_T1D !Pointer to the date/time 1D fields (one per nested mesh)
-END TYPE TFIELDDATA
-!
-integer, save :: NMODEL_ALLOCATED
-LOGICAL, SAVE :: LFIELDLIST_ISINIT = .FALSE.
-TYPE(TFIELDDATA),DIMENSION(MAXFIELDS),SAVE :: TFIELDLIST
-!
-CONTAINS
-!
+public :: Ini_field_scalars
+
+contains
+
SUBROUTINE INI_FIELD_LIST(KMODEL)
! Modif
! J.Escobar 25/04/2018: missing def of FRC
@@ -5099,4 +4963,4 @@ nmodel_allocated = kmodelnew
end subroutine Fieldlist_nmodel_resize
-END MODULE MODE_FIELD
+end module mode_field
diff --git a/src/LIB/SURCOUCHE/src/mode_io_field_read.f90 b/src/LIB/SURCOUCHE/src/mode_io_field_read.f90
index 8f717bce0..4f3904e3d 100644
--- a/src/LIB/SURCOUCHE/src/mode_io_field_read.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io_field_read.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -19,11 +19,12 @@
MODULE MODE_IO_FIELD_READ
!
+use modd_field
USE MODD_IO, ONLY : NVERB_FATAL,NVERB_ERROR,NVERB_WARNING,NVERB_INFO,NVERB_DEBUG,TFILEDATA
USE MODD_MPIF
use modd_precision, only: MNHINT_MPI, MNHLOG_MPI, MNHREAL_MPI, MNHTIME
!
-USE MODE_FIELD
+use mode_field, only: Find_field_id_from_mnhname
USE MODE_IO_READ_LFI
#if defined(MNH_IOCDF4)
USE MODE_IO_READ_NC4
diff --git a/src/LIB/SURCOUCHE/src/mode_io_field_write.f90 b/src/LIB/SURCOUCHE/src/mode_io_field_write.f90
index 16d5f2988..1f02a2694 100644
--- a/src/LIB/SURCOUCHE/src/mode_io_field_write.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io_field_write.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -19,12 +19,13 @@
MODULE MODE_IO_FIELD_WRITE
+ use modd_field, only: tfielddata, tfieldlist, TYPECHAR, TYPEDATE, TYPEINT, TYPELOG, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA, TOUTBAK
USE MODD_MPIF
use modd_parameters, only: NMNHNAMELGTMAX
use modd_precision, only: MNHINT_MPI, MNHREAL_MPI, MNHTIME
- USE MODE_FIELD
+ use mode_field, only: Find_field_id_from_mnhname
USE MODE_IO_WRITE_LFI
#if defined(MNH_IOCDF4)
USE MODE_IO_WRITE_NC4
diff --git a/src/LIB/SURCOUCHE/src/mode_io_manage_struct.f90 b/src/LIB/SURCOUCHE/src/mode_io_manage_struct.f90
index 4e6bce3f2..3beae194e 100644
--- a/src/LIB/SURCOUCHE/src/mode_io_manage_struct.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io_manage_struct.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2016-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2016-2020 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.
@@ -41,13 +41,15 @@ USE MODD_CONF
USE MODD_CONF_n
USE MODD_DYN, ONLY : XSEGLEN
USE MODD_DYN_n, ONLY : DYN_MODEL
+use modd_field, only: tfieldlist
USE MODD_IO_SURF_MNH,ONLY : IO_SURF_MNH_MODEL
USE MODD_NESTING, ONLY : CDAD_NAME,NDAD
USE MODD_NSV, ONLY: NSV
USE MODD_OUT_n, ONLY : OUT_MODEL
USE MODD_VAR_ll, ONLY : IP
-USE MODE_FIELD
-!
+
+use mode_field, only: Find_field_id_from_mnhname
+
IMPLICIT NONE
!
INTEGER, INTENT(IN) :: KSUP ! supp. time steps
diff --git a/src/LIB/SURCOUCHE/src/mode_io_read_lfi.f90 b/src/LIB/SURCOUCHE/src/mode_io_read_lfi.f90
index 01b03897d..6d2990d35 100644
--- a/src/LIB/SURCOUCHE/src/mode_io_read_lfi.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io_read_lfi.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -13,11 +13,11 @@
!-----------------------------------------------------------------
module mode_io_read_lfi
!
+use modd_field, only: tfielddata
USE MODD_IO
USE MODD_PARAMETERS, ONLY: NLFIMAXCOMMENTLENGTH
use modd_precision, only: LFIINT
!
-USE MODE_FIELD, ONLY : TFIELDDATA
USE MODE_MSG
!
IMPLICIT NONE
diff --git a/src/LIB/SURCOUCHE/src/mode_io_read_nc4.f90 b/src/LIB/SURCOUCHE/src/mode_io_read_nc4.f90
index 75e142d20..ed9e0833e 100644
--- a/src/LIB/SURCOUCHE/src/mode_io_read_nc4.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io_read_nc4.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -17,10 +17,10 @@
#if defined(MNH_IOCDF4)
module mode_io_read_nc4
+use modd_field, only: tfielddata
use modd_io, only: tfiledata
use modd_precision, only: CDFINT
-use mode_field, only: tfielddata
use mode_io_tools_nc4, only: IO_Mnhname_clean, IO_Err_handle_nc4
use mode_msg
diff --git a/src/LIB/SURCOUCHE/src/mode_io_tools.f90 b/src/LIB/SURCOUCHE/src/mode_io_tools.f90
index 425cc472a..42236655f 100644
--- a/src/LIB/SURCOUCHE/src/mode_io_tools.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io_tools.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -103,7 +103,8 @@ contains
subroutine IO_Mnhversion_get(tpfile)
!Compare MNHVERSION of file with current version and store it in file metadata
use modd_conf, only: nmnhversion
- use mode_field, only: tfielddata,typeint
+ use modd_field, only: tfielddata, TYPEINT
+
use mode_io_field_read, only: IO_Field_read
type(tfiledata), intent(inout) :: tpfile
diff --git a/src/LIB/SURCOUCHE/src/mode_io_tools_nc4.f90 b/src/LIB/SURCOUCHE/src/mode_io_tools_nc4.f90
index 2be340eaf..cd5b228fe 100644
--- a/src/LIB/SURCOUCHE/src/mode_io_tools_nc4.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io_tools_nc4.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -15,11 +15,11 @@
#if defined(MNH_IOCDF4)
module mode_io_tools_nc4
+use modd_field, only: tfielddata
use modd_io, only: tfiledata
use modd_netcdf, only: dimcdf, iocdf, tdim_dummy
use modd_precision, only: CDFINT
-use mode_field, only: tfielddata
use mode_msg
use NETCDF, only: NF90_NOERR, NF90_UNLIMITED, &
@@ -69,7 +69,7 @@ END SUBROUTINE IO_Dim_find_byname_nc4
SUBROUTINE IO_Dimids_guess_nc4(TPFILE, TPFIELD, KLEN, TPDIMS, KRESP)
!
-USE MODE_FIELD, ONLY: TYPECHAR
+USE MODD_FIELD, ONLY: TYPECHAR
!
!Used by LFI2CDF
TYPE(TFILEDATA), INTENT(IN) :: TPFILE
diff --git a/src/LIB/SURCOUCHE/src/mode_io_write_lfi.f90 b/src/LIB/SURCOUCHE/src/mode_io_write_lfi.f90
index 2e56fdc99..bb455523b 100644
--- a/src/LIB/SURCOUCHE/src/mode_io_write_lfi.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io_write_lfi.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -13,11 +13,11 @@
!-----------------------------------------------------------------
module mode_io_write_lfi
!
+use modd_field, only: tfielddata
USE MODD_IO
USE MODD_PARAMETERS, ONLY: NLFIMAXCOMMENTLENGTH
use modd_precision, only: LFIINT
!
-USE MODE_FIELD, ONLY: TFIELDDATA
USE MODE_MSG
!
IMPLICIT NONE
diff --git a/src/LIB/SURCOUCHE/src/mode_io_write_nc4.f90 b/src/LIB/SURCOUCHE/src/mode_io_write_nc4.f90
index 0197ed559..7fa766ccd 100644
--- a/src/LIB/SURCOUCHE/src/mode_io_write_nc4.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io_write_nc4.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -21,11 +21,11 @@
#ifdef MNH_IOCDF4
module mode_io_write_nc4
+use modd_field, only: tfielddata
use modd_io, only: gsmonoproc, tfiledata
use modd_netcdf, only: dimcdf, iocdf
use modd_precision, only: CDFINT, MNHINT_NF90, MNHREAL_MPI, MNHREAL_NF90
-use mode_field, only: tfielddata
use mode_io_tools_nc4, only: IO_Mnhname_clean, IO_Vdims_fill_nc4, IO_Dimcdf_get_nc4, IO_Strdimid_get_nc4, IO_Err_handle_nc4
use mode_msg
@@ -62,9 +62,9 @@ integer(kind=CDFINT),parameter :: DEFLATE = 1
contains
subroutine IO_Field_header_split_write_nc4( tpfile, tpfield, knblocks )
-use modd_parameters, only : jphext
+use modd_field, only: TYPEREAL
+use modd_parameters, only: jphext
-use mode_field, only: TYPEREAL
use mode_tools_ll, only: Get_globaldims_ll
type(tfiledata), intent(in) :: tpfile
@@ -151,8 +151,7 @@ SUBROUTINE IO_Field_attr_write_nc4(TPFILE,TPFIELD,KVARID,OEXISTED,KSHAPE,HCALEND
!
USE MODD_CONF, ONLY: CPROGRAM, LCARTESIAN
USE MODD_CONF_n, ONLY: CSTORAGE_TYPE
-!
-USE MODE_FIELD, ONLY: TYPEINT, TYPEREAL
+use modd_field, only: TYPEINT, TYPEREAL
!
TYPE(TFILEDATA), INTENT(IN) :: TPFILE
TYPE(TFIELDDATA), INTENT(IN) :: TPFIELD
@@ -1620,12 +1619,13 @@ END SUBROUTINE IO_Field_write_nc4_T1
SUBROUTINE IO_Coordvar_write_nc4(TPFILE,HPROGRAM_ORIG)
USE MODD_CONF, ONLY: CPROGRAM, LCARTESIAN
USE MODD_CONF_n, ONLY: CSTORAGE_TYPE
+use modd_field, only: tfieldlist
USE MODD_GRID, ONLY: XLATORI, XLONORI
USE MODD_GRID_n, ONLY: LSLEVE, XXHAT, XYHAT, XZHAT
use modd_netcdf, only: dimcdf
USE MODD_PARAMETERS, ONLY: JPHEXT, JPVEXT
-USE MODE_FIELD, ONLY: TFIELDLIST,FIND_FIELD_ID_FROM_MNHNAME
+use mode_field, only: Find_field_id_from_mnhname
USE MODE_GRIDPROJ
USE MODE_NEST_ll, ONLY: GET_MODEL_NUMBER_ll, GO_TOMODEL_ll
@@ -2082,11 +2082,12 @@ SUBROUTINE WRITE_VER_COORD(TDIM,HLONGNAME,HSTDNAME,HCOMPNAME,PSHIFT,KBOUNDLOW,KB
END SUBROUTINE WRITE_VER_COORD
SUBROUTINE WRITE_TIME_COORD(TDIM)
+ use modd_field, only: tfieldlist
USE MODD_TIME_n, ONLY: TDTMOD, TDTCUR
USE MODD_TYPE_DATE
USE MODE_DATETIME
- USE MODE_FIELD, ONLY: TFIELDLIST,FIND_FIELD_ID_FROM_MNHNAME
+ use mode_field, only: Find_field_id_from_mnhname
USE MODE_GRIDPROJ
TYPE(DIMCDF), POINTER, INTENT(IN) :: TDIM
diff --git a/src/MNH/advection_metsv.f90 b/src/MNH/advection_metsv.f90
index 082a38516..c57da30e6 100644
--- a/src/MNH/advection_metsv.f90
+++ b/src/MNH/advection_metsv.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -146,6 +146,7 @@ USE MODD_BUDGET
USE MODD_CST
USE MODD_CTURB, ONLY: XTKEMIN
USE MODD_CONF, ONLY: LNEUTRAL,NHALO,L1D, L2D
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LUNIT_n, ONLY: TLUOUT
USE MODD_PARAM_n
@@ -154,7 +155,6 @@ USE MODD_BLOWSNOW
USE MODD_BLOWSNOW_n
USE MODD_PARAMETERS
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_ll
USE MODE_MSG
diff --git a/src/MNH/c2r2_adjust.f90 b/src/MNH/c2r2_adjust.f90
index ebbdb572f..124d83e2e 100644
--- a/src/MNH/c2r2_adjust.f90
+++ b/src/MNH/c2r2_adjust.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -151,7 +151,7 @@ USE MODD_LUNIT_n, ONLY: TLUOUT
USE MODD_NSV, ONLY: NSV_C2R2BEG
USE MODD_PARAMETERS
!
-USE MODE_FIELD
+USE MODD_FIELD, only: tfielddata, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_MSG
!
diff --git a/src/MNH/call_rttov11.f90 b/src/MNH/call_rttov11.f90
index 254bc976c..c4eb7ea2c 100644
--- a/src/MNH/call_rttov11.f90
+++ b/src/MNH/call_rttov11.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2003-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2003-2020 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.
@@ -102,7 +102,6 @@ USE MODN_CONF
USE MODI_DETER_ANGLE
USE MODI_PINTER
!
-USE MODE_FIELD
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_ll
USE MODE_MSG
diff --git a/src/MNH/call_rttov8.f90 b/src/MNH/call_rttov8.f90
index 6180ec0f9..946021f40 100644
--- a/src/MNH/call_rttov8.f90
+++ b/src/MNH/call_rttov8.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2003-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2003-2020 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.
@@ -104,7 +104,6 @@ USE MODD_RAD_TRANSF
USE MODI_DETER_ANGLE
USE MODI_PINTER
!
-USE MODE_FIELD
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_ll
USE MODE_MSG
diff --git a/src/MNH/compare_dad.f90 b/src/MNH/compare_dad.f90
index 4efd6a8f4..fe145cee4 100644
--- a/src/MNH/compare_dad.f90
+++ b/src/MNH/compare_dad.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2004-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2004-2020 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.
@@ -66,11 +66,12 @@ END MODULE MODI_COMPARE_DAD
!
!
USE MODD_CONF
+use modd_field, only: tfielddata, tfieldlist
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LUNIT_n, ONLY: TLUOUT
USE MODD_PARAMETERS, ONLY: JPHEXT, JPVEXT, NMNHNAMELGTMAX
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TFIELDLIST,FIND_FIELD_ID_FROM_MNHNAME
+use mode_field, only: Find_field_id_from_mnhname
USE MODE_IO_FILE, only: IO_File_close, IO_File_open
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_GRIDPROJ
diff --git a/src/MNH/compute_r00.f90 b/src/MNH/compute_r00.f90
index 326ad848a..855c83708 100644
--- a/src/MNH/compute_r00.f90
+++ b/src/MNH/compute_r00.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -65,6 +65,7 @@ END MODULE MODI_COMPUTE_R00
!
USE MODD_CONF
USE MODD_GRID_n
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_FIELD_n
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LUNIT_n
@@ -74,7 +75,6 @@ USE MODD_STO_FILE
USE MODD_TYPE_DATE
USE MODD_VAR_ll
!
-USE MODE_FIELD
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_IO_FILE, only: IO_File_close, IO_File_open
diff --git a/src/MNH/eddyUV_flux_one_wayn.f90 b/src/MNH/eddyUV_flux_one_wayn.f90
index 1e8e7c513..e6cae0cb9 100644
--- a/src/MNH/eddyUV_flux_one_wayn.f90
+++ b/src/MNH/eddyUV_flux_one_wayn.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2011-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2011-2020 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.
@@ -56,21 +56,21 @@ END MODULE MODI_EDDYUV_FLUX_ONE_WAY_n
!!
! ##################################################################################
!
+USE MODD_BIKHARDT_n
USE MODD_DEF_EDDYUV_FLUX_n
-USE MODD_FIELD_n, ONLY:XRVS
+use modd_field, only: tfieldlist
+USE MODD_FIELD_n, ONLY: XRVS
USE MODD_GRID_n
-USE MODD_REF_n, ONLY:XRHODJ
-
USE MODD_METRICS_n
-USE MODI_GRADIENT_U
-!
-USE MODD_BIKHARDT_n
USE MODD_NESTING
-!
+USE MODD_REF_n, ONLY: XRHODJ
+
use mode_bikhardt
-USE MODE_FIELD, ONLY : TFIELDLIST, FIND_FIELD_ID_FROM_MNHNAME
-use mode_tools_ll, only: GET_INDICE_ll
-!
+use mode_field, only: Find_field_id_from_mnhname
+use mode_tools_ll, only: GET_INDICE_ll
+
+USE MODI_GRADIENT_U
+
IMPLICIT NONE
!
INTEGER, INTENT(IN) :: KMI ! Model index
diff --git a/src/MNH/eddy_flux_one_wayn.f90 b/src/MNH/eddy_flux_one_wayn.f90
index 31549eab9..14b7d035b 100644
--- a/src/MNH/eddy_flux_one_wayn.f90
+++ b/src/MNH/eddy_flux_one_wayn.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2011-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2011-2020 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.
@@ -56,21 +56,21 @@ END MODULE MODI_EDDY_FLUX_ONE_WAY_n
!!
! ##################################################################################
!
+USE MODD_BIKHARDT_n
USE MODD_DEF_EDDY_FLUX_n
-USE MODD_FIELD_n, ONLY:XRTHS
-USE MODD_REF_n, ONLY:XRHODJ
+use modd_field, only: tfieldlist
+USE MODD_FIELD_n, ONLY: XRTHS
USE MODD_GRID_n
-
USE MODD_METRICS_n
-USE MODI_GRADIENT_W
-USE MODI_GRADIENT_U
-!
-USE MODD_BIKHARDT_n
USE MODD_NESTING
-!
+USE MODD_REF_n, ONLY: XRHODJ
+
use mode_bikhardt
-USE MODE_FIELD, ONLY : TFIELDLIST, FIND_FIELD_ID_FROM_MNHNAME
-!
+use mode_field, only: Find_field_id_from_mnhname
+
+USE MODI_GRADIENT_W
+USE MODI_GRADIENT_U
+
IMPLICIT NONE
!
INTEGER, INTENT(IN) :: KMI ! Model index
diff --git a/src/MNH/free_atm_profile.f90 b/src/MNH/free_atm_profile.f90
index 631577f0f..50496da72 100644
--- a/src/MNH/free_atm_profile.f90
+++ b/src/MNH/free_atm_profile.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1997-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1997-2020 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.
@@ -93,13 +93,13 @@ END MODULE MODI_FREE_ATM_PROFILE
! ------------
!
USE MODD_CONF
+use modd_field, only: tfielddata, TYPEINT, TYPEREAL
USE MODD_GRID_n
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LUNIT, ONLY: TLUOUT0
USE MODD_PARAMETERS
USE MODD_VER_INTERP_LIN
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEINT, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_MPPDB
!
diff --git a/src/MNH/goto_model_wrapper.f90 b/src/MNH/goto_model_wrapper.f90
index 8774b548f..950d731b8 100644
--- a/src/MNH/goto_model_wrapper.f90
+++ b/src/MNH/goto_model_wrapper.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -117,7 +117,8 @@ USE MODD_ADVFRC_n
!
USE MODD_CH_PRODLOSSTOT_n
USE MODD_CH_BUDGET_n
-USE MODE_FIELD
+!
+use mode_field, only: Fieldlist_goto_model
use mode_msg
!
IMPLICIT NONE
diff --git a/src/MNH/ini_aircraft_balloon.f90 b/src/MNH/ini_aircraft_balloon.f90
index 42f1e14a0..e098bed2d 100644
--- a/src/MNH/ini_aircraft_balloon.f90
+++ b/src/MNH/ini_aircraft_balloon.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2000-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2000-2020 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.
@@ -85,13 +85,13 @@ USE MODD_AIRCRAFT_BALLOON
USE MODD_CONF
USE MODD_DIAG_FLAG
USE MODD_DYN_n
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_GRID
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LUNIT_n, ONLY: TLUOUT
USE MODD_PARAM_n, ONLY: CCLOUD
USE MODD_PARAMETERS
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_GRIDPROJ
USE MODE_ll
USE MODE_MODELN_HANDLER
diff --git a/src/MNH/ini_deep_convection.f90 b/src/MNH/ini_deep_convection.f90
index 6934822e3..f4747410b 100644
--- a/src/MNH/ini_deep_convection.f90
+++ b/src/MNH/ini_deep_convection.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1996-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2020 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.
@@ -120,6 +120,7 @@ USE MODD_CH_M9_n, ONLY: CNAMES
USE MODD_CONVPAR
USE MODD_DUST, ONLY: CDUSTNAMES
USE MODD_ELEC_DESCR, ONLY: CELECNAMES
+use modd_field, only: tfielddata, tfieldlist, TYPEREAL
USE MODD_ICE_C1R3_DESCR, ONLY: C1R3NAMES
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LG, ONLY: CLGNAMES
@@ -132,7 +133,7 @@ USE MODD_RAIN_C2R2_DESCR, ONLY: C2R2NAMES
USE MODD_SALT, ONLY: CSALTNAMES
USE MODD_TIME
!
-USE MODE_FIELD
+use mode_field, only: Find_field_id_from_mnhname
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_TOOLS, ONLY: UPCASE
!
diff --git a/src/MNH/ini_lb.f90 b/src/MNH/ini_lb.f90
index 79fff8058..b4d44b50a 100644
--- a/src/MNH/ini_lb.f90
+++ b/src/MNH/ini_lb.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1998-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1998-2020 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.
@@ -145,6 +145,7 @@ USE MODD_CTURB
USE MODD_CONF
USE MODD_DUST
USE MODD_ELEC_DESCR, ONLY: CELECNAMES
+use modd_field, only: tfielddata, TYPELOG, TYPEREAL
USE MODD_ICE_C1R3_DESCR, ONLY: C1R3NAMES
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LG, ONLY: CLGNAMES
@@ -158,7 +159,6 @@ USE MODD_PARAM_n
USE MODD_RAIN_C2R2_DESCR, ONLY: C2R2NAMES
USE MODD_SALT
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPELOG,TYPEREAL
USE MODE_IO_FIELD_READ, only: IO_Field_read, IO_Field_read_lb
USE MODE_MSG
USE MODE_TOOLS, ONLY: UPCASE
diff --git a/src/MNH/ini_prog_var.f90 b/src/MNH/ini_prog_var.f90
index 7f9e33802..ecebea9fc 100644
--- a/src/MNH/ini_prog_var.f90
+++ b/src/MNH/ini_prog_var.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -109,6 +109,7 @@ USE MODD_CONF_n
USE MODD_DIM_n
USE MODD_DUST
USE MODD_DYN_n
+use modd_field, only: TFIELDDATA, TYPEREAL
USE MODD_FIELD_n
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LSFIELD_n
@@ -120,7 +121,6 @@ USE MODD_PARAMETERS
USE MODD_SALT
USE MODD_TURB_n
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_IO_FILE, ONLY: IO_File_close, IO_File_open
USE MODE_IO_MANAGE_STRUCT, ONLY: IO_File_add2list
diff --git a/src/MNH/ini_segn.f90 b/src/MNH/ini_segn.f90
index 1011b7270..e0819946a 100644
--- a/src/MNH/ini_segn.f90
+++ b/src/MNH/ini_segn.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -180,7 +180,7 @@ USE MODD_PARAM_n, ONLY: CSURF
USE MODD_PARAMETERS
USE MODD_REF, ONLY: LBOUSS
!
-USE MODE_FIELD
+use mode_field, only: Fieldlist_nmodel_resize, Ini_field_list, Ini_field_scalars
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_IO_FILE, ONLY: IO_File_close, IO_File_open
USE MODE_IO, only: IO_Config_set
diff --git a/src/MNH/ini_size_spawn.f90 b/src/MNH/ini_size_spawn.f90
index ee52cc7b6..0de2efdb4 100644
--- a/src/MNH/ini_size_spawn.f90
+++ b/src/MNH/ini_size_spawn.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1999-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1999-2020 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.
@@ -78,6 +78,7 @@ END MODULE MODI_INI_SIZE_SPAWN
USE MODD_CONF
USE MODD_DIM_n, ONLY: DIM_MODEL
USE MODD_DYN_n, ONLY: CPRESOPT, NITR
+use modd_field, only: tfielddata, tfieldlist
USE MODD_GRID
USE MODD_GRID_n
USE MODD_IO, ONLY: ISNPROC, ISP, TFILEDATA
@@ -89,7 +90,7 @@ USE MODD_PGDGRID
USE MODD_SPAWN
USE MODD_VAR_ll, ONLY: YSPLITTING
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TFIELDLIST,FIND_FIELD_ID_FROM_MNHNAME
+use mode_field, only: Find_field_id_from_mnhname
USE MODE_GRIDPROJ
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_IO_FILE, only: IO_File_close, IO_File_open
diff --git a/src/MNH/ini_surf_rad.f90 b/src/MNH/ini_surf_rad.f90
index a6c4934e7..be7c6f342 100644
--- a/src/MNH/ini_surf_rad.f90
+++ b/src/MNH/ini_surf_rad.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2003-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2003-2020 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.
@@ -63,9 +63,10 @@ END MODULE MODI_INI_SURF_RAD
!* 0. DECLARATIONS
! ------------
!
+use modd_field, only: tfielddata, tfieldlist
USE MODD_IO, ONLY: TFILEDATA
!
-USE MODE_FIELD, ONLY: FIND_FIELD_ID_FROM_MNHNAME, TFIELDDATA, TFIELDLIST
+use mode_field, only: Find_field_id_from_mnhname
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_MSG
!
diff --git a/src/MNH/init_for_convlfi.f90 b/src/MNH/init_for_convlfi.f90
index 733aa93ca..e5ddc0d3e 100644
--- a/src/MNH/init_for_convlfi.f90
+++ b/src/MNH/init_for_convlfi.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -71,6 +71,7 @@ USE MODD_PARAMETERS
USE MODD_CONF
USE MODD_CST
USE MODD_DIM_n
+use modd_field, only: tfielddata, tfieldlist
USE MODD_FIELD_n
USE MODD_GRID
USE MODD_GRID_n
@@ -79,20 +80,17 @@ USE MODD_TIME
USE MODD_TIME_n
USE MODD_VAR_ll, ONLY: NPROC
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TFIELDLIST, FIND_FIELD_ID_FROM_MNHNAME
-USE MODE_TIME
-USE MODE_GRIDPROJ
-USE MODE_GRIDCART
-!
+use mode_field, only: Find_field_id_from_mnhname
USE MODE_GATHER_ll
+USE MODE_GRIDCART
+USE MODE_GRIDPROJ
USE MODE_IO, only: IO_Pack_set
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_ll
+USE MODE_SPLITTINGZ_ll
+USE MODE_TIME
!
USE MODI_INI_CST
-!JUANZ
-USE MODE_SPLITTINGZ_ll
-!JUANZ
!
IMPLICIT NONE
!
diff --git a/src/MNH/init_ground_paramn.f90 b/src/MNH/init_ground_paramn.f90
index f8e37bd5a..ab38093a9 100644
--- a/src/MNH/init_ground_paramn.f90
+++ b/src/MNH/init_ground_paramn.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2003-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2003-2020 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.
@@ -74,10 +74,11 @@ END MODULE MODI_INIT_GROUND_PARAM_n
! ------------
!
USE MODE_DATETIME
-USE MODE_FIELD
+use mode_field, only: Find_field_id_from_mnhname
USE MODE_ll
!
USE MODD_DYN_n, ONLY : NSTOP, XTSTEP
+use modd_field, only: TFIELDLIST
USE MODD_REF_n, ONLY : XRHODREF
USE MODD_CH_M9_n, ONLY : CNAMES
USE MODD_NSV
diff --git a/src/MNH/init_mnh.f90 b/src/MNH/init_mnh.f90
index 18c169617..7b7d49a3a 100644
--- a/src/MNH/init_mnh.f90
+++ b/src/MNH/init_mnh.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -84,7 +84,7 @@ USE MODD_LUNIT_n
USE MODD_MNH_SURFEX_n
USE MODD_PARAMETERS
!
-USE MODE_FIELD
+use mode_field, only: Alloc_field_scalars, Fieldlist_goto_model
USE MODE_IO_FILE, ONLY: IO_File_open
USE MODE_IO_MANAGE_STRUCT, ONLY: IO_File_add2list
USE MODE_ll
diff --git a/src/MNH/khko_notadjust.f90 b/src/MNH/khko_notadjust.f90
index 533ed78e7..6b1aa32df 100644
--- a/src/MNH/khko_notadjust.f90
+++ b/src/MNH/khko_notadjust.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2013-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2013-2020 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.
@@ -100,6 +100,7 @@ END MODULE MODI_KHKO_NOTADJUST
USE MODD_BUDGET
USE MODD_CONF
USE MODD_CST
+use modd_field, only: TFIELDDATA,TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LUNIT_n, ONLY: TLUOUT
USE MODD_NSV, ONLY: NSV_C2R2BEG
@@ -107,7 +108,6 @@ USE MODD_PARAMETERS
USE MODD_RAIN_C2R2_DESCR, ONLY: XRTMIN
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_MSG
use mode_tools, only: Countjv
diff --git a/src/MNH/lima_adjust.f90 b/src/MNH/lima_adjust.f90
index 4b2056f20..f460701f2 100644
--- a/src/MNH/lima_adjust.f90
+++ b/src/MNH/lima_adjust.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2013-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2013-2020 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.
@@ -146,6 +146,7 @@ END MODULE MODI_LIMA_ADJUST
USE MODD_BUDGET
USE MODD_CONF
USE MODD_CST
+use modd_field, only: TFIELDDATA, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LUNIT_n, ONLY: TLUOUT
USE MODD_NSV
@@ -155,7 +156,6 @@ USE MODD_PARAM_LIMA_COLD
USE MODD_PARAM_LIMA_MIXED
USE MODD_PARAM_LIMA_WARM
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
use mode_msg
use mode_tools, only: Countjv
diff --git a/src/MNH/lima_ccn_activation.f90 b/src/MNH/lima_ccn_activation.f90
index 211fbd35f..f7ef81309 100644
--- a/src/MNH/lima_ccn_activation.f90
+++ b/src/MNH/lima_ccn_activation.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2013-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2013-2020 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.
@@ -97,6 +97,7 @@ END MODULE MODI_LIMA_CCN_ACTIVATION
! ------------
!
USE MODD_CST, ONLY: XALPW, XBETAW, XCL, XCPD, XCPV, XGAMW, XLVTT, XMD, XMV, XRV, XTT
+use modd_field, only: TFIELDDATA, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LUNIT_n, ONLY: TLUOUT
USE MODD_PARAMETERS, ONLY: JPHEXT, JPVEXT
@@ -104,7 +105,6 @@ USE MODD_PARAM_LIMA, ONLY: LACTIT, NMOD_CCN, XKHEN_MULTI, XCTMIN, XLIMIT_FA
USE MODD_PARAM_LIMA_WARM, ONLY: XWMIN, NAHEN, NHYP, XAHENINTP1, XAHENINTP2, XCSTDCRIT, XHYPF12, &
XHYPINTP1, XHYPINTP2, XTMIN, XHYPF32, XPSI3, XAHENG, XPSI1
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
use mode_tools, only: Countjv
diff --git a/src/MNH/lima_warm_nucl.f90 b/src/MNH/lima_warm_nucl.f90
index 3cd2f7052..4bfbe6f8c 100644
--- a/src/MNH/lima_warm_nucl.f90
+++ b/src/MNH/lima_warm_nucl.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2013-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2013-2020 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.
@@ -112,13 +112,13 @@ END MODULE MODI_LIMA_WARM_NUCL
! ------------
!
USE MODD_CST
+use modd_field, only: TFIELDDATA, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LUNIT_n, ONLY: TLUOUT
USE MODD_PARAMETERS, ONLY : JPHEXT, JPVEXT
USE MODD_PARAM_LIMA
USE MODD_PARAM_LIMA_WARM
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
use mode_tools, only: Countjv
diff --git a/src/MNH/menu_diachro.f90 b/src/MNH/menu_diachro.f90
index 01291bbee..78a452dea 100644
--- a/src/MNH/menu_diachro.f90
+++ b/src/MNH/menu_diachro.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1996-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2020 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.
@@ -63,9 +63,10 @@ contains
! ------------
!
USE MODD_CONF
+use modd_field, only: tfielddata, TYPEINT
USE MODD_IO, only: TFILEDATA
+use modd_parameters, only: NMNHNAMELGTMAX
!
-USE MODE_FIELD
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
!
diff --git a/src/MNH/paspol.f90 b/src/MNH/paspol.f90
index 1a2146b66..e214de601 100644
--- a/src/MNH/paspol.f90
+++ b/src/MNH/paspol.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2008-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2008-2020 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.
@@ -70,6 +70,7 @@ END MODULE MODI_PASPOL
USE MODD_PARAMETERS
USE MODD_NSV
USE MODD_CST
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODE_GRIDPROJ
USE MODD_PASPOL
@@ -95,7 +96,6 @@ USE MODD_SUB_PASPOL_n
USE MODD_TYPE_DATE
!
USE MODE_DATETIME
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPEREAL
!
!* 0. DECLARATIONS
! ------------
diff --git a/src/MNH/prandtl.f90 b/src/MNH/prandtl.f90
index a90533596..10f5dcf7e 100644
--- a/src/MNH/prandtl.f90
+++ b/src/MNH/prandtl.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -197,11 +197,10 @@ END MODULE MODI_PRANDTL
USE MODD_CST
USE MODD_CONF
USE MODD_CTURB
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_PARAMETERS
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
-!
USE MODI_GRADIENT_M
USE MODI_EMOIST
USE MODI_ETHETA
diff --git a/src/MNH/prep_ideal_case.f90 b/src/MNH/prep_ideal_case.f90
index 14b2b23d9..cce9665b2 100644
--- a/src/MNH/prep_ideal_case.f90
+++ b/src/MNH/prep_ideal_case.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -370,7 +370,7 @@ USE MODE_IO_FILE, only: IO_File_close, IO_File_open
USE MODE_IO_MANAGE_STRUCT, only: IO_File_add2list,IO_Filelist_print
USE MODE_ll
USE MODE_MODELN_HANDLER
-USE MODE_FIELD
+use mode_field, only: Alloc_field_scalars, Ini_field_list, Ini_field_scalars
USE MODE_MSG
!
USE MODI_DEFAULT_DESFM_n ! Interface modules
diff --git a/src/MNH/prep_nest_pgd.f90 b/src/MNH/prep_nest_pgd.f90
index 5f525bf93..b32bbce30 100644
--- a/src/MNH/prep_nest_pgd.f90
+++ b/src/MNH/prep_nest_pgd.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1995-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2020 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.
@@ -109,7 +109,7 @@ USE MODD_NESTING
USE MODD_PARAMETERS
USE MODD_VAR_ll, ONLY: NPROC, IP, NMNH_COMM_WORLD
!
-USE MODE_FIELD, ONLY: INI_FIELD_LIST
+use mode_field, only: Ini_field_list
USE MODE_IO, only: IO_Init, IO_Pack_set
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_IO_FIELD_WRITE, only: IO_Field_write, IO_Header_write
diff --git a/src/MNH/prep_pgd.f90 b/src/MNH/prep_pgd.f90
index 4303b3072..4beb4dc43 100644
--- a/src/MNH/prep_pgd.f90
+++ b/src/MNH/prep_pgd.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1995-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2020 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.
@@ -94,7 +94,7 @@ use modd_precision, only: LFIINT
USE MODD_IO_SURF_MNH, ONLY : NHALO
USE MODD_SPAWN, ONLY : NDXRATIO,NDYRATIO,NXSIZE,NYSIZE,NXOR,NYOR
!
-USE MODE_FIELD
+use mode_field, only: Ini_field_list
USE MODE_IO, only: IO_Config_set, IO_Init
USE MODE_IO_FIELD_WRITE, only: IO_Field_write, IO_Header_write
USE MODE_IO_FILE, only: IO_File_close, IO_File_open
diff --git a/src/MNH/prep_real_case.f90 b/src/MNH/prep_real_case.f90
index 564611d77..450c4928b 100644
--- a/src/MNH/prep_real_case.f90
+++ b/src/MNH/prep_real_case.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1995-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2020 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.
@@ -419,7 +419,7 @@ USE MODD_SALT, ONLY: LSALT, NMODE_SLT, CRGUNITS, XINISIG_SLT, XINIR
USE MODD_TURB_n
!
USE MODE_EXTRAPOL
-USE MODE_FIELD
+use mode_field, only: Alloc_field_scalars, Ini_field_list, Ini_field_scalars
USE MODE_GRIDCART
USE MODE_GRIDPROJ
USE MODE_IO, only: IO_Init
diff --git a/src/MNH/prep_surfex.f90 b/src/MNH/prep_surfex.f90
index c21d5caa8..33b73f410 100644
--- a/src/MNH/prep_surfex.f90
+++ b/src/MNH/prep_surfex.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2004-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2004-2020 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.
@@ -42,7 +42,7 @@ USE MODD_MNH_SURFEX_n
USE MODD_PARAMETERS, ONLY : JPMODELMAX,JPHEXT,JPVEXT, NUNDEF, XUNDEF
USE MODD_TIME_n, ONLY : TDTCUR
!
-USE MODE_FIELD
+use mode_field, only: Ini_field_list, Ini_field_scalars
USE MODE_IO, only: IO_Init
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_IO_FIELD_WRITE, only: IO_Field_write, IO_Header_write
diff --git a/src/MNH/radiations.f90 b/src/MNH/radiations.f90
index 8d47d4851..b8a1c3424 100644
--- a/src/MNH/radiations.f90
+++ b/src/MNH/radiations.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1995-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2020 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.
@@ -133,6 +133,7 @@ USE MODD_CH_AEROSOL, ONLY: LORILAM
USE MODD_CONF, ONLY: LCARTESIAN
USE MODD_CST
USE MODD_DUST, ONLY: LDUST
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_GRID , ONLY: XLAT0, XLON0
USE MODD_GRID_n , ONLY: XLAT, XLON
USE MODD_IO, ONLY: TFILEDATA
@@ -153,7 +154,6 @@ USE MODD_SALT, ONLY: LSALT
USE MODD_TIME
!
USE MODE_DUSTOPT
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_ll
use mode_msg
diff --git a/src/MNH/rain_c2r2_khko.f90 b/src/MNH/rain_c2r2_khko.f90
index cc4ef656d..edf07222d 100644
--- a/src/MNH/rain_c2r2_khko.f90
+++ b/src/MNH/rain_c2r2_khko.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1996-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2020 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.
@@ -225,6 +225,7 @@ USE MODD_CH_AEROSOL
USE MODD_CONF
USE MODD_CST
USE MODD_DUST
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_NSV, ONLY : NSV_C2R2BEG
USE MODD_PARAM_C2R2
@@ -233,7 +234,6 @@ USE MODD_RAIN_C2R2_DESCR
USE MODD_RAIN_C2R2_KHKO_PARAM
USE MODD_SALT
-USE MODE_FIELD
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_ll
use mode_tools, only: Countjv
diff --git a/src/MNH/read_dummy_gr_fieldn.f90 b/src/MNH/read_dummy_gr_fieldn.f90
index cd3e1b157..80f9ceefd 100644
--- a/src/MNH/read_dummy_gr_fieldn.f90
+++ b/src/MNH/read_dummy_gr_fieldn.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1995-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2020 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.
@@ -74,7 +74,7 @@ END MODULE MODI_READ_DUMMY_GR_FIELD_n
!* 0. DECLARATIONS
!
USE MODD_DUMMY_GR_FIELD_n
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEINT, TYPEREAL
+use modd_field, only: tfielddata, TYPEINT, TYPEREAL
USE MODD_GRID_n
USE MODD_IO, ONLY: TFILEDATA
USE MODD_PARAMETERS, ONLY: JPHEXT, NMNHNAMELGTMAX
diff --git a/src/MNH/read_field.f90 b/src/MNH/read_field.f90
index a6523b5d5..1b1bbf7e5 100644
--- a/src/MNH/read_field.f90
+++ b/src/MNH/read_field.f90
@@ -1,7 +1,8 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
+!-----------------------------------------------------------------
! ######################
MODULE MODI_READ_FIELD
! ######################
@@ -246,6 +247,9 @@ END MODULE MODI_READ_FIELD
! ------------
!
USE MODD_2D_FRC
+USE MODD_ADV_n
+USE MODD_BLOWSNOW
+USE MODD_BLOWSNOW_n
USE MODD_CH_AEROSOL
USE MODD_CH_M9_n, ONLY: CNAMES, CICNAMES
USE MODD_CONF
@@ -254,13 +258,11 @@ USE MODD_CST
USE MODD_CTURB
USE MODD_DUST
USE MODD_ELEC_DESCR, ONLY: CELECNAMES
+use modd_field, only: tfielddata, tfieldlist, TYPEDATE, TYPEREAL
USE MODD_FIELD_n, only: XZWS_DEFAULT
#ifdef MNH_FOREFIRE
USE MODD_FOREFIRE
#endif
-USE MODD_BLOWSNOW
-USE MODD_BLOWSNOW_n
-
USE MODD_ICE_C1R3_DESCR, ONLY: C1R3NAMES
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LATZ_EDFLX
@@ -274,13 +276,12 @@ USE MODD_PARAM_LIMA , ONLY: NMOD_CCN, LSCAV, LAERO_MASS, &
USE MODD_PARAM_LIMA_COLD, ONLY: CLIMA_COLD_NAMES
USE MODD_PARAM_LIMA_WARM, ONLY: CLIMA_WARM_NAMES, CAERO_MASS
USE MODD_PARAM_n, ONLY: CSCONV
-USE MODD_ADV_n
USE MODD_PASPOL
USE MODD_RAIN_C2R2_DESCR, ONLY: C2R2NAMES
USE MODD_SALT
USE MODD_TIME ! for type DATE_TIME
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TFIELDLIST, FIND_FIELD_ID_FROM_MNHNAME, TYPEDATE, TYPEREAL
+use mode_field, only: Find_field_id_from_mnhname
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_MSG
USE MODE_TOOLS, ONLY: UPCASE
diff --git a/src/MNH/read_hgrid.f90 b/src/MNH/read_hgrid.f90
index ec9c7cd44..c695be83b 100644
--- a/src/MNH/read_hgrid.f90
+++ b/src/MNH/read_hgrid.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1996-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2020 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.
@@ -81,13 +81,14 @@ END MODULE MODI_READ_HGRID
!* 0. DECLARATIONS
!
USE MODD_CONF, ONLY: CPROGRAM
+use modd_field, only: tfielddata, tfieldlist
USE MODD_GRID
USE MODD_IO, ONLY: TFILEDATA
USE MODD_PARAMETERS
USE MODD_PGDDIM
USE MODD_PGDGRID
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TFIELDLIST, FIND_FIELD_ID_FROM_MNHNAME
+use mode_field, only: Find_field_id_from_mnhname
USE MODE_IO, ONLY: IO_Pack_set
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_GRIDPROJ
diff --git a/src/MNH/read_hgridn.f90 b/src/MNH/read_hgridn.f90
index 04cf40b18..41385f588 100644
--- a/src/MNH/read_hgridn.f90
+++ b/src/MNH/read_hgridn.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1996-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2020 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.
@@ -80,13 +80,14 @@ END MODULE MODI_READ_HGRID_n
!
USE MODD_CONF
USE MODD_DIM_n
+use modd_field, only: tfielddata, tfieldlist
USE MODD_GRID
USE MODD_GRID_n
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LUNIT_n
USE MODD_PARAMETERS, ONLY: JPHEXT, JPVEXT, JPMODELMAX
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TFIELDLIST, FIND_FIELD_ID_FROM_MNHNAME
+use mode_field, only: Find_field_id_from_mnhname
USE MODE_GRIDPROJ
USE MODE_IO, only: IO_Pack_set
USE MODE_IO_FIELD_READ, only: IO_Field_read
diff --git a/src/MNH/read_prc_fmfile.f90 b/src/MNH/read_prc_fmfile.f90
index e65d36357..915c2d970 100644
--- a/src/MNH/read_prc_fmfile.f90
+++ b/src/MNH/read_prc_fmfile.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1996-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2020 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.
@@ -101,6 +101,7 @@ END MODULE MODI_READ_PRC_FMFILE
USE MODD_CST
USE MODD_CONF
USE MODD_CONF_n
+use modd_field, only: tfieldlist
USE MODD_PARAM_n
USE MODD_LUNIT
USE MODD_REF
@@ -114,7 +115,7 @@ USE MODD_GRID_n
USE MODD_TIME_n
USE MODD_PREP_REAL
!
-USE MODE_FIELD
+use mode_field, only: Find_field_id_from_mnhname
!
USE MODI_TRUNC_FIELD
USE MODI_DEALLOCATE_MODEL1
diff --git a/src/MNH/read_precip_field.f90 b/src/MNH/read_precip_field.f90
index c8251ed16..b8181b6d3 100644
--- a/src/MNH/read_precip_field.f90
+++ b/src/MNH/read_precip_field.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1996-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2020 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.
@@ -97,12 +97,14 @@ END MODULE MODI_READ_PRECIP_FIELD
!-----------------------------------------------------------------------------
!
!* 0. DECLARATIONS
+
+use modd_field, only: tfielddata, tfieldlist
USE MODD_IO, ONLY: TFILEDATA
USE MODD_PARAM_ICE, ONLY: LDEPOSC
USE MODD_PARAM_C2R2, ONLY: LDEPOC
USE MODD_PARAM_LIMA, ONLY: MDEPOC=>LDEPOC
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TFIELDLIST, FIND_FIELD_ID_FROM_MNHNAME
+use mode_field, only: Find_field_id_from_mnhname
USE MODE_IO_FIELD_READ, only: IO_Field_read
!
IMPLICIT NONE
diff --git a/src/MNH/read_surf_mnh.f90 b/src/MNH/read_surf_mnh.f90
index e274f4d85..8e2f8faba 100644
--- a/src/MNH/read_surf_mnh.f90
+++ b/src/MNH/read_surf_mnh.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2003-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2003-2020 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.
@@ -18,7 +18,8 @@ CONTAINS
SUBROUTINE PREPARE_METADATA_READ_SURF(HREC,HDIR,KGRID,KTYPE,KDIMS,HSUBR,TPFIELD)
!
-USE MODE_FIELD, ONLY: FIND_FIELD_ID_FROM_MNHNAME, TFIELDDATA, TFIELDLIST, TYPECHAR, TYPEDATE, TYPELOG
+use modd_field, only: tfielddata, tfieldlist, TYPECHAR, TYPEDATE, TYPELOG
+use mode_field, only: Find_field_id_from_mnhname
!
CHARACTER(LEN=LEN_HREC),INTENT(IN) :: HREC ! name of the article to write
CHARACTER(LEN=2), INTENT(IN) :: HDIR ! Expected type of the data field (XX,XY,--...)
@@ -140,13 +141,14 @@ END MODULE MODE_READ_SURF_MNH_TOOLS
! ------------
!
USE MODD_CONF, ONLY: CPROGRAM
+use modd_field, only: tfielddata, tfieldlist, TYPEREAL
USE MODD_GRID, ONLY: XRPK,XBETA,XLAT0,XLON0
USE MODD_IO_SURF_MNH, ONLY: TOUT, TPINFILE
USE MODD_PARAMETERS, ONLY: JPHEXT, XUNDEF
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TFIELDLIST,FIND_FIELD_ID_FROM_MNHNAME,TYPEREAL
-USE MODE_IO_FIELD_READ, only: IO_Field_read
+use mode_field, only: Find_field_id_from_mnhname
USE MODE_GRIDPROJ
+USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_MSG
USE MODE_READ_SURF_MNH_TOOLS
!
@@ -288,24 +290,23 @@ END SUBROUTINE READ_SURFX0_MNH
!* 0. DECLARATIONS
! ------------
!
-USE MODE_FIELD, ONLY: FIND_FIELD_ID_FROM_MNHNAME,TFIELDDATA,TFIELDLIST,TYPEREAL
-USE MODE_IO_FIELD_READ, only: IO_Field_read
-USE MODE_ll
-USE MODE_MSG
-USE MODE_READ_SURF_MNH_TOOLS
-!
USE MODD_CST, ONLY: XPI
-!
+use modd_field, only: tfielddata, tfieldlist, TYPEREAL
USE MODD_IO_SURF_MNH, ONLY: TOUT, TPINFILE, NMASK, &
NIU, NJU, NIB, NJB, NIE, NJE, &
NIU_ALL, NJU_ALL, NIB_ALL, &
NJB_ALL, NIE_ALL, NJE_ALL, &
NMASK_ALL
USE MODD_PARAMETERS, ONLY: XUNDEF
-!
-USE MODI_PACK_2D_1D
+
+use mode_field, only: Find_field_id_from_mnhname
+USE MODE_IO_FIELD_READ, only: IO_Field_read
+USE MODE_ll
+USE MODE_MSG
+USE MODE_READ_SURF_MNH_TOOLS
!
USE MODI_GET_SURF_UNDEF
+USE MODI_PACK_2D_1D
!
IMPLICIT NONE
!
@@ -580,19 +581,18 @@ END SUBROUTINE READ_SURFX1_MNH
!* 0. DECLARATIONS
! ------------
!
-USE MODE_ll
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPEREAL
-USE MODE_IO_FIELD_READ, only: IO_Field_read
-USE MODE_MSG
-USE MODE_READ_SURF_MNH_TOOLS
-!
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO_SURF_MNH, ONLY: TOUT, TPINFILE, NMASK, NIU, NJU, NIB, NJB, NIE, NJE, &
NIU_ALL, NJU_ALL, NIB_ALL, NJB_ALL, NIE_ALL, NJE_ALL, NMASK_ALL
USE MODD_PARAMETERS, ONLY: XUNDEF
-!
-USE MODI_PACK_2D_1D
+
+USE MODE_IO_FIELD_READ, only: IO_Field_read
+USE MODE_ll
+USE MODE_MSG
+USE MODE_READ_SURF_MNH_TOOLS
!
USE MODI_GET_SURF_UNDEF
+USE MODI_PACK_2D_1D
!
IMPLICIT NONE
!
@@ -715,21 +715,20 @@ END SUBROUTINE READ_SURFX2_MNH
!* 0. DECLARATIONS
! ------------
!
-USE MODE_ll
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPELOG,TYPEREAL
-USE MODE_IO_FIELD_READ, only: IO_Field_read
-USE MODE_MSG
-USE MODE_READ_SURF_MNH_TOOLS
-!
-USE MODD_DATA_COVER_PAR, ONLY: JPCOVER
USE MODD_CST, ONLY: XPI
-!
+USE MODD_DATA_COVER_PAR, ONLY: JPCOVER
+use modd_field, only: tfielddata, TYPELOG, TYPEREAL
USE MODD_IO_SURF_MNH, ONLY: TOUT, TPINFILE, NMASK, &
NIU, NJU, NIB, NJB, NIE, NJE, &
NIU_ALL, NJU_ALL, NIB_ALL, &
NJB_ALL, NIE_ALL, NJE_ALL, &
NMASK_ALL
!
+USE MODE_IO_FIELD_READ, only: IO_Field_read
+USE MODE_ll
+USE MODE_MSG
+USE MODE_READ_SURF_MNH_TOOLS
+!
USE MODI_PACK_2D_1D
!
IMPLICIT NONE
@@ -911,19 +910,18 @@ END SUBROUTINE READ_SURFX2COV_MNH
!* 0. DECLARATIONS
! ------------
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPELOG,TYPEREAL
-USE MODE_IO_FIELD_READ, only: IO_Field_read
-USE MODE_ll
-USE MODE_MSG
-!
USE MODD_CST, ONLY: XPI
-!
+use modd_field, only: tfielddata, TYPELOG, TYPEREAL
USE MODD_IO_SURF_MNH, ONLY: TOUT, TPINFILE, NMASK, &
NIU, NJU, NIB, NJB, NIE, NJE, &
NIU_ALL, NJU_ALL, NIB_ALL, &
NJB_ALL, NIE_ALL, NJE_ALL, &
NMASK_ALL
!
+USE MODE_IO_FIELD_READ, only: IO_Field_read
+USE MODE_ll
+USE MODE_MSG
+!
USE MODI_PACK_2D_1D
!
IMPLICIT NONE
@@ -1095,18 +1093,16 @@ END SUBROUTINE READ_SURFX2COV_1COV_MNH
!* 0. DECLARATIONS
! ------------
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPEINT
+USE MODD_CONF, ONLY: CPROGRAM
+use modd_field, only: tfielddata, TYPEINT
+USE MODD_IO_SURF_MNH, ONLY: TOUT, TPINFILE, NMASK, &
+ NIU, NJU, NIB, NJB, NIE, NJE
+
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_ll
USE MODE_MSG
USE MODE_READ_SURF_MNH_TOOLS
-!
-USE MODD_IO_SURF_MNH, ONLY: TOUT, TPINFILE, NMASK, &
- NIU, NJU, NIB, NJB, NIE, NJE
-USE MODD_CONF, ONLY: CPROGRAM
-!
-!
-!
+
IMPLICIT NONE
!
!* 0.1 Declarations of arguments
@@ -1193,14 +1189,14 @@ END SUBROUTINE READ_SURFN0_MNH
!* 0. DECLARATIONS
! ------------
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPEINT
+use modd_field, only: tfielddata, TYPEINT
+USE MODD_IO_SURF_MNH, ONLY: TOUT, TPINFILE, NMASK, &
+ NIU, NJU, NIB, NJB, NIE, NJE
+!
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_MSG
USE MODE_READ_SURF_MNH_TOOLS
!
-USE MODD_IO_SURF_MNH, ONLY: TOUT, TPINFILE, NMASK, &
- NIU, NJU, NIB, NJB, NIE, NJE
-!
USE MODI_PACK_2D_1D
!
IMPLICIT NONE
@@ -1301,18 +1297,17 @@ END SUBROUTINE READ_SURFN1_MNH
!* 0. DECLARATIONS
! ------------
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPECHAR
+USE MODD_CONF, ONLY: LCARTESIAN, CPROGRAM
+use modd_field, only: tfielddata, TYPECHAR
+USE MODD_IO_SURF_MNH, ONLY: TOUT, TPINFILE
+USE MODD_LUNIT, ONLY: TPGDFILE
+
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_ll
USE MODE_MSG
USE MODE_POS
USE MODE_READ_SURF_MNH_TOOLS
-!
-USE MODD_IO_SURF_MNH, ONLY: TOUT, TPINFILE
-USE MODD_CONF, ONLY: LCARTESIAN, CPROGRAM
-USE MODD_LUNIT, ONLY: TPGDFILE
-!
-!
+
IMPLICIT NONE
!
!* 0.1 Declarations of arguments
@@ -1458,18 +1453,16 @@ END SUBROUTINE READ_SURFC0_MNH
!* 0. DECLARATIONS
! ------------
!
+use modd_field, only: tfielddata, TYPEINT, TYPELOG
USE MODD_IO_SURF_MNH, ONLY: TOUT, TPINFILE, NMASK, &
NIU, NJU, NIB, NJB, NIE, NJE
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPEINT,TYPELOG
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_MSG
USE MODE_READ_SURF_MNH_TOOLS
!
USE MODI_PACK_2D_1D
!
-!
-!
IMPLICIT NONE
!
!* 0.1 Declarations of arguments
@@ -1576,14 +1569,13 @@ END SUBROUTINE READ_SURFL1_MNH
!* 0. DECLARATIONS
! ------------
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPELOG
+use modd_field, only: tfielddata, TYPELOG
+USE MODD_IO_SURF_MNH, ONLY: TOUT, TPINFILE
+
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_MSG
USE MODE_READ_SURF_MNH_TOOLS
-!
-USE MODD_IO_SURF_MNH, ONLY: TOUT, TPINFILE
-!
-!
+
IMPLICIT NONE
!
!* 0.1 Declarations of arguments
@@ -1673,14 +1665,13 @@ END SUBROUTINE READ_SURFL0_MNH
!* 0. DECLARATIONS
! ------------
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPECHAR
+use modd_field, only: tfielddata, TYPECHAR
+USE MODD_IO_SURF_MNH, ONLY: TOUT, TPINFILE
+USE MODD_TYPE_DATE
+
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_MSG
-!
-USE MODD_TYPE_DATE
-USE MODD_IO_SURF_MNH, ONLY: TOUT, TPINFILE
-!
-!
+
IMPLICIT NONE
!
!* 0.1 Declarations of arguments
@@ -1797,13 +1788,12 @@ END SUBROUTINE READ_SURFT0_MNH
!* 0. DECLARATIONS
! ------------
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPECHAR, TYPEINT, TYPEREAL
+use modd_field, only: tfielddata, TYPECHAR, TYPEINT, TYPEREAL
+USE MODD_IO_SURF_MNH, ONLY: TOUT, TPINFILE
+
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_MSG
-!
-USE MODD_IO_SURF_MNH, ONLY: TOUT, TPINFILE
-!
-!
+
IMPLICIT NONE
!
!* 0.1 Declarations of arguments
diff --git a/src/MNH/set_grid.f90 b/src/MNH/set_grid.f90
index 9d8c95571..051b9c76f 100644
--- a/src/MNH/set_grid.f90
+++ b/src/MNH/set_grid.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -215,6 +215,7 @@ USE MODD_BUDGET
USE MODD_CONF
USE MODD_CONF_n
USE MODD_DYN
+use modd_field, only: tfielddata, tfieldlist
USE MODD_GRID
USE MODD_IO, ONLY: TFILEDATA,TOUTBAK
USE MODD_LUNIT_n, ONLY: TLUOUT
@@ -222,7 +223,7 @@ USE MODD_OUT_n, ONLY: OUT_MODEL
USE MODD_PARAMETERS
USE MODD_NESTING
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TFIELDLIST, FIND_FIELD_ID_FROM_MNHNAME
+use mode_field, only: Find_field_id_from_mnhname
USE MODE_GATHER_ll
USE MODE_GRIDCART
USE MODE_GRIDPROJ
diff --git a/src/MNH/shallow_mf_pack.f90 b/src/MNH/shallow_mf_pack.f90
index b8f8aca93..e5a23264c 100644
--- a/src/MNH/shallow_mf_pack.f90
+++ b/src/MNH/shallow_mf_pack.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2010-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2010-2020 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.
@@ -128,13 +128,13 @@ USE MODD_BUDGET
USE MODD_CONF
USE MODD_CST
USE MODD_IO, ONLY: TFILEDATA
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_NSV
USE MODD_PARAMETERS
USE MODD_PARAM_ICE, ONLY: CFRAC_ICE_SHALLOW_MF
USE MODD_PARAM_MFSHALL_n
use modd_precision, only: MNHTIME
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODI_BUDGET
diff --git a/src/MNH/spawn_field2.f90 b/src/MNH/spawn_field2.f90
index 62d152167..e167cbfc6 100644
--- a/src/MNH/spawn_field2.f90
+++ b/src/MNH/spawn_field2.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1995-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2020 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.
@@ -170,6 +170,7 @@ USE MODD_CST
USE MODD_CONF_n, ONLY: CONF_MODEL
USE MODD_DUST, ONLY: CDUSTNAMES
USE MODD_ELEC_DESCR, ONLY: CELECNAMES
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_FIELD_n, ONLY: FIELD_MODEL, XZWS_DEFAULT
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LATZ_EDFLX
@@ -189,7 +190,6 @@ USE MODD_SALT, ONLY: CSALTNAMES
USE MODD_SPAWN
!
use mode_bikhardt
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPEREAL
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_ll
USE MODE_MSG
diff --git a/src/MNH/tke_eps_sources.f90 b/src/MNH/tke_eps_sources.f90
index bb417e018..f903b4e87 100644
--- a/src/MNH/tke_eps_sources.f90
+++ b/src/MNH/tke_eps_sources.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -176,6 +176,7 @@ END MODULE MODI_TKE_EPS_SOURCES
USE MODD_CST
USE MODD_CONF
USE MODD_CTURB
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_PARAMETERS
USE MODD_BUDGET
@@ -183,7 +184,6 @@ USE MODD_LES
USE MODD_DIAG_IN_RUN, ONLY : LDIAG_IN_RUN, XCURRENT_TKE_DISS
!
USE MODE_ll
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
!
USE MODI_GRADIENT_M
diff --git a/src/MNH/turb.f90 b/src/MNH/turb.f90
index 96dbe560b..4e637204f 100644
--- a/src/MNH/turb.f90
+++ b/src/MNH/turb.f90
@@ -346,14 +346,15 @@ END MODULE MODI_TURB
!* 0. DECLARATIONS
! ------------
!
-USE MODD_PARAMETERS, ONLY: JPVEXT_TURB
+USE MODD_BUDGET
+USE MODD_CONF
USE MODD_CST
USE MODD_CTURB
-USE MODD_CONF
-USE MODD_BUDGET
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LES
USE MODD_NSV
+USE MODD_PARAMETERS, ONLY: JPVEXT_TURB
!
USE MODI_GRADIENT_M
USE MODI_GRADIENT_U
@@ -373,7 +374,6 @@ USE MODI_TM06
USE MODI_UPDATE_LM
USE MODI_GET_HALO
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_SBL
!
diff --git a/src/MNH/turb_cloud_index.f90 b/src/MNH/turb_cloud_index.f90
index abe8e0f24..6e011097c 100644
--- a/src/MNH/turb_cloud_index.f90
+++ b/src/MNH/turb_cloud_index.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -85,10 +85,10 @@ END MODULE MODI_TURB_CLOUD_INDEX
!
!-------------------------------------------------------------------------------
!
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_PARAMETERS, ONLY: JPVEXT
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
use mode_tools_ll, only: GET_INDICE_ll
!
diff --git a/src/MNH/turb_hor_dyn_corr.f90 b/src/MNH/turb_hor_dyn_corr.f90
index fc74e743e..1b5e6836c 100644
--- a/src/MNH/turb_hor_dyn_corr.f90
+++ b/src/MNH/turb_hor_dyn_corr.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -146,13 +146,13 @@ USE MODD_ARGSLIST_ll, ONLY: LIST_ll
USE MODD_CST
USE MODD_CONF
USE MODD_CTURB
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_PARAMETERS
USE MODD_LES
USE MODD_NSV
!
USE MODE_ll
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
!
USE MODI_GRADIENT_M
diff --git a/src/MNH/turb_hor_sv_flux.f90 b/src/MNH/turb_hor_sv_flux.f90
index 2ff88559c..c50ea5761 100644
--- a/src/MNH/turb_hor_sv_flux.f90
+++ b/src/MNH/turb_hor_sv_flux.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -115,13 +115,13 @@ END MODULE MODI_TURB_HOR_SV_FLUX
USE MODD_CST
USE MODD_CONF
USE MODD_CTURB
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_PARAMETERS
USE MODD_NSV, ONLY: NSV_LGBEG, NSV_LGEND
USE MODD_LES
USE MODD_BLOWSNOW
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
!
USE MODI_GRADIENT_M
diff --git a/src/MNH/turb_hor_thermo_corr.f90 b/src/MNH/turb_hor_thermo_corr.f90
index e6f89e6d9..ef91a4e90 100644
--- a/src/MNH/turb_hor_thermo_corr.f90
+++ b/src/MNH/turb_hor_thermo_corr.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -123,11 +123,11 @@ END MODULE MODI_TURB_HOR_THERMO_CORR
USE MODD_CST
USE MODD_CONF
USE MODD_CTURB
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_PARAMETERS
USE MODD_LES
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
!
USE MODI_GRADIENT_M
diff --git a/src/MNH/turb_hor_thermo_flux.f90 b/src/MNH/turb_hor_thermo_flux.f90
index 188e932c6..2efa2fb98 100644
--- a/src/MNH/turb_hor_thermo_flux.f90
+++ b/src/MNH/turb_hor_thermo_flux.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -132,11 +132,11 @@ END MODULE MODI_TURB_HOR_THERMO_FLUX
USE MODD_CST
USE MODD_CONF
USE MODD_CTURB
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_PARAMETERS
USE MODD_LES
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
!
USE MODI_GRADIENT_M
diff --git a/src/MNH/turb_hor_uv.f90 b/src/MNH/turb_hor_uv.f90
index 70210144d..9d7e398ee 100644
--- a/src/MNH/turb_hor_uv.f90
+++ b/src/MNH/turb_hor_uv.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -128,11 +128,11 @@ END MODULE MODI_TURB_HOR_UV
USE MODD_CST
USE MODD_CONF
USE MODD_CTURB
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_PARAMETERS
USE MODD_LES
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
!
USE MODI_GRADIENT_M
diff --git a/src/MNH/turb_hor_uw.f90 b/src/MNH/turb_hor_uw.f90
index 8860fdfd5..07f6c7cdb 100644
--- a/src/MNH/turb_hor_uw.f90
+++ b/src/MNH/turb_hor_uw.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -119,12 +119,12 @@ END MODULE MODI_TURB_HOR_UW
USE MODD_CST
USE MODD_CONF
USE MODD_CTURB
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_PARAMETERS
USE MODD_LES
USE MODD_NSV
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
!
USE MODI_GRADIENT_M
diff --git a/src/MNH/turb_hor_vw.f90 b/src/MNH/turb_hor_vw.f90
index a730e736f..87031f8b2 100644
--- a/src/MNH/turb_hor_vw.f90
+++ b/src/MNH/turb_hor_vw.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -115,12 +115,12 @@ END MODULE MODI_TURB_HOR_VW
USE MODD_CST
USE MODD_CONF
USE MODD_CTURB
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_PARAMETERS
USE MODD_LES
USE MODD_NSV
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
!
USE MODI_GRADIENT_M
diff --git a/src/MNH/turb_ver.f90 b/src/MNH/turb_ver.f90
index fcde4fe3c..de1cf6c4c 100644
--- a/src/MNH/turb_ver.f90
+++ b/src/MNH/turb_ver.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -326,6 +326,7 @@ END MODULE MODI_TURB_VER
!
USE MODD_CST
USE MODD_CTURB
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_PARAMETERS
USE MODD_LES
@@ -346,7 +347,6 @@ USE MODI_TURB_VER_SV_CORR
USE MODI_LES_MEAN_SUBGRID
USE MODI_SBL_DEPTH
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_PRANDTL
!
diff --git a/src/MNH/turb_ver_dyn_flux.f90 b/src/MNH/turb_ver_dyn_flux.f90
index 267bd058d..6371555af 100644
--- a/src/MNH/turb_ver_dyn_flux.f90
+++ b/src/MNH/turb_ver_dyn_flux.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -290,6 +290,7 @@ END MODULE MODI_TURB_VER_DYN_FLUX
USE MODD_CONF
USE MODD_CST
USE MODD_CTURB
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LES
USE MODD_NSV
@@ -306,7 +307,6 @@ USE MODI_TRIDIAG
USE MODI_TRIDIAG_WIND
USE MODI_LES_MEAN_SUBGRID
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_ll
!
diff --git a/src/MNH/turb_ver_sv_flux.f90 b/src/MNH/turb_ver_sv_flux.f90
index 7b412bcba..356cf6700 100644
--- a/src/MNH/turb_ver_sv_flux.f90
+++ b/src/MNH/turb_ver_sv_flux.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -272,13 +272,13 @@ END MODULE MODI_TURB_VER_SV_FLUX
!
USE MODD_CST
USE MODD_CTURB
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_PARAMETERS
USE MODD_LES
USE MODD_CONF
USE MODD_NSV, ONLY: XSVMIN, NSV_LGBEG, NSV_LGEND
USE MODD_BLOWSNOW
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
!
USE MODI_GRADIENT_U
diff --git a/src/MNH/turb_ver_thermo_corr.f90 b/src/MNH/turb_ver_thermo_corr.f90
index 3f443b6ff..7bcc6799f 100644
--- a/src/MNH/turb_ver_thermo_corr.f90
+++ b/src/MNH/turb_ver_thermo_corr.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -314,6 +314,7 @@ END MODULE MODI_TURB_VER_THERMO_CORR
!
USE MODD_CST
USE MODD_CTURB
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_PARAMETERS
USE MODD_CONF
@@ -329,7 +330,6 @@ USE MODI_LES_MEAN_SUBGRID
USE MODI_PRANDTL
USE MODI_TRIDIAG_THERMO
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_PRANDTL
!
diff --git a/src/MNH/turb_ver_thermo_flux.f90 b/src/MNH/turb_ver_thermo_flux.f90
index e833fef4b..2e01a94af 100644
--- a/src/MNH/turb_ver_thermo_flux.f90
+++ b/src/MNH/turb_ver_thermo_flux.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -332,6 +332,7 @@ END MODULE MODI_TURB_VER_THERMO_FLUX
!
USE MODD_CST
USE MODD_CTURB
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_PARAMETERS
USE MODD_CONF
@@ -348,7 +349,6 @@ USE MODI_PRANDTL
USE MODI_TRIDIAG_THERMO
USE MODI_TM06_H
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_PRANDTL
!
diff --git a/src/MNH/uv_to_zonal_and_merid.f90 b/src/MNH/uv_to_zonal_and_merid.f90
index 1403691bc..6ce72b8c2 100644
--- a/src/MNH/uv_to_zonal_and_merid.f90
+++ b/src/MNH/uv_to_zonal_and_merid.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2000-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2000-2020 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.
@@ -9,8 +9,8 @@
INTERFACE UV_TO_ZONAL_AND_MERID
SUBROUTINE UV_TO_ZONAL_AND_MERID3D(PU,PV,KGRID,PZC,PMC,TPFILE,TZFIELDS)
!
-USE MODD_IO, ONLY: TFILEDATA
-USE MODE_FIELD, ONLY: TFIELDDATA
+use modd_field, only: tfielddata
+use modd_io, only: tfiledata
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PU ! Input U component
REAL, DIMENSION(:,:,:), INTENT(IN) :: PV ! Input V component
@@ -24,8 +24,8 @@ END SUBROUTINE UV_TO_ZONAL_AND_MERID3D
!
SUBROUTINE UV_TO_ZONAL_AND_MERID2D(PU,PV,KGRID,PZC,PMC,TPFILE,TZFIELDS)
!
-USE MODD_IO, ONLY: TFILEDATA
-USE MODE_FIELD, ONLY: TFIELDDATA
+use modd_field, only: tfielddata
+use modd_io, only: tfiledata
!
REAL, DIMENSION(:,:), INTENT(IN) :: PU ! Input U component
REAL, DIMENSION(:,:), INTENT(IN) :: PV ! Input V component
@@ -47,8 +47,8 @@ INTERFACE
!
SUBROUTINE UV_TO_ZONAL_AND_MERID3D(PU,PV,KGRID,PZC,PMC,TPFILE,TZFIELDS)
!
-USE MODD_IO, ONLY: TFILEDATA
-USE MODE_FIELD, ONLY: TFIELDDATA
+use modd_field, only: tfielddata
+use modd_io, only: tfiledata
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PU ! Input U component
REAL, DIMENSION(:,:,:), INTENT(IN) :: PV ! Input V component
@@ -103,13 +103,13 @@ END MODULE MODI_UV_TO_ZONAL_AND_MERID3D
USE MODD_CONF
USE MODD_CST
USE MODD_DIM_n
+use modd_field, only: tfielddata
USE MODD_GRID
USE MODD_GRID_n
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LUNIT_n, ONLY: TLUOUT
USE MODD_PARAMETERS
!
-USE MODE_FIELD, ONLY: TFIELDDATA
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_MSG
!
@@ -276,10 +276,10 @@ END SUBROUTINE UV_TO_ZONAL_AND_MERID3D
!* 0. DECLARATIONS
! ------------
!
+use modd_field, only: tfielddata
USE MODD_IO, ONLY: TFILEDATA, NVERB_WARNING
USE MODD_LUNIT_n, ONLY: TLUOUT
!
-USE MODE_FIELD, ONLY: TFIELDDATA
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_MSG
!
diff --git a/src/MNH/ver_thermo.f90 b/src/MNH/ver_thermo.f90
index 8da4d84de..d926e6c26 100644
--- a/src/MNH/ver_thermo.f90
+++ b/src/MNH/ver_thermo.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -159,6 +159,7 @@ USE MODD_CONF
USE MODD_CONF_n
USE MODD_CST
USE MODD_DYN_n
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_FIELD_n, ONLY: XTHT,XRT,XPABST,XDRYMASST
USE MODD_GRID_n
USE MODD_IO, ONLY: TFILEDATA,TFILE_DUMMY
@@ -170,7 +171,6 @@ USE MODD_REF_n
!
USE MODD_DIM_n
USE MODE_EXTRAPOL
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_ll
USE MODE_MPPDB
diff --git a/src/MNH/write_balloonn.f90 b/src/MNH/write_balloonn.f90
index c1d82c1b2..f0c790ddd 100644
--- a/src/MNH/write_balloonn.f90
+++ b/src/MNH/write_balloonn.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2001-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2001-2020 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.
@@ -96,7 +96,7 @@ CONTAINS
!-------------------------------------------------------------------------------
SUBROUTINE WRITE_LFI_BALLOON(TPFLYER)
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
+use modd_field, only: tfielddata, TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
!
TYPE(FLYER), INTENT(IN) :: TPFLYER
diff --git a/src/MNH/write_budget.f90 b/src/MNH/write_budget.f90
index 0d7caf60d..e164ef3c1 100644
--- a/src/MNH/write_budget.f90
+++ b/src/MNH/write_budget.f90
@@ -119,13 +119,13 @@ subroutine Write_budget( tpdiafile, tpdtcur, ptstep, ksv )
xburhodj, xburhodju, xburhodjv, xburhodjw, &
xburu, xburv, xburw, xburth, xburtke, &
xburrv, xburrc, xburrr, xburri, xburrs, xburrg, xburrh, xbursv
+ use modd_field, only: tfielddata, TYPEREAL
use modd_io, only: tfiledata
use modd_lunit_n, only: tluout
use modd_parameters, only: NMNHNAMELGTMAX
use modd_type_date, only: date_time
use mode_datetime, only: datetime_distance
- use mode_field, only: tfielddata, TYPEREAL
use mode_io_field_write, only: IO_Field_write
use mode_menu_diachro, only: Menu_diachro
use mode_time, only: tdtexp
diff --git a/src/MNH/write_diachro.f90 b/src/MNH/write_diachro.f90
index 8934a59ce..d6d8e310b 100644
--- a/src/MNH/write_diachro.f90
+++ b/src/MNH/write_diachro.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1996-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2020 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.
@@ -86,6 +86,7 @@ contains
!
USE MODD_BUDGET
USE MODD_CONF
+use modd_field, only: tfielddata, TYPECHAR, TYPEDATE, TYPEINT, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_PARAMETERS, ONLY: JPHEXT
use modd_time, only: tdtexp, tdtseg
@@ -93,7 +94,6 @@ use modd_time_n, only: tdtmod
use modd_type_date, only: date_time
!
use mode_datetime, only: Datetime_distance
-USE MODE_FIELD
USE MODE_IO_FIELD_WRITE, only: IO_Field_write, IO_Field_write_box
USE MODE_ll
use mode_menu_diachro, only: MENU_DIACHRO
diff --git a/src/MNH/write_dummy_gr_fieldn.f90 b/src/MNH/write_dummy_gr_fieldn.f90
index e177c4e2e..74f56e63c 100644
--- a/src/MNH/write_dummy_gr_fieldn.f90
+++ b/src/MNH/write_dummy_gr_fieldn.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1996-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2020 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.
@@ -63,10 +63,10 @@ END MODULE MODI_WRITE_DUMMY_GR_FIELD_n
!
USE MODD_DUMMY_GR_FIELD_n, ONLY: NDUMMY_GR_NBR, CDUMMY_GR_NAME, &
CDUMMY_GR_AREA, XDUMMY_GR_FIELDS
+use modd_field, only: tfielddata, TYPEINT, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_PARAMETERS, ONLY: NMNHNAMELGTMAX
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPEINT,TYPEREAL
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
!
IMPLICIT NONE
diff --git a/src/MNH/write_lbn.f90 b/src/MNH/write_lbn.f90
index 32f0fd583..2777fa8b6 100644
--- a/src/MNH/write_lbn.f90
+++ b/src/MNH/write_lbn.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1998-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1998-2020 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.
@@ -120,7 +120,7 @@ USE MODI_DUSTLFI_n
USE MODI_SALTLFI_n
USE MODD_PARAMETERS, ONLY: JPHEXT
USE MODD_IO, ONLY: TFILEDATA
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPELOG,TYPEREAL
+use modd_field, only: tfielddata, TYPELOG, TYPEREAL
!
!
IMPLICIT NONE
diff --git a/src/MNH/write_lfifm1_for_diag.f90 b/src/MNH/write_lfifm1_for_diag.f90
index 6655d27e1..49ebac8c7 100644
--- a/src/MNH/write_lfifm1_for_diag.f90
+++ b/src/MNH/write_lfifm1_for_diag.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -152,6 +152,7 @@ END MODULE MODI_WRITE_LFIFM1_FOR_DIAG
USE MODD_DIM_n
USE MODD_CONF
USE MODD_CONF_n
+use modd_field, only: tfielddata, tfieldlist, TYPEINT, TYPEREAL
USE MODD_GRID
USE MODD_GRID_n
USE MODD_IO, ONLY : TFILEDATA
@@ -233,8 +234,8 @@ USE MODI_FREE_ATM_PROFILE
USE MODI_GPS_ZENITH
USE MODI_CONTRAV
!
+use mode_field, only: Find_field_id_from_mnhname
USE MODE_GRIDPROJ
-USE MODE_FIELD
USE MODE_GATHER_ll
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_IO_FILE, only: IO_File_close, IO_File_open
diff --git a/src/MNH/write_lfifm1_for_diag_supp.f90 b/src/MNH/write_lfifm1_for_diag_supp.f90
index 4908ec514..29d7fed2d 100644
--- a/src/MNH/write_lfifm1_for_diag_supp.f90
+++ b/src/MNH/write_lfifm1_for_diag_supp.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2000-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2000-2020 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.
@@ -96,6 +96,7 @@ END MODULE MODI_WRITE_LFIFM1_FOR_DIAG_SUPP
!
USE MODE_ll
USE MODD_CST
+use modd_field, only: tfielddata, tfieldlist, TYPEINT, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_PARAMETERS
USE MODD_CONF_n
@@ -156,7 +157,7 @@ USE MODI_CALL_RTTOV11
USE MODI_RADTR_SATEL
USE MODI_UV_TO_ZONAL_AND_MERID
!
-USE MODE_FIELD
+use mode_field, only: Find_field_id_from_mnhname
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
!
USE MODI_GET_SURF_UNDEF
diff --git a/src/MNH/write_lfin.f90 b/src/MNH/write_lfin.f90
index 75c4c6d8f..22fe2bc39 100644
--- a/src/MNH/write_lfin.f90
+++ b/src/MNH/write_lfin.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -180,6 +180,7 @@ END MODULE MODI_WRITE_LFIFM_n
USE MODD_DIM_n
USE MODD_CONF
USE MODD_CONF_n
+use modd_field, only: tfielddata, tfieldlist, TYPEDATE, TYPEINT, TYPEREAL
USE MODD_GRID
USE MODD_GRID_n
USE MODD_TIME
@@ -244,7 +245,7 @@ USE MODE_IO_FILE, only: IO_File_close
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_ll
USE MODD_IO, ONLY: TFILEDATA
-USE MODE_FIELD
+use mode_field, only: Find_field_id_from_mnhname
USE MODE_GATHER_ll
USE MODE_GRIDPROJ
USE MODE_MSG
diff --git a/src/MNH/write_surf_mnh.f90 b/src/MNH/write_surf_mnh.f90
index 2fb2021b5..ad6ba8fb0 100644
--- a/src/MNH/write_surf_mnh.f90
+++ b/src/MNH/write_surf_mnh.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1997-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1997-2020 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.
@@ -11,7 +11,9 @@ CONTAINS
SUBROUTINE PREPARE_METADATA_WRITE_SURF(HREC,HDIR,HCOMMENT,KGRID,KTYPE,KDIMS,HSUBR,TPFIELD)
!
-USE MODE_FIELD, ONLY: FIND_FIELD_ID_FROM_MNHNAME, TFIELDDATA, TFIELDLIST, TYPECHAR, TYPEDATE, TYPELOG
+use modd_field, only: tfielddata, tfieldlist, TYPECHAR, TYPEDATE, TYPELOG
+
+use mode_field, only: Find_field_id_from_mnhname
USE MODE_MSG
!
CHARACTER(LEN=LEN_HREC),INTENT(IN) :: HREC ! name of the article to write
@@ -171,16 +173,16 @@ END MODULE MODE_WRITE_SURF_MNH_TOOLS
!* 0. DECLARATIONS
! ------------
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPEREAL
-use MODE_IO_FIELD_WRITE, only: IO_Field_write
-USE MODE_MSG
-USE MODE_WRITE_SURF_MNH_TOOLS
-!
USE MODD_CONF, ONLY: CPROGRAM
USE MODD_CONF_n, ONLY: CSTORAGE_TYPE
+use modd_field, only: tfielddata,TYPEREAL
USE MODD_GRID
USE MODD_IO, ONLY: TFILE_SURFEX
-!
+
+use MODE_IO_FIELD_WRITE, only: IO_Field_write
+USE MODE_MSG
+USE MODE_WRITE_SURF_MNH_TOOLS
+
IMPLICIT NONE
!
!* 0.1 Declarations of arguments
@@ -282,13 +284,8 @@ END SUBROUTINE WRITE_SURFX0_MNH
!* 0. DECLARATIONS
! ------------
!
-USE MODE_FIELD, ONLY: FIND_FIELD_ID_FROM_MNHNAME,TFIELDDATA,TFIELDLIST,TYPEREAL
-use MODE_IO_FIELD_WRITE, only: IO_Field_write
-USE MODE_MSG
-USE MODE_TOOLS_ll
-USE MODE_WRITE_SURF_MNH_TOOLS
-!
USE MODD_CONF_n, ONLY: CSTORAGE_TYPE
+use modd_field, only: tfielddata, tfieldlist, TYPEREAL
USE MODD_GRID_n, ONLY: XXHAT, XYHAT
USE MODD_IO, ONLY: TFILE_SURFEX
USE MODD_IO_SURF_MNH, ONLY :NMASK, CMASK, &
@@ -296,10 +293,16 @@ USE MODD_IO_SURF_MNH, ONLY :NMASK, CMASK, &
NIU_ALL, NJU_ALL, NIB_ALL, NJB_ALL, &
NIE_ALL, NJE_ALL, NMASK_ALL, NHALO
USE MODD_PARAMETERS, ONLY: XUNDEF, JPHEXT
-!
+
+use mode_field, only: Find_field_id_from_mnhname
+use MODE_IO_FIELD_WRITE, only: IO_Field_write
+USE MODE_MSG
+USE MODE_TOOLS_ll
+USE MODE_WRITE_SURF_MNH_TOOLS
+
USE MODI_GET_SURF_UNDEF
USE MODI_UNPACK_1D_2D
-!
+
IMPLICIT NONE
!
!* 0.1 Declarations of arguments
@@ -545,13 +548,8 @@ END SUBROUTINE WRITE_SURFX1_MNH
!* 0. DECLARATIONS
! ------------
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPELOG,TYPEREAL
-use MODE_IO_FIELD_WRITE, only: IO_Field_write
-USE MODE_MSG
-USE MODE_TOOLS_ll
-USE MODE_WRITE_SURF_MNH_TOOLS
-!
USE MODD_CONF_n, ONLY: CSTORAGE_TYPE
+use modd_field, only: tfielddata, TYPELOG, TYPEREAL
USE MODD_DATA_COVER_PAR, ONLY: JPCOVER
USE MODD_IO, ONLY: TFILE_SURFEX
USE MODD_IO_SURF_MNH, ONLY: NMASK, CMASK, &
@@ -559,10 +557,15 @@ USE MODD_IO_SURF_MNH, ONLY: NMASK, CMASK, &
NIU_ALL, NJU_ALL, NIB_ALL, NJB_ALL, &
NIE_ALL, NJE_ALL, NMASK_ALL, NHALO
USE MODD_PARAMETERS, ONLY: XUNDEF, JPHEXT
-!
+
+use MODE_IO_FIELD_WRITE, only: IO_Field_write
+USE MODE_MSG
+USE MODE_TOOLS_ll
+USE MODE_WRITE_SURF_MNH_TOOLS
+
USE MODI_GET_SURF_UNDEF
USE MODI_UNPACK_1D_2D
-!
+
IMPLICIT NONE
!
!* 0.1 Declarations of arguments
@@ -746,24 +749,24 @@ END SUBROUTINE WRITE_SURFX2COV_MNH
!* 0. DECLARATIONS
! ------------
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPEREAL
-use MODE_IO_FIELD_WRITE, only: IO_Field_write
-USE MODE_MSG
-USE MODE_TOOLS_ll
-USE MODE_WRITE_SURF_MNH_TOOLS
-!
USE MODD_CONF_n, ONLY: CSTORAGE_TYPE
USE MODD_DATA_COVER_PAR, ONLY: JPCOVER
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY: TFILE_SURFEX
USE MODD_IO_SURF_MNH, ONLY: NMASK, CMASK, &
NIU, NJU, NIB, NJB, NIE, NJE, &
NIU_ALL, NJU_ALL, NIB_ALL, NJB_ALL, &
NIE_ALL, NJE_ALL, NMASK_ALL, NHALO
USE MODD_PARAMETERS, ONLY: XUNDEF
-!
+
+use MODE_IO_FIELD_WRITE, only: IO_Field_write
+USE MODE_MSG
+USE MODE_TOOLS_ll
+USE MODE_WRITE_SURF_MNH_TOOLS
+
USE MODI_GET_SURF_UNDEF
USE MODI_UNPACK_1D_2D
-!
+
IMPLICIT NONE
!
!* 0.1 Declarations of arguments
@@ -897,16 +900,16 @@ END SUBROUTINE WRITE_SURFX2_MNH
!* 0. DECLARATIONS
! ------------
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPEINT
-use MODE_IO_FIELD_WRITE, only: IO_Field_write
-USE MODE_MSG
-USE MODE_WRITE_SURF_MNH_TOOLS
-!
USE MODD_CONF_n, ONLY: CSTORAGE_TYPE
+use modd_field, only: tfielddata, TYPEINT
USE MODD_IO, ONLY: TFILE_SURFEX
USE MODD_IO_SURF_MNH, ONLY: NIU_ALL, NJU_ALL
USE MODD_PARAMETERS, ONLY: JPHEXT
-!
+
+use MODE_IO_FIELD_WRITE, only: IO_Field_write
+USE MODE_MSG
+USE MODE_WRITE_SURF_MNH_TOOLS
+
IMPLICIT NONE
!
!* 0.1 Declarations of arguments
@@ -992,18 +995,18 @@ END SUBROUTINE WRITE_SURFN0_MNH
!* 0. DECLARATIONS
! ------------
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPEINT
-use MODE_IO_FIELD_WRITE, only: IO_Field_write
-USE MODE_MSG
-USE MODE_WRITE_SURF_MNH_TOOLS
-!
+use modd_field, only: tfielddata, TYPEINT
USE MODD_IO, ONLY: TFILE_SURFEX
USE MODD_IO_SURF_MNH, ONLY: NMASK, CMASK, &
NIU, NJU, NIB, NJB, NIE, NJE
USE MODD_PARAMETERS, ONLY: NUNDEF
-!
+
+use MODE_IO_FIELD_WRITE, only: IO_Field_write
+USE MODE_MSG
+USE MODE_WRITE_SURF_MNH_TOOLS
+
USE MODI_UNPACK_1D_2D
-!
+
IMPLICIT NONE
!
!* 0.1 Declarations of arguments
@@ -1095,15 +1098,15 @@ END SUBROUTINE WRITE_SURFN1_MNH
!* 0. DECLARATIONS
! ------------
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPECHAR,TYPELOG
-use MODE_IO_FIELD_WRITE, only: IO_Field_write
-USE MODE_MSG
-USE MODE_WRITE_SURF_MNH_TOOLS
-!
USE MODD_CONF_n, ONLY: CSTORAGE_TYPE
+use modd_field, only: tfielddata, TYPECHAR, TYPELOG
USE MODD_IO, ONLY: TFILE_SURFEX
USE MODD_IO_SURF_MNH, ONLY: NIU_ALL, NJU_ALL
-!
+
+use MODE_IO_FIELD_WRITE, only: IO_Field_write
+USE MODE_MSG
+USE MODE_WRITE_SURF_MNH_TOOLS
+
IMPLICIT NONE
!
!* 0.1 Declarations of arguments
@@ -1191,18 +1194,18 @@ END SUBROUTINE WRITE_SURFC0_MNH
!* 0. DECLARATIONS
! ------------
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPEINT,TYPELOG
-use MODE_IO_FIELD_WRITE, only: IO_Field_write
-USE MODE_MSG
-USE MODE_WRITE_SURF_MNH_TOOLS
-!
USE MODD_CONF_n, ONLY: CSTORAGE_TYPE
+use modd_field, only: tfielddata, TYPEINT, TYPELOG
USE MODD_IO, ONLY: TFILE_SURFEX
USE MODD_IO_SURF_MNH, ONLY: NMASK, CMASK, &
NIU, NJU, NIB, NJB, NIE, NJE
-!
+
+use MODE_IO_FIELD_WRITE, only: IO_Field_write
+USE MODE_MSG
+USE MODE_WRITE_SURF_MNH_TOOLS
+
USE MODI_UNPACK_1D_2D
-!
+
IMPLICIT NONE
!
!* 0.1 Declarations of arguments
@@ -1306,15 +1309,15 @@ END SUBROUTINE WRITE_SURFL1_MNH
!* 0. DECLARATIONS
! ------------
!
-USE MODE_FIELD, ONLY: TFIELDDATA,TYPELOG
-use MODE_IO_FIELD_WRITE, only: IO_Field_write
-USE MODE_MSG
-USE MODE_WRITE_SURF_MNH_TOOLS
-!
USE MODD_CONF_n, ONLY: CSTORAGE_TYPE
+use modd_field, only: tfielddata, TYPELOG
USE MODD_IO, ONLY: TFILE_SURFEX
USE MODD_IO_SURF_MNH, ONLY: CMASK
-!
+
+use MODE_IO_FIELD_WRITE, only: IO_Field_write
+USE MODE_MSG
+USE MODE_WRITE_SURF_MNH_TOOLS
+
IMPLICIT NONE
!
!* 0.1 Declarations of arguments
@@ -1389,17 +1392,16 @@ END SUBROUTINE WRITE_SURFL0_MNH
!* 0. DECLARATIONS
! ------------
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEDATE
+USE MODD_CONF_n, ONLY: CSTORAGE_TYPE
+use modd_field, only: tfielddata, TYPEDATE
+USE MODD_IO, ONLY: TFILE_SURFEX
+USE MODD_TYPE_DATE
+
use MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_IO_FILE
USE MODE_MSG
USE MODE_WRITE_SURF_MNH_TOOLS
-!
-USE MODD_CONF_n, ONLY: CSTORAGE_TYPE
-USE MODD_IO, ONLY: TFILE_SURFEX
-USE MODD_TYPE_DATE
-!
-!
+
IMPLICIT NONE
!
!* 0.1 Declarations of arguments
@@ -1483,15 +1485,14 @@ END SUBROUTINE WRITE_SURFT0_MNH
!* 0. DECLARATIONS
! ------------
!
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEINT, TYPEREAL
+use modd_field, only: tfielddata, TYPEINT, TYPEREAL
+USE MODD_IO, ONLY: TFILE_SURFEX
+USE MODD_CONF_n, ONLY: CSTORAGE_TYPE
+
use MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_IO_FILE
USE MODE_MSG
-!
-USE MODD_IO, ONLY: TFILE_SURFEX
-USE MODD_CONF_n, ONLY: CSTORAGE_TYPE
-!
-!
+
IMPLICIT NONE
!
!* 0.1 Declarations of arguments
diff --git a/src/MNH/zsmt_pgd.f90 b/src/MNH/zsmt_pgd.f90
index 7731c2dcf..b7c97c10a 100644
--- a/src/MNH/zsmt_pgd.f90
+++ b/src/MNH/zsmt_pgd.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2005-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2005-2020 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.
@@ -67,6 +67,7 @@ END MODULE MODI_ZSMT_PGD
!
!* 0. DECLARATIONS
!
+use modd_field, only: tfielddata, TYPEREAL
USE MODD_IO, ONLY : TFILEDATA
USE MODD_PARAMETERS, ONLY : JPHEXT, XUNDEF
!
@@ -77,7 +78,6 @@ USE MODE_ll , ONLY : GET_DIM_EXT_ll , ADD2DFIELD_ll , CLEANLIST_ll , UPDA
USE MODD_ARGSLIST_ll, ONLY : LIST_ll
USE MODE_SUM_ll
use mode_tools_ll, only: GET_INDICE_ll
-USE MODE_FIELD, ONLY: TFIELDDATA, TYPEREAL
!
IMPLICIT NONE
!
--
GitLab