From 525346987f8817824ee5b81c790763a7b036626f Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 3 May 2019 15:15:55 +0200
Subject: [PATCH] Philippe 03/05/2019: bikhardt: modi_bikhardt -> mode_bikhardt
---
src/MNH/bikhardt.f90 | 147 +++++--------------------------
src/MNH/eddyUV_flux_one_wayn.f90 | 7 +-
src/MNH/eddy_flux_one_wayn.f90 | 7 +-
src/MNH/ini_one_wayn.f90 | 2 +-
src/MNH/ini_spawn_lsn.f90 | 10 +--
src/MNH/one_wayn.f90 | 4 +-
src/MNH/spawn_field2.f90 | 4 +-
src/MNH/spawn_grid2.f90 | 2 +-
src/MNH/spawn_lsn.f90 | 4 +-
src/MNH/spawn_pressure2.f90 | 4 +-
src/MNH/spawn_surf2_rain.f90 | 2 +-
src/MNH/spawn_zs.f90 | 2 +-
src/MNH/zs_boundaryn.f90 | 11 +--
13 files changed, 47 insertions(+), 159 deletions(-)
diff --git a/src/MNH/bikhardt.f90 b/src/MNH/bikhardt.f90
index a049ec315..1efebdc11 100644
--- a/src/MNH/bikhardt.f90
+++ b/src/MNH/bikhardt.f90
@@ -1,126 +1,27 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2019 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
-!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 interpol 2006/05/18 13:07:25
+! Modifications:
+! P. Wautelet 03/05/2019: modi_bikhardt -> mode_bikhardt
!-----------------------------------------------------------------
!###################
-MODULE MODI_BIKHARDT
+module mode_bikhardt
!###################
-!
-INTERFACE BIKHARDT
-!
- SUBROUTINE BIKHARDT4D (PBMX1,PBMX2,PBMX3,PBMX4,PBMY1,PBMY2,PBMY3,PBMY4, &
- PBFX1,PBFX2,PBFX3,PBFX4,PBFY1,PBFY2,PBFY3,PBFY4, &
- KXOR,KYOR,KXEND,KYEND,KDXRATIO,KDYRATIO,KGRID, &
- HLBCX,HLBCY,PFIELD1,PFIELD2)
-!
- ! interpolation coefficients
-REAL, DIMENSION(:), INTENT(IN) :: PBMX1,PBMX2,PBMX3,PBMX4 ! Mass points in X-direc.
-REAL, DIMENSION(:), INTENT(IN) :: PBMY1,PBMY2,PBMY3,PBMY4 ! Mass points in Y-direc.
-REAL, DIMENSION(:), INTENT(IN) :: PBFX1,PBFX2,PBFX3,PBFX4 ! Flux points in X-direc.
-REAL, DIMENSION(:), INTENT(IN) :: PBFY1,PBFY2,PBFY3,PBFY4 ! Flux points in Y-direc.
-!
-INTEGER, INTENT(IN) :: KXOR,KXEND ! horizontal position (i,j) of the ORigin and END
-INTEGER, INTENT(IN) :: KYOR,KYEND ! of the model domain, relative to the outer model
-INTEGER, INTENT(IN) :: KDXRATIO ! x and y-direction Resolution ratio
-INTEGER, INTENT(IN) :: KDYRATIO ! between inner model and outer model
-INTEGER, INTENT(IN) :: KGRID ! code of grid point
-CHARACTER (LEN=4), DIMENSION (2), INTENT(IN) :: HLBCX ! type of lateral
-CHARACTER (LEN=4), DIMENSION (2), INTENT(IN) :: HLBCY ! boundary conditions
-REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PFIELD1 ! field of outer model
-REAL, DIMENSION(:,:,:,:), INTENT(OUT):: PFIELD2 ! field of inner model
-!
-END SUBROUTINE BIKHARDT4D
-!
- SUBROUTINE BIKHARDT3D (PBMX1,PBMX2,PBMX3,PBMX4,PBMY1,PBMY2,PBMY3,PBMY4, &
- PBFX1,PBFX2,PBFX3,PBFX4,PBFY1,PBFY2,PBFY3,PBFY4, &
- KXOR,KYOR,KXEND,KYEND,KDXRATIO,KDYRATIO,KGRID, &
- HLBCX,HLBCY,PFIELD1,PFIELD2)
-!
- ! interpolation coefficients
-REAL, DIMENSION(:), INTENT(IN) :: PBMX1,PBMX2,PBMX3,PBMX4 ! Mass points in X-direc.
-REAL, DIMENSION(:), INTENT(IN) :: PBMY1,PBMY2,PBMY3,PBMY4 ! Mass points in Y-direc.
-REAL, DIMENSION(:), INTENT(IN) :: PBFX1,PBFX2,PBFX3,PBFX4 ! Flux points in X-direc.
-REAL, DIMENSION(:), INTENT(IN) :: PBFY1,PBFY2,PBFY3,PBFY4 ! Flux points in Y-direc.
-!
-INTEGER, INTENT(IN) :: KXOR,KXEND ! horizontal position (i,j) of the ORigin and END
-INTEGER, INTENT(IN) :: KYOR,KYEND ! of the inner model domain, relative to outer model
-INTEGER, INTENT(IN) :: KDXRATIO ! x and y-direction Resolution ratio
-INTEGER, INTENT(IN) :: KDYRATIO ! between inner model and outer model
-INTEGER, INTENT(IN) :: KGRID ! code of grid point
-CHARACTER (LEN=4), DIMENSION (2), INTENT(IN) :: HLBCX ! type of lateral
-CHARACTER (LEN=4), DIMENSION (2), INTENT(IN) :: HLBCY ! boundary conditions
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PFIELD1 ! field of outer model
-REAL, DIMENSION(:,:,:), INTENT(OUT):: PFIELD2 ! field of inner model
-!
-END SUBROUTINE BIKHARDT3D
-!
- SUBROUTINE BIKHARDT2D (PBMX1,PBMX2,PBMX3,PBMX4,PBMY1,PBMY2,PBMY3,PBMY4, &
- PBFX1,PBFX2,PBFX3,PBFX4,PBFY1,PBFY2,PBFY3,PBFY4, &
- KXOR,KYOR,KXEND,KYEND,KDXRATIO,KDYRATIO,KGRID, &
- HLBCX,HLBCY,PFIELD1,PFIELD2)
-!
- ! interpolation coefficients
-REAL, DIMENSION(:), INTENT(IN) :: PBMX1,PBMX2,PBMX3,PBMX4 ! Mass points in X-direc.
-REAL, DIMENSION(:), INTENT(IN) :: PBMY1,PBMY2,PBMY3,PBMY4 ! Mass points in Y-direc.
-REAL, DIMENSION(:), INTENT(IN) :: PBFX1,PBFX2,PBFX3,PBFX4 ! Flux points in X-direc.
-REAL, DIMENSION(:), INTENT(IN) :: PBFY1,PBFY2,PBFY3,PBFY4 ! Flux points in Y-direc.
-!
-INTEGER, INTENT(IN) :: KXOR,KXEND ! horizontal position (i,j) of the ORigin and END
-INTEGER, INTENT(IN) :: KYOR,KYEND ! of the inner model domain, relative to outer model
-INTEGER, INTENT(IN) :: KDXRATIO ! x and y-direction Resolution ratio
-INTEGER, INTENT(IN) :: KDYRATIO ! between inner model and outer model
-INTEGER, INTENT(IN) :: KGRID ! code of grid point
-CHARACTER (LEN=4), DIMENSION (2), INTENT(IN) :: HLBCX ! type of lateral
-CHARACTER (LEN=4), DIMENSION (2), INTENT(IN) :: HLBCY ! boundary conditions
-REAL, DIMENSION(:,:), INTENT(IN) :: PFIELD1 ! field of outer model
-REAL, DIMENSION(:,:), INTENT(OUT):: PFIELD2 ! field of inner model
-!
-END SUBROUTINE BIKHARDT2D
-!
-END INTERFACE
-!
-END MODULE MODI_BIKHARDT
-!
-!#####################
-MODULE MODI_BIKHARDT4D
-!#####################
-!
-INTERFACE
-!
- SUBROUTINE BIKHARDT4D (PBMX1,PBMX2,PBMX3,PBMX4,PBMY1,PBMY2,PBMY3,PBMY4, &
- PBFX1,PBFX2,PBFX3,PBFX4,PBFY1,PBFY2,PBFY3,PBFY4, &
- KXOR,KYOR,KXEND,KYEND,KDXRATIO,KDYRATIO,KGRID, &
- HLBCX,HLBCY,PFIELD1,PFIELD2)
-!
- ! interpolation coefficients
-REAL, DIMENSION(:), INTENT(IN) :: PBMX1,PBMX2,PBMX3,PBMX4 ! Mass points in X-direc.
-REAL, DIMENSION(:), INTENT(IN) :: PBMY1,PBMY2,PBMY3,PBMY4 ! Mass points in Y-direc.
-REAL, DIMENSION(:), INTENT(IN) :: PBFX1,PBFX2,PBFX3,PBFX4 ! Flux points in X-direc.
-REAL, DIMENSION(:), INTENT(IN) :: PBFY1,PBFY2,PBFY3,PBFY4 ! Flux points in Y-direc.
-!
-INTEGER, INTENT(IN) :: KXOR,KXEND ! horizontal position (i,j) of the ORigin and END
-INTEGER, INTENT(IN) :: KYOR,KYEND ! of the inner model domain, relative to outer model
-INTEGER, INTENT(IN) :: KDXRATIO ! x and y-direction Resolution ratio
-INTEGER, INTENT(IN) :: KDYRATIO ! between inner model and outer model
-INTEGER, INTENT(IN) :: KGRID ! code of grid point
-CHARACTER (LEN=4), DIMENSION (2), INTENT(IN) :: HLBCX ! type of lateral
-CHARACTER (LEN=4), DIMENSION (2), INTENT(IN) :: HLBCY ! boundary conditions
-REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PFIELD1 ! field of outer model
-REAL, DIMENSION(:,:,:,:), INTENT(OUT):: PFIELD2 ! field of inner model
-!
-END SUBROUTINE BIKHARDT4D
-!
-END INTERFACE
-!
-END MODULE MODI_BIKHARDT4D
-!
-!
+
+implicit none
+
+private
+
+public :: Bikhardt
+
+interface Bikhardt
+ module procedure Bikhardt2d, Bikhardt3d, Bikhardt4d
+end interface
+
+contains
+
! #########################################################################
SUBROUTINE BIKHARDT4D (PBMX1,PBMX2,PBMX3,PBMX4,PBMY1,PBMY2,PBMY3,PBMY4, &
PBFX1,PBFX2,PBFX3,PBFX4,PBFY1,PBFY2,PBFY3,PBFY4, &
@@ -183,7 +84,7 @@ IMPLICIT NONE
!
!* 0.1 Declarations of dummy arguments :
!
- ! interpolation coefficients
+ ! interpolation coefficients
REAL, DIMENSION(:), INTENT(IN) :: PBMX1,PBMX2,PBMX3,PBMX4 ! Mass points in X-direc.
REAL, DIMENSION(:), INTENT(IN) :: PBMY1,PBMY2,PBMY3,PBMY4 ! Mass points in Y-direc.
REAL, DIMENSION(:), INTENT(IN) :: PBFX1,PBFX2,PBFX3,PBFX4 ! Flux points in X-direc.
@@ -489,13 +390,11 @@ END SUBROUTINE BIKHARDT4D
!* 0. DECLARATIONS
! ------------
!
-USE MODI_BIKHARDT4D
-!
IMPLICIT NONE
!
!* 0.1 Declarations of dummy arguments :
!
- ! interpolation coefficients
+ ! interpolation coefficients
REAL, DIMENSION(:), INTENT(IN) :: PBMX1,PBMX2,PBMX3,PBMX4 ! Mass points in X-direc.
REAL, DIMENSION(:), INTENT(IN) :: PBMY1,PBMY2,PBMY3,PBMY4 ! Mass points in Y-direc.
REAL, DIMENSION(:), INTENT(IN) :: PBFX1,PBFX2,PBFX3,PBFX4 ! Flux points in X-direc.
@@ -578,13 +477,11 @@ END SUBROUTINE BIKHARDT3D
!* 0. DECLARATIONS
! ------------
!
-USE MODI_BIKHARDT4D
-!
IMPLICIT NONE
!
!* 0.1 Declarations of dummy arguments :
!
- ! interpolation coefficients
+ ! interpolation coefficients
REAL, DIMENSION(:), INTENT(IN) :: PBMX1,PBMX2,PBMX3,PBMX4 ! Mass points in X-direc.
REAL, DIMENSION(:), INTENT(IN) :: PBMY1,PBMY2,PBMY3,PBMY4 ! Mass points in Y-direc.
REAL, DIMENSION(:), INTENT(IN) :: PBFX1,PBFX2,PBFX3,PBFX4 ! Flux points in X-direc.
@@ -614,3 +511,5 @@ PFIELD2(:,:) =ZFIELD2(:,:,1,1)
!-------------------------------------------------------------------------------
!
END SUBROUTINE BIKHARDT2D
+
+end module mode_bikhardt
diff --git a/src/MNH/eddyUV_flux_one_wayn.f90 b/src/MNH/eddyUV_flux_one_wayn.f90
index 3ec0effa1..99a1fc678 100644
--- a/src/MNH/eddyUV_flux_one_wayn.f90
+++ b/src/MNH/eddyUV_flux_one_wayn.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2011-2019 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
-!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ###############################
@@ -64,11 +64,10 @@ USE MODD_REF_n, ONLY:XRHODJ
USE MODD_METRICS_n
USE MODI_GRADIENT_U
!
-! For the horizontal interpolation
-USE MODI_BIKHARDT
USE MODD_BIKHARDT_n
USE MODD_NESTING
!
+use mode_bikhardt
USE MODE_FIELD, ONLY : TFIELDLIST, FIND_FIELD_ID_FROM_MNHNAME
!
IMPLICIT NONE
diff --git a/src/MNH/eddy_flux_one_wayn.f90 b/src/MNH/eddy_flux_one_wayn.f90
index 1aaadbc64..31549eab9 100644
--- a/src/MNH/eddy_flux_one_wayn.f90
+++ b/src/MNH/eddy_flux_one_wayn.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2011-2018 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
-!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ###############################
@@ -65,11 +65,10 @@ USE MODD_METRICS_n
USE MODI_GRADIENT_W
USE MODI_GRADIENT_U
!
-! For the horizontal interpolation
-USE MODI_BIKHARDT
USE MODD_BIKHARDT_n
USE MODD_NESTING
!
+use mode_bikhardt
USE MODE_FIELD, ONLY : TFIELDLIST, FIND_FIELD_ID_FROM_MNHNAME
!
IMPLICIT NONE
diff --git a/src/MNH/ini_one_wayn.f90 b/src/MNH/ini_one_wayn.f90
index 1b6100cd7..37dc38147 100644
--- a/src/MNH/ini_one_wayn.f90
+++ b/src/MNH/ini_one_wayn.f90
@@ -160,12 +160,12 @@ USE MODD_CH_MNHC_n, ONLY: LUSECHAQ, LUSECHIC
USE MODD_REF_n
USE MODD_NSV
!
-USE MODI_BIKHARDT
USE MODI_VER_INTERP_LIN
USE MODI_SET_CONC_RAIN_C2R2
USE MODI_SET_CONC_ICE_C1R3
USE MODI_SET_CHEMAQ_1WAY
!
+use mode_bikhardt
USE MODI_SET_CONC_LIMA
!
IMPLICIT NONE
diff --git a/src/MNH/ini_spawn_lsn.f90 b/src/MNH/ini_spawn_lsn.f90
index f33f727bb..d1274f06b 100644
--- a/src/MNH/ini_spawn_lsn.f90
+++ b/src/MNH/ini_spawn_lsn.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1997-2019 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
-!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
! #########################
MODULE MODI_INI_SPAWN_LS_n
! #########################
@@ -147,6 +143,7 @@ END MODULE MODI_INI_SPAWN_LS_n
!
!* 0. DECLARATIONS
! ------------
+use mode_bikhardt
USE MODE_ll
USE MODE_MODELN_HANDLER
!
@@ -158,7 +155,6 @@ USE MODD_FIELD_n ! modules relative to the outer model $n
USE MODD_LSFIELD_n
USE MODD_GRID_n
!
-USE MODI_BIKHARDT
USE MODI_SHUMAN
USE MODI_COEF_VER_INTERP_LIN
USE MODI_VER_INTERP_LIN
diff --git a/src/MNH/one_wayn.f90 b/src/MNH/one_wayn.f90
index 05532ca21..d12e11109 100644
--- a/src/MNH/one_wayn.f90
+++ b/src/MNH/one_wayn.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2019 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
@@ -195,6 +195,7 @@ SUBROUTINE ONE_WAY_n(KDAD,PTSTEP,KMI,KTCOUNT, &
USE MODE_ll
USE MODE_MODELN_HANDLER
use mode_msg
+use mode_bikhardt
!
USE MODD_PARAMETERS
USE MODD_NESTING
@@ -206,7 +207,6 @@ USE MODD_PARAM_n
USE MODD_CH_MNHC_n, ONLY: LUSECHAQ, LUSECHIC
USE MODD_NSV
!
-USE MODI_BIKHARDT
USE MODI_VER_INTERP_LIN
USE MODI_SET_CONC_RAIN_C2R2
USE MODI_SET_CONC_ICE_C1R3
diff --git a/src/MNH/spawn_field2.f90 b/src/MNH/spawn_field2.f90
index b0f75841c..62d152167 100644
--- a/src/MNH/spawn_field2.f90
+++ b/src/MNH/spawn_field2.f90
@@ -2,6 +2,7 @@
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
!#######################
MODULE MODI_SPAWN_FIELD2
!#######################
@@ -187,6 +188,7 @@ USE MODD_RELFRC_n
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
@@ -196,8 +198,6 @@ USE MODE_MPPDB
USE MODE_THERMO
USE MODE_TOOLS, ONLY: UPCASE
!
-USE MODI_BIKHARDT
-!
IMPLICIT NONE
!
!* 0.1 Declarations of dummy arguments :
diff --git a/src/MNH/spawn_grid2.f90 b/src/MNH/spawn_grid2.f90
index 15de26857..4ba0d58a3 100644
--- a/src/MNH/spawn_grid2.f90
+++ b/src/MNH/spawn_grid2.f90
@@ -164,11 +164,11 @@ USE MODD_LBC_n, ONLY: LBC_MODEL
USE MODD_LUNIT_n, ONLY: TLUOUT
USE MODD_BIKHARDT_n
USE MODD_VAR_ll
+use mode_bikhardt
USE MODE_ll
USE MODE_TIME
USE MODE_GRIDPROJ
!
-USE MODI_BIKHARDT
USE MODI_SPAWN_ZS
!
USE MODE_MODELN_HANDLER
diff --git a/src/MNH/spawn_lsn.f90 b/src/MNH/spawn_lsn.f90
index 88d40d981..d72774348 100644
--- a/src/MNH/spawn_lsn.f90
+++ b/src/MNH/spawn_lsn.f90
@@ -23,7 +23,7 @@ INTERFACE
INTEGER, INTENT(IN) :: KDAD ! number of the DAD model
REAL, INTENT(IN) :: PTSTEP ! Time step
INTEGER, INTENT(IN) :: KMI ! model number
- ! interpolation coefficients
+ ! interpolation coefficients
REAL, DIMENSION(:), INTENT(IN) :: PBMX1,PBMX2,PBMX3,PBMX4 ! Mass points in X-direc.
REAL, DIMENSION(:), INTENT(IN) :: PBMY1,PBMY2,PBMY3,PBMY4 ! Mass points in Y-direc.
REAL, DIMENSION(:), INTENT(IN) :: PBFX1,PBFX2,PBFX3,PBFX4 ! Flux points in X-direc.
@@ -129,6 +129,7 @@ END MODULE MODI_SPAWN_LS_n
!
!* 0. DECLARATIONS
! ------------
+use mode_bikhardt
USE MODE_ll
USE MODE_MODELN_HANDLER
!
@@ -139,7 +140,6 @@ USE MODD_LSFIELD_n
USE MODD_FIELD_n ! modules relative to the outer model _n
USE MODD_GRID_n
!
-USE MODI_BIKHARDT
USE MODI_COEF_VER_INTERP_LIN
USE MODI_VER_INTERP_LIN
USE MODI_SHUMAN
diff --git a/src/MNH/spawn_pressure2.f90 b/src/MNH/spawn_pressure2.f90
index 4a4077c29..0a55faaef 100644
--- a/src/MNH/spawn_pressure2.f90
+++ b/src/MNH/spawn_pressure2.f90
@@ -1,6 +1,6 @@
!MNH_LIC Copyright 1997-2018 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
-!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
!#######################
@@ -122,11 +122,11 @@ USE MODD_VER_INTERP_LIN
USE MODD_SPAWN
!
USE MODI_SHUMAN
-USE MODI_BIKHARDT
USE MODI_COMPUTE_EXNER_FROM_TOP
USE MODI_COEF_VER_INTERP_LIN
USE MODI_VER_INTERP_LIN
!
+use mode_bikhardt
USE MODE_MODELN_HANDLER
USE MODE_ll
USE MODE_MPPDB
diff --git a/src/MNH/spawn_surf2_rain.f90 b/src/MNH/spawn_surf2_rain.f90
index 0c324004d..4a6ecb4f7 100644
--- a/src/MNH/spawn_surf2_rain.f90
+++ b/src/MNH/spawn_surf2_rain.f90
@@ -122,9 +122,9 @@ USE MODD_IO, ONLY: TFILEDATA
USE MODD_LBC_n, ONLY: LBC_MODEL
USE MODD_SPAWN
!
+use mode_bikhardt
USE MODE_MODELN_HANDLER
!
-USE MODI_BIKHARDT ! Interface modules
USE MODI_READ_PRECIP_FIELD
!
IMPLICIT NONE
diff --git a/src/MNH/spawn_zs.f90 b/src/MNH/spawn_zs.f90
index ea7ad5768..fc12915cc 100644
--- a/src/MNH/spawn_zs.f90
+++ b/src/MNH/spawn_zs.f90
@@ -110,7 +110,7 @@ use modd_precision, only: MNHREAL_MPI
!
USE MODD_BIKHARDT_n
!
-USE MODI_BIKHARDT
+use mode_bikhardt
USE MODI_ZS_BOUNDARY
!
USE MODE_MODELN_HANDLER
diff --git a/src/MNH/zs_boundaryn.f90 b/src/MNH/zs_boundaryn.f90
index 2fe1bf3b4..b26462efd 100644
--- a/src/MNH/zs_boundaryn.f90
+++ b/src/MNH/zs_boundaryn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1999-2019 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
-!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 init 2006/05/18 13:07:25
-!-----------------------------------------------------------------
! #######################
MODULE MODI_ZS_BOUNDARY_n
! #######################
@@ -100,7 +95,7 @@ USE MODE_MODELN_HANDLER
USE MODD_ARGSLIST_ll, ONLY : LIST_ll
USE MODD_GRID_n ! contains the DAD model informations
!
-USE MODI_BIKHARDT
+use mode_bikhardt
!
!
IMPLICIT NONE
--
GitLab