diff --git a/src/MNH/ch_aqueous_tmicice.f90 b/src/MNH/ch_aqueous_tmicice.f90
index e51d52f374a2b6ff66cb7891b25af689cb400fd3..f6e72e82249ba87ec4dc6f54b5a4a460529bb702 100644
--- a/src/MNH/ch_aqueous_tmicice.f90
+++ b/src/MNH/ch_aqueous_tmicice.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2008-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2008-2023 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,9 +133,6 @@ USE MODD_RAIN_ICE_PARAM, ONLY : XTIMAUTC, XCRIAUTC, XFCACCR, XEXCACCR, &
USE MODD_CH_ICE ! value of retention coefficient
USE MODD_CH_ICE_n ! index for ice phase chemistry with IC3/4
!
-#ifdef MNH_PGI
-USE MODE_PACK_PGI
-#endif
use mode_tools, only: Countjv
use mode_tools_ll, only: GET_INDICE_ll
!
diff --git a/src/MNH/ch_set_ph.f90 b/src/MNH/ch_set_ph.f90
index 5b08dcebd26950319f488735534fcfad337e2dfe..76aec71a5a26df1cda4201906797539f08373ea9 100644
--- a/src/MNH/ch_set_ph.f90
+++ b/src/MNH/ch_set_ph.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2007-2023 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: /home//MESONH/MNH-V4-6-5/src/SRC_CHIMAQ/ch_set_ph.f90
-!-----------------------------------------------------------------
!! #######################
MODULE MODI_CH_SET_PH
!! #######################
@@ -81,10 +77,6 @@ USE MODI_CH_SOLVE_PH
USE MODD_CH_M9_n, ONLY: NEQ, NEQAQ
USE MODD_CH_M9_SCHEME, ONLY: CCSTYPE, TACCS
!
-#ifdef MNH_PGI
-USE MODE_PACK_PGI
-#endif
-!
IMPLICIT NONE
!
!* 0.1 declarations of arguments
diff --git a/src/MNH/deep_convection.f90 b/src/MNH/deep_convection.f90
index 2a6b30b5531b2dac28bbf5cee664245f10faf5ff..87c4f3cf0087d3c40b9b823a1ed0e31762eef808 100644
--- a/src/MNH/deep_convection.f90
+++ b/src/MNH/deep_convection.f90
@@ -1,9 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2023 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
! ######################
MODULE MODI_DEEP_CONVECTION
! ######################
@@ -97,10 +96,6 @@ END INTERFACE
!
END MODULE MODI_DEEP_CONVECTION
!
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 conv 2006/09/21 10:55:01
-!-----------------------------------------------------------------
! ############################################################################
SUBROUTINE DEEP_CONVECTION( KLON, KLEV, KIDIA, KFDIA, KBDIA, KTDIA, &
PDTCONV, KICE, OREFRESH, ODOWN, OSETTADJ, &
@@ -222,10 +217,6 @@ USE MODI_CONVECT_CLOSURE
USE MODI_CH_CONVECT_SCAVENGING
USE MODI_CONVECT_CHEM_TRANSPORT
!
-#ifdef MNH_PGI
-USE MODE_PACK_PGI
-#endif
-!
IMPLICIT NONE
!
!* 0.1 Declarations of dummy arguments :
diff --git a/src/MNH/flash_geom_elec.f90 b/src/MNH/flash_geom_elec.f90
index 8ae281d266727272811789065a02bce9cad1ec3c..535cac95fb9ac89fa98fd840bd5f4a5bebe7873b 100644
--- a/src/MNH/flash_geom_elec.f90
+++ b/src/MNH/flash_geom_elec.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2010-2020 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2010-2023 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.
@@ -137,9 +137,6 @@ USE MODE_ELEC_ll
USE MODE_GRIDPROJ
USE MODE_ll
USE MODE_MPPDB
-#ifdef MNH_PGI
-USE MODE_PACK_PGI
-#endif
!
USE MODI_ION_ATTACH_ELEC
USE MODI_SHUMAN
diff --git a/src/MNH/mode_pack_pgi.f90 b/src/MNH/mode_pack_pgi.f90
deleted file mode 100644
index 649cb32e0923ac516ef09a66f40852cd2d305f80..0000000000000000000000000000000000000000
--- a/src/MNH/mode_pack_pgi.f90
+++ /dev/null
@@ -1,170 +0,0 @@
-!MNH_LIC Copyright 1994-2014 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.
-#ifdef MNH_PGI
-!###################
-MODULE MODE_PACK_PGI
-!###################
-!
-!
-!! AUTHOR
-!! ------
-!! J.ESCOBAR * Laboratoire d'Aerologie *
-!!
-!! MODIFICATIONS
-!! -------------
-!! Juan 24/09/2012: for BUG Pgi rewrite PACK function on mode_pack_pgi
-
-IMPLICIT NONE
-
- INTERFACE PACK
- MODULE PROCEDURE PACK_I,PACK_L,PACK_X1,PACK_X2,PACK_X2S,PACK_X3
- END INTERFACE PACK
-
-CONTAINS
-
- FUNCTION PACK_I(KTAB, MASK)
- IMPLICIT NONE
-
- INTEGER , DIMENSION (:), INTENT(IN) :: KTAB
- LOGICAL , DIMENSION (:), INTENT(IN) :: MASK
- INTEGER , DIMENSION (SIZE(MASK)) :: PACK_I
-
- INTEGER :: JI,JL
-
- JL = 0
- DO JI = 1 , SIZE(MASK)
- IF ( MASK(JI) ) THEN
- JL = JL + 1
- PACK_I(JL) = KTAB(JI)
- END IF
- END DO
-
- END FUNCTION PACK_I
-
- FUNCTION PACK_L(GTAB, MASK)
- IMPLICIT NONE
-
- LOGICAL , DIMENSION (:), INTENT(IN) :: GTAB
- LOGICAL , DIMENSION (:), INTENT(IN) :: MASK
- LOGICAL , DIMENSION (SIZE(MASK)) :: PACK_L
-
- INTEGER :: JI,JL
-
- JL = 0
- DO JI = 1 , SIZE(MASK)
- IF ( MASK(JI) ) THEN
- JL = JL + 1
- PACK_L(JL) = GTAB(JI)
- END IF
- END DO
-
- END FUNCTION PACK_L
-
- FUNCTION PACK_X1(PTAB, MASK)
- IMPLICIT NONE
-
- REAL , DIMENSION (:), INTENT(IN) :: PTAB
- LOGICAL , DIMENSION (:), INTENT(IN) :: MASK
- REAL , DIMENSION (:), ALLOCATABLE :: PACK_X1
-
- REAL , DIMENSION (SIZE(MASK)) :: PACK_X1TEMP
-
- INTEGER :: JI,JL
-
- JL = 0
- DO JI = 1 , SIZE(MASK)
- IF ( MASK(JI) ) THEN
- JL = JL + 1
- PACK_X1TEMP(JL) = PTAB(JI)
- END IF
- END DO
-
- ALLOCATE(PACK_X1(JL))
- PACK_X1(1:JL) = PACK_X1TEMP(1:JL)
-
- END FUNCTION PACK_X1
-
- FUNCTION PACK_X2(PTAB, MASK)
- IMPLICIT NONE
-
- REAL , DIMENSION (:,:), INTENT(IN) :: PTAB
- LOGICAL , DIMENSION (:,:), INTENT(IN) :: MASK
- REAL , DIMENSION (:) ,ALLOCATABLE :: PACK_X2
-
- REAL , DIMENSION (SIZE(MASK)) :: PACK_X2TEMP
-
- INTEGER :: JI,JJ,JL
-
- JL = 0
- DO JJ = 1 , SIZE(MASK,2)
- DO JI = 1 , SIZE(MASK,1)
- IF ( MASK(JI,JJ) ) THEN
- JL = JL + 1
- PACK_X2TEMP(JL) = PTAB(JI,JJ)
- END IF
- END DO
- END DO
-
- ALLOCATE(PACK_X2(JL))
- PACK_X2(1:JL) = PACK_X2TEMP (1:JL)
-
- END FUNCTION PACK_X2
-
- FUNCTION PACK_X2S(PTAB, MASK)
- IMPLICIT NONE
-
- REAL , DIMENSION (:,:), INTENT(IN) :: PTAB
- LOGICAL :: MASK
- REAL , DIMENSION (:) ,ALLOCATABLE :: PACK_X2S
-
- REAL , DIMENSION (SIZE(PTAB)) :: PACK_X2STEMP
-
- INTEGER :: JI,JJ,JL
-
- JL = 0
- DO JJ = 1 , SIZE(PTAB,2)
- DO JI = 1 , SIZE(PTAB,1)
- IF ( MASK ) THEN
- JL = JL + 1
- PACK_X2STEMP(JL) = PTAB(JI,JJ)
- END IF
- END DO
- END DO
-
- ALLOCATE(PACK_X2S(JL))
- PACK_X2S(1:JL) = PACK_X2STEMP (1:JL)
-
- END FUNCTION PACK_X2S
-
- FUNCTION PACK_X3(PTAB,MASK)
- IMPLICIT NONE
-
- REAL , DIMENSION (:,:,:) , INTENT(IN) :: PTAB
- LOGICAL , DIMENSION (:,:,:) , INTENT(IN) :: MASK
- REAL , DIMENSION (:) ,ALLOCATABLE :: PACK_X3
-
- REAL , DIMENSION (SIZE(MASK)) :: PACK_X3TEMP
-
- INTEGER :: II,IJ,IK, JL
-
- JL = 0
- DO IK=1,SIZE(MASK,3)
- DO IJ=1,SIZE(MASK,2)
- DO II=1,SIZE(MASK,1)
- IF (MASK(II,IJ,IK) ) THEN
- JL = JL+1
- PACK_X3TEMP(JL) = PTAB(II,IJ,IK)
- END IF
- END DO
- END DO
- END DO
-
- ALLOCATE(PACK_X3(JL))
- PACK_X3(1:JL) = PACK_X3TEMP (1:JL)
-
-END FUNCTION PACK_X3
-
-END MODULE MODE_PACK_PGI
-#endif
diff --git a/src/MNH/radiations.f90 b/src/MNH/radiations.f90
index 94e77fc6358a19fd1e3a9d979d9f64a0a6a89394..a3dcf892d3aec55ea34bf5d42643b13db6bbc234 100644
--- a/src/MNH/radiations.f90
+++ b/src/MNH/radiations.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1995-2021 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2023 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,9 +159,6 @@ USE MODE_ll
use mode_msg
USE MODE_REPRO_SUM, ONLY : SUM_DD_R2_R1_ll,SUM_DD_R1_ll
!
-#ifdef MNH_PGI
-USE MODE_PACK_PGI
-#endif
USE MODE_SALTOPT
USE MODE_SUM_ll, ONLY: MIN_ll
USE MODE_SUM2_ll, ONLY: GMINLOC_ll
diff --git a/src/MNH/rain_ice_elec.f90 b/src/MNH/rain_ice_elec.f90
index b82bed489109f0474b87bf53e43671787df81599..bde34d9f9e0808294ac470941b4466b530442d93 100644
--- a/src/MNH/rain_ice_elec.f90
+++ b/src/MNH/rain_ice_elec.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2002-2021 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2002-2023 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.
@@ -224,9 +224,6 @@ USE MODD_RAIN_ICE_PARAM
USE MODD_REF, ONLY: XTHVREFZ
use mode_budget, only: Budget_store_add, Budget_store_init, Budget_store_end
-#ifdef MNH_PGI
-USE MODE_PACK_PGI
-#endif
use mode_tools, only: Countjv
USE MODI_MOMG
diff --git a/src/Rules.LXnvhpc.mk b/src/Rules.LXnvhpc.mk
index 2fbd5e9d6613560d18dd33bcaf33a43c65d10732..95da2f866905d3872daf1db885c8a3375766f928 100644
--- a/src/Rules.LXnvhpc.mk
+++ b/src/Rules.LXnvhpc.mk
@@ -200,7 +200,7 @@ CPPFLAGS_SURFEX =
CPPFLAGS_SURCOUCHE += -DMNH_COMPILER_NVHPC
CPPFLAGS_RAD =
CPPFLAGS_NEWLFI = -DSWAPIO -DLINUX -DLFI_INT=${LFI_INT}
-CPPFLAGS_MNH = -DMNH=MNH -DMNH_PGI -DSFX_MNH
+CPPFLAGS_MNH = -DMNH=MNH -DSFX_MNH
CPPFLAGS_MNH += -Uvector -Upixel
CPPFLAGS_MNH += -DMNH_EXPAND -DMNH_EXPAND_OPENACC
#CPPFLAGS_MNH += -imacros MNH_OPENACC_NV_CR.CPP
diff --git a/src/Rules.LXnvhpc2005.mk b/src/Rules.LXnvhpc2005.mk
index 550965884bb9c296de893eab42c45dcee225b683..e0902bf1f3df955e340b5c1228064833c9e7cc18 100644
--- a/src/Rules.LXnvhpc2005.mk
+++ b/src/Rules.LXnvhpc2005.mk
@@ -186,7 +186,7 @@ CPPFLAGS_SURFEX =
CPPFLAGS_SURCOUCHE +=
CPPFLAGS_RAD =
CPPFLAGS_NEWLFI = -DSWAPIO -DLINUX -DLFI_INT=${LFI_INT}
-CPPFLAGS_MNH = -DMNH -DMNH_PGI -DSFX_MNH
+CPPFLAGS_MNH = -DMNH -DSFX_MNH
CPPFLAGS_MNH += -Uvector -Upixel
#
# Gribex flags
diff --git a/src/Rules.LXnvhpc2202.mk b/src/Rules.LXnvhpc2202.mk
index ac1d757731bf484eacaf15b36b3f621d6077d09d..a6d8a5c76ff6540c53115c0e596d581daf3c151e 100644
--- a/src/Rules.LXnvhpc2202.mk
+++ b/src/Rules.LXnvhpc2202.mk
@@ -212,7 +212,7 @@ CPPFLAGS_SURFEX =
CPPFLAGS_SURCOUCHE += -DMNH_COMPILER_NVHPC
CPPFLAGS_RAD =
CPPFLAGS_NEWLFI = -DSWAPIO -DLINUX -DLFI_INT=${LFI_INT}
-CPPFLAGS_MNH = -DMNH=MNH -DMNH_PGI -DSFX_MNH
+CPPFLAGS_MNH = -DMNH=MNH -DSFX_MNH
CPPFLAGS_MNH += -Uvector -Upixel
CPPFLAGS_MNH += -DMNH_EXPAND -DMNH_EXPAND_OPENACC
#CPPFLAGS_MNH += -imacros MNH_OPENACC_NV_CR.CPP
diff --git a/src/Rules.LXpgi.mk b/src/Rules.LXpgi.mk
index ac1886174809e2e97d0c2855efb4c578b15c2542..23873cc73e475d66f507118f665c016d5142e27e 100644
--- a/src/Rules.LXpgi.mk
+++ b/src/Rules.LXpgi.mk
@@ -149,7 +149,7 @@ CPPFLAGS_SURFEX =
CPPFLAGS_SURCOUCHE +=
CPPFLAGS_RAD =
CPPFLAGS_NEWLFI = -DSWAPIO -DLINUX -DLFI_INT=${LFI_INT}
-CPPFLAGS_MNH = -DMNH -DMNH_PGI -DSFX_MNH
+CPPFLAGS_MNH = -DMNH -DSFX_MNH
CPPFLAGS_MNH += -Uvector -Upixel
#
# BITREP flags
diff --git a/src/Rules.LXpgi2004.mk b/src/Rules.LXpgi2004.mk
index f8b4c207367eb329b501b3a331a28adb54768b2d..4b885153b276af794abd08a20670cbb82c4879c9 100644
--- a/src/Rules.LXpgi2004.mk
+++ b/src/Rules.LXpgi2004.mk
@@ -185,7 +185,7 @@ CPPFLAGS_SURFEX =
CPPFLAGS_SURCOUCHE +=
CPPFLAGS_RAD =
CPPFLAGS_NEWLFI = -DSWAPIO -DLINUX -DLFI_INT=${LFI_INT}
-CPPFLAGS_MNH = -DMNH -DMNH_PGI -DSFX_MNH
+CPPFLAGS_MNH = -DMNH -DSFX_MNH
CPPFLAGS_MNH += -Uvector -Upixel
#
# Gribex flags