diff --git a/src/LIB/SURCOUCHE/src/mode_construct_ll.f90 b/src/LIB/SURCOUCHE/src/mode_construct_ll.f90
index b54e1a3b17701e6a5136cc6192f71ed1b85b375b..95ec8a43b86fadf39f50aefd59683550dfb0befd 100644
--- a/src/LIB/SURCOUCHE/src/mode_construct_ll.f90
+++ b/src/LIB/SURCOUCHE/src/mode_construct_ll.f90
@@ -1,16 +1,8 @@
-!MNH_LIC Copyright 1994-2014 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 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 CVS information
-!-----------------------------------------------------------------
-! $Source$
-! $Name$
-! $Revision$
-! $Date$
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
! ########################
MODULE MODE_CONSTRUCT_ll
@@ -82,8 +74,6 @@
USE MODD_DIM_ll, ONLY : CLBCX, CLBCY
!
USE MODD_MPIF
-!
-! INCLUDE 'mpif.h'
!
CONTAINS
!
diff --git a/src/LIB/SURCOUCHE/src/mode_exchange2_ll.f90 b/src/LIB/SURCOUCHE/src/mode_exchange2_ll.f90
index dc4cf9d39fa9f5bdf90c5f426f04f4dbf210f475..863e7b667c2288ebaae606cc54d72b323ff2ba82 100644
--- a/src/LIB/SURCOUCHE/src/mode_exchange2_ll.f90
+++ b/src/LIB/SURCOUCHE/src/mode_exchange2_ll.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.
@@ -478,8 +478,6 @@
USE MODD_MPIF
!
IMPLICIT NONE
-
-! INCLUDE 'mpif.h'
!
!* 0.1 declarations of arguments
!
@@ -712,8 +710,6 @@
!
IMPLICIT NONE
!
-! INCLUDE 'mpif.h'
-!
!* 0.1 declarations of arguments
!
TYPE(CRSPD_ll), POINTER :: TPCRSPDSEND, TPCRSPDRECV
diff --git a/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90 b/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90
index aa0caf7582feddb6315a65ad45f3a7d119070332..fb2389640782d1defcd1f0507ead0652a36c9908 100644
--- a/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90
+++ b/src/LIB/SURCOUCHE/src/mode_exchange_ll.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.
@@ -81,7 +81,6 @@
!JUANZ
USE MODD_VAR_ll, ONLY : NMNH_COMM_WORLD
!JUANZ
-! INCLUDE 'mpif.h'
!
!*
!
@@ -427,8 +426,6 @@
!
IMPLICIT NONE
!
-! INCLUDE 'mpif.h'
-!
!
!* 0.1 declarations of arguments
!
@@ -607,9 +604,6 @@ INTEGER :: NB_REQ
!JUANZ
IMPLICIT NONE
!
-! INCLUDE 'mpif.h'
-!
-!
!* 0.1 declarations of arguments
!
REAL, DIMENSION(:), POINTER :: PFIELD
diff --git a/src/LIB/SURCOUCHE/src/mode_gather.f90 b/src/LIB/SURCOUCHE/src/mode_gather.f90
index a1ce0afae0d8b413f472eee7d3236e39291e4c18..b2d3e89a57cc7efed21882a6f1639bbddd132ccd 100644
--- a/src/LIB/SURCOUCHE/src/mode_gather.f90
+++ b/src/LIB/SURCOUCHE/src/mode_gather.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,8 +21,6 @@ IMPLICIT NONE
PRIVATE
-!INCLUDE 'mpif.h'
-
INTERFACE GATHERALL_FIELD_ll
MODULE PROCEDURE GATHERALL_X1, GATHERALL_X2, GATHERALL_X3,&
& GATHERALL_N1, GATHERALL_N2
@@ -55,8 +53,6 @@ INTEGER, INTENT(INOUT):: KRESP
INTEGER :: IROOT
-!INCLUDE 'mpif.h'
-
KRESP = 0
IROOT = 1
@@ -79,8 +75,6 @@ INTEGER, INTENT(INOUT):: KRESP
INTEGER :: IROOT
-!INCLUDE 'mpif.h'
-
KRESP = 0
IROOT = 1
@@ -104,8 +98,6 @@ INTEGER, INTENT(INOUT):: KRESP
INTEGER :: IROOT
-!INCLUDE 'mpif.h'
-
KRESP = 0
IROOT = 1
@@ -131,8 +123,6 @@ INTEGER, INTENT(INOUT):: KRESP
INTEGER :: IROOT
-!INCLUDE 'mpif.h'
-
KRESP = 0
IROOT = 1
@@ -154,8 +144,6 @@ INTEGER, INTENT(INOUT):: KRESP
INTEGER :: IROOT
-!INCLUDE 'mpif.h'
-
KRESP = 0
IROOT = 1
@@ -185,8 +173,6 @@ REAL,DIMENSION(:),TARGET,INTENT(INOUT):: PRECV
INTEGER, INTENT(IN) :: KROOT
INTEGER, INTENT(IN) :: KCOMM
-!INCLUDE 'mpif.h'
-
INTEGER :: JI
INTEGER :: IXO,IXE,IYO,IYE
INTEGER :: IGXO,IGXE,IGYO,IGYE
@@ -258,8 +244,6 @@ REAL,DIMENSION(:,:),TARGET,INTENT(INOUT):: PRECV
INTEGER, INTENT(IN) :: KROOT
INTEGER, INTENT(IN) :: KCOMM
-!INCLUDE 'mpif.h'
-
INTEGER :: JI
INTEGER :: IXO,IXE,IYO,IYE
INTEGER :: IGXO,IGXE,IGYO,IGYE
@@ -321,8 +305,6 @@ REAL,DIMENSION(:,:,:),TARGET,INTENT(INOUT):: PRECV
INTEGER, INTENT(IN) :: KROOT
INTEGER, INTENT(IN) :: KCOMM
-!INCLUDE 'mpif.h'
-
INTEGER :: JI
INTEGER :: IXO,IXE,IYO,IYE
INTEGER :: IGXO,IGXE,IGYO,IGYE
@@ -384,8 +366,6 @@ REAL,DIMENSION(:,:,:,:),TARGET,INTENT(INOUT):: PRECV
INTEGER, INTENT(IN) :: KROOT
INTEGER, INTENT(IN) :: KCOMM
-!INCLUDE 'mpif.h'
-
INTEGER :: JI
INTEGER :: IXO,IXE,IYO,IYE
INTEGER :: IGXO,IGXE,IGYO,IGYE
@@ -447,8 +427,6 @@ REAL,DIMENSION(:,:,:,:,:),TARGET,INTENT(INOUT):: PRECV
INTEGER, INTENT(IN) :: KROOT
INTEGER, INTENT(IN) :: KCOMM
-!INCLUDE 'mpif.h'
-
INTEGER :: JI
INTEGER :: IXO,IXE,IYO,IYE
INTEGER :: IGXO,IGXE,IGYO,IGYE
@@ -510,8 +488,6 @@ REAL,DIMENSION(:,:,:,:,:,:),TARGET,INTENT(INOUT):: PRECV
INTEGER, INTENT(IN) :: KROOT
INTEGER, INTENT(IN) :: KCOMM
-!INCLUDE 'mpif.h'
-
INTEGER :: JI
INTEGER :: IXO,IXE,IYO,IYE
INTEGER :: IGXO,IGXE,IGYO,IGYE
@@ -573,8 +549,6 @@ INTEGER,DIMENSION(:),TARGET,INTENT(INOUT):: KRECV
INTEGER, INTENT(IN) :: KROOT
INTEGER, INTENT(IN) :: KCOMM
-!INCLUDE 'mpif.h'
-
INTEGER :: JI
INTEGER :: IXO,IXE,IYO,IYE
INTEGER :: IGXO,IGXE,IGYO,IGYE
@@ -638,8 +612,6 @@ INTEGER,DIMENSION(:,:),TARGET,INTENT(INOUT):: KRECV
INTEGER, INTENT(IN) :: KROOT
INTEGER, INTENT(IN) :: KCOMM
-!INCLUDE 'mpif.h'
-
INTEGER :: JI
INTEGER :: IXO,IXE,IYO,IYE
INTEGER :: IGXO,IGXE,IGYO,IGYE
@@ -763,8 +735,6 @@ LOGICAL,DIMENSION(:),TARGET,INTENT(INOUT) :: ORECV
INTEGER, INTENT(IN) :: KROOT
INTEGER, INTENT(IN) :: KCOMM
-!INCLUDE 'mpif.h'
-
INTEGER :: JI
INTEGER :: IXO,IXE,IYO,IYE
INTEGER :: IGXO,IGXE,IGYO,IGYE
@@ -832,8 +802,6 @@ INTEGER, INTENT(IN) :: KCOMM
INTEGER, OPTIONAL,INTENT(IN) :: KXOBOX,KXEBOX,KYOBOX,KYEBOX
CHARACTER(LEN=*), OPTIONAL,INTENT(IN) :: HINTER
-!INCLUDE 'mpif.h'
-
INTEGER :: JI
INTEGER :: IXO,IXE,IYO,IYE
REAL, DIMENSION(:,:), POINTER :: XP
@@ -886,8 +854,6 @@ INTEGER, INTENT(IN) :: KCOMM
INTEGER, OPTIONAL,INTENT(IN) :: KXOBOX,KXEBOX,KYOBOX,KYEBOX
CHARACTER(LEN=*), OPTIONAL,INTENT(IN) :: HINTER
-!INCLUDE 'mpif.h'
-
INTEGER :: JI
INTEGER :: IXO,IXE,IYO,IYE
REAL, DIMENSION(:,:,:),POINTER:: XP
@@ -929,8 +895,6 @@ INTEGER, INTENT(IN) :: KCOMM
INTEGER, OPTIONAL,INTENT(IN) :: KXOBOX,KXEBOX,KYOBOX,KYEBOX
CHARACTER(LEN=*), OPTIONAL,INTENT(IN) :: HINTER
-!INCLUDE 'mpif.h'
-
INTEGER :: JI
INTEGER :: IXO,IXE,IYO,IYE
REAL, DIMENSION(:,:,:,:),POINTER:: XP
@@ -972,8 +936,6 @@ INTEGER, INTENT(IN) :: KCOMM
INTEGER, OPTIONAL,INTENT(IN) :: KXOBOX,KXEBOX,KYOBOX,KYEBOX
CHARACTER(LEN=*), OPTIONAL,INTENT(IN) :: HINTER
-!INCLUDE 'mpif.h'
-
INTEGER :: JI
INTEGER :: IXO,IXE,IYO,IYE
REAL, DIMENSION(:,:,:,:,:),POINTER:: XP
@@ -1015,8 +977,6 @@ INTEGER, INTENT(IN) :: KCOMM
INTEGER, OPTIONAL,INTENT(IN) :: KXOBOX,KXEBOX,KYOBOX,KYEBOX
CHARACTER(LEN=*), OPTIONAL,INTENT(IN) :: HINTER
-!INCLUDE 'mpif.h'
-
INTEGER :: JI
INTEGER :: IXO,IXE,IYO,IYE
REAL, DIMENSION(:,:,:,:,:,:),POINTER:: XP
@@ -1056,8 +1016,6 @@ INTEGER,DIMENSION(:,:),TARGET,INTENT(INOUT):: KRECV
INTEGER, INTENT(IN) :: KROOT
INTEGER, INTENT(IN) :: KCOMM
-!INCLUDE 'mpif.h'
-
INTEGER :: JI
INTEGER :: IXO,IXE,IYO,IYE
INTEGER,DIMENSION(:,:),POINTER :: ITP
@@ -1134,7 +1092,6 @@ REAL,DIMENSION(:,:),TARGET,INTENT(INOUT):: PRECV
INTEGER, INTENT(IN) :: KROOT
INTEGER, INTENT(IN) :: KCOMM
INTEGER, INTENT(IN) :: KXOBOX,KXEBOX,KYOBOX,KYEBOX
-!INCLUDE 'mpif.h'
INTEGER :: JI
INTEGER :: IXO,IXE,IYO,IYE
diff --git a/src/LIB/SURCOUCHE/src/test_double_double.f90 b/src/LIB/SURCOUCHE/src/test_double_double.f90
index 59b0b2976b5efbf1a835a7da28bbf824b6354f7e..d5cacbcc3292a141a4b86cc4a60aaaef1b7f4de6 100644
--- a/src/LIB/SURCOUCHE/src/test_double_double.f90
+++ b/src/LIB/SURCOUCHE/src/test_double_double.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.
@@ -13,7 +13,6 @@ PROGRAM TEST_DOUBLE_DOUBLE
IMPLICIT NONE
- !INCLUDE 'mpif.h'
INTEGER , PARAMETER :: n =1024
REAL array(n)
INTEGER myPE, totPEs, stat(MPI_STATUS_SIZE), ierr