diff --git a/src/LIB/SURCOUCHE/src/mode_io_field_write.f90 b/src/LIB/SURCOUCHE/src/mode_io_field_write.f90
index 8d44c988922528505514f7691eb5d1d2edf1ec74..88ce5e5fa7cbb6e743a72f83b3d952eb6720fccc 100644
--- a/src/LIB/SURCOUCHE/src/mode_io_field_write.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io_field_write.f90
@@ -2777,6 +2777,8 @@ DO JI = 1,SIZE(TPOUTPUT%NFIELDLIST)
call Print_msg( NVERB_ERROR, 'IO', 'IO_Fieldlist_write', trim(tfieldlist(idx)%cmnhname)// &
': CLBTYPE/=NONE not allowed for 1D logical fields' )
END IF
+#if 0
+!PW: BUG?: disabled with PGI compiler 19.01 (compiler crash)
!
!1D string
!
@@ -2795,6 +2797,7 @@ DO JI = 1,SIZE(TPOUTPUT%NFIELDLIST)
call Print_msg( NVERB_ERROR, 'IO', 'IO_Fieldlist_write', trim(tfieldlist(idx)%cmnhname)// &
': CLBTYPE/=NONE not allowed for 1D character fields' )
END IF
+#endif
!
!1D other types
!
diff --git a/src/LIB/SURCOUCHE/src/mode_io_write_nc4.f90 b/src/LIB/SURCOUCHE/src/mode_io_write_nc4.f90
index ebd476354fc5dba27d7ebfd8eb33b5adc5f3cf80..f79e1cb148cc9264c8197fba25ef23557bdc061d 100644
--- a/src/LIB/SURCOUCHE/src/mode_io_write_nc4.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io_write_nc4.f90
@@ -861,7 +861,7 @@ IF (STATUS /= NF90_NOERR) THEN
! Define the variable
STATUS = NF90_DEF_VAR(INCID, YVARNAME, MNHINT_NF90, IVDIMS, IVARID)
- IF (status /= NF90_NOERR) CALL IO_Err_handle_nc4(status,'IO_WRITE_FIELD_NC4_N1','NF90_DEF_VAR',trim(YVARNAME))
+ IF (status /= NF90_NOERR) CALL IO_Err_handle_nc4(status,'IO_Field_write_nc4_N1','NF90_DEF_VAR',trim(YVARNAME))
ELSE
GEXISTED = .TRUE.
CALL PRINT_MSG(NVERB_WARNING,'IO','IO_Field_write_nc4_N1',TRIM(TPFILE%CNAME)//': '//TRIM(YVARNAME)//' already defined')
diff --git a/src/LIB/SURCOUCHE/src/mode_mppdb.f90 b/src/LIB/SURCOUCHE/src/mode_mppdb.f90
index f0cdedf531bd24cbe8a63eb28b2ac5f3b59b5944..460962753e1ae4d0c34b386e4b2ec7171c896fe1 100644
--- a/src/LIB/SURCOUCHE/src/mode_mppdb.f90
+++ b/src/LIB/SURCOUCHE/src/mode_mppdb.f90
@@ -90,7 +90,6 @@ MODULE MODE_MPPDB
USE MODE_MNH_WORLD , ONLY : INIT_NMNH_COMM_WORLD
USE MODD_VAR_ll , ONLY : NMNH_COMM_WORLD
!JUANZ
- USE MODD_MPIF
IMPLICIT NONE
@@ -1870,7 +1869,7 @@ MODULE MODE_MPPDB
ALLOCATE(TAB_SON_ll(IIU_SON_ll,IJU_SON_ll,IKU_SON_ll))
!
CALL MPI_RECV(TAB_SON_ll,SIZE(TAB_SON_ll),MNHREAL_MPI,I_FIRST_SON, &
- ITAG, MPPDB_INTRA_COMM,MPI_STATUS_IGNORE, IINFO_ll)
+ NTAG, MPPDB_INTRA_COMM,MPI_STATUS_IGNORE, IINFO_ll)
!
IDIFF_HEXT = MIN(JPHEXT,IHEXT_SON_ll)
!
@@ -1920,9 +1919,9 @@ MODULE MODE_MPPDB
I_FIRST_FATHER = 0
IHEXT_SON_ll = JPHEXT
CALL MPI_BSEND(IHEXT_SON_ll,1,MPI_INTEGER,I_FIRST_FATHER, &
- ITAG, MPPDB_INTRA_COMM, IINFO_ll)
+ NTAG, MPPDB_INTRA_COMM, IINFO_ll)
CALL MPI_BSEND(PLB,SIZE(PLB),MNHREAL_MPI,I_FIRST_FATHER, &
- ITAG, MPPDB_INTRA_COMM, IINFO_ll)
+ NTAG, MPPDB_INTRA_COMM, IINFO_ll)
END IF
END IF
diff --git a/src/MNH/advec_4th_order_aux.f90 b/src/MNH/advec_4th_order_aux.f90
index 47579b54c905adf48cfb76555992c13f4b2c9304..fc56999ac43116470dadbdac2477333accd25bcc 100644
--- a/src/MNH/advec_4th_order_aux.f90
+++ b/src/MNH/advec_4th_order_aux.f90
@@ -12,10 +12,7 @@ INTERFACE
SUBROUTINE ADVEC_4TH_ORDER_ALGO(HLBCX, HLBCY, PFIELDT, KGRID, &
PMEANX, PMEANY,TPHALO2 )
!
-USE MODE_ll
-!
-USE MODD_CONF
-USE MODD_ARGSLIST_ll, ONLY : HALO2LIST_ll
+USE MODD_ARGSLIST_ll, ONLY : HALO2_ll
!
CHARACTER (LEN=4), DIMENSION(2), INTENT(IN) :: HLBCX ! X direction LBC type
CHARACTER (LEN=4), DIMENSION(2), INTENT(IN) :: HLBCY ! Y direction LBC type
@@ -108,12 +105,13 @@ END MODULE MODI_ADVEC_4TH_ORDER_AUX
!* 0. DECLARATIONS
! ------------
!
-USE MODD_ARGSLIST_ll, ONLY: HALO2LIST_ll
+USE MODD_ARGSLIST_ll, ONLY: HALO2_ll
USE MODD_CONF
!
#ifdef _OPENACC
USE MODE_DEVICE
#endif
+use mode_ll, only: LWEST_ll, LEAST_ll, LNORTH_ll, LSOUTH_ll
!
IMPLICIT NONE
!
diff --git a/src/MNH/advection_metsv.f90 b/src/MNH/advection_metsv.f90
index e178f2fffeb22f12126b5e18ab0a503bf56cf5c0..3a69a99d0249cc0ebea90194670129390ed0231e 100644
--- a/src/MNH/advection_metsv.f90
+++ b/src/MNH/advection_metsv.f90
@@ -152,8 +152,9 @@ END MODULE MODI_ADVECTION_METSV
!
#ifdef _OPENACC
USE MODD_MPIF
-USE MODD_PARAMETERS_ll, ONLY : JPVEXT
-USE MODD_VAR_ll, ONLY : MPI_PRECISION,NMNH_COMM_WORLD
+USE MODD_PARAMETERS_ll, ONLY: JPVEXT
+use modd_precision, only: MNHREAL_MPI
+USE MODD_VAR_ll, ONLY: NMNH_COMM_WORLD
#endif
USE MODD_BUDGET
USE MODD_CST
@@ -516,10 +517,10 @@ ZCFLW_MAX = MAXVAL(ZCFLW(IIB:IIE,IJB:IJE,IKB:IKE))
ZCFL_MAX = MAXVAL(ZCFL (IIB:IIE,IJB:IJE,IKB:IKE))
!$acc end kernels
!
-CALL MPI_ALLREDUCE(MPI_IN_PLACE,ZCFLU_MAX,1,MPI_PRECISION,MPI_MAX,NMNH_COMM_WORLD,IINFO_ll)
-CALL MPI_ALLREDUCE(MPI_IN_PLACE,ZCFLV_MAX,1,MPI_PRECISION,MPI_MAX,NMNH_COMM_WORLD,IINFO_ll)
-CALL MPI_ALLREDUCE(MPI_IN_PLACE,ZCFLW_MAX,1,MPI_PRECISION,MPI_MAX,NMNH_COMM_WORLD,IINFO_ll)
-CALL MPI_ALLREDUCE(MPI_IN_PLACE,ZCFL_MAX,1,MPI_PRECISION,MPI_MAX,NMNH_COMM_WORLD,IINFO_ll)
+CALL MPI_ALLREDUCE(MPI_IN_PLACE,ZCFLU_MAX,1,MNHREAL_MPI,MPI_MAX,NMNH_COMM_WORLD,IINFO_ll)
+CALL MPI_ALLREDUCE(MPI_IN_PLACE,ZCFLV_MAX,1,MNHREAL_MPI,MPI_MAX,NMNH_COMM_WORLD,IINFO_ll)
+CALL MPI_ALLREDUCE(MPI_IN_PLACE,ZCFLW_MAX,1,MNHREAL_MPI,MPI_MAX,NMNH_COMM_WORLD,IINFO_ll)
+CALL MPI_ALLREDUCE(MPI_IN_PLACE,ZCFL_MAX,1,MNHREAL_MPI,MPI_MAX,NMNH_COMM_WORLD,IINFO_ll)
#endif
!
WRITE(ILUOUT,FMT='(A24,F10.2,A5,F10.2,A5,F10.2,A9,F10.2)') &
diff --git a/src/MNH/drag_veg.f90 b/src/MNH/drag_veg.f90
index a506eec2a214034a8e8f45f73517c053cff698df..ce157a15406a436c180f33162b87687868ab56a1 100644
--- a/src/MNH/drag_veg.f90
+++ b/src/MNH/drag_veg.f90
@@ -1,4 +1,3 @@
-
!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
diff --git a/src/MNH/ice4_sedimentation_split.f90 b/src/MNH/ice4_sedimentation_split.f90
index 3fa821cb8baa4d7b34405a5188f950b9c8d46f62..aa453f1124a1c739a6ff65aea31716d1c1a1758f 100644
--- a/src/MNH/ice4_sedimentation_split.f90
+++ b/src/MNH/ice4_sedimentation_split.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_ICE4_SEDIMENTATION_SPLIT
INTERFACE
SUBROUTINE ICE4_SEDIMENTATION_SPLIT(KIB, KIE, KIT, KJB, KJE, KJT, KKB, KKE, KKTB, KKTE, KKT, KKL, &
diff --git a/src/MNH/ice4_tendencies.f90 b/src/MNH/ice4_tendencies.f90
index 3ff803442c74c5182a415b76ac5887cc359b92d9..099ad15be63663af96c89ec066073f6a979dadf9 100644
--- a/src/MNH/ice4_tendencies.f90
+++ b/src/MNH/ice4_tendencies.f90
@@ -5,7 +5,7 @@
MODULE MODI_ICE4_TENDENCIES
INTERFACE
SUBROUTINE ICE4_TENDENCIES(KSIZE, KIB, KIE, KIT, KJB, KJE, KJT, KKB, KKE, KKT, KKL, &
- &KRR, OLDSOFT, ODCOMPUTE, &
+ &KRR, ODSOFT, ODCOMPUTE, &
&OWARM, HSUBG_RC_RR_ACCR, HSUBG_RR_EVAP, HSUBG_AUCV_RC, HSUBG_PR_PDF, &
&PEXN, PRHODREF, PLVFACT, PLSFACT, LDMICRO, K1, K2, K3, &
&PPRES, PCF, PSIGMA_RC, &
@@ -28,7 +28,7 @@ SUBROUTINE ICE4_TENDENCIES(KSIZE, KIB, KIE, KIT, KJB, KJE, KJT, KKB, KKE, KKT, K
IMPLICIT NONE
INTEGER, INTENT(IN) :: KSIZE, KIB, KIE, KIT, KJB, KJE, KJT, KKB, KKE, KKT, KKL
INTEGER, INTENT(IN) :: KRR
-LOGICAL, INTENT(IN) :: OLDSOFT
+LOGICAL, INTENT(IN) :: ODSOFT
LOGICAL, DIMENSION(KSIZE), INTENT(IN) :: ODCOMPUTE
LOGICAL, INTENT(IN) :: OWARM
CHARACTER*80, INTENT(IN) :: HSUBG_RC_RR_ACCR
@@ -132,7 +132,7 @@ END SUBROUTINE ICE4_TENDENCIES
END INTERFACE
END MODULE MODI_ICE4_TENDENCIES
SUBROUTINE ICE4_TENDENCIES(KSIZE, KIB, KIE, KIT, KJB, KJE, KJT, KKB, KKE, KKT, KKL, &
- &KRR, OLDSOFT, ODCOMPUTE, &
+ &KRR, ODSOFT, ODCOMPUTE, &
&OWARM, HSUBG_RC_RR_ACCR, HSUBG_RR_EVAP, HSUBG_AUCV_RC, HSUBG_PR_PDF, &
&PEXN, PRHODREF, PLVFACT, PLSFACT, LDMICRO, K1, K2, K3, &
&PPRES, PCF, PSIGMA_RC, &
@@ -198,7 +198,7 @@ IMPLICIT NONE
!
INTEGER, INTENT(IN) :: KSIZE, KIB, KIE, KIT, KJB, KJE, KJT, KKB, KKE, KKT, KKL
INTEGER, INTENT(IN) :: KRR
-LOGICAL, INTENT(IN) :: OLDSOFT
+LOGICAL, INTENT(IN) :: ODSOFT
LOGICAL, DIMENSION(KSIZE), INTENT(IN) :: ODCOMPUTE
LOGICAL, INTENT(IN) :: OWARM
CHARACTER*80, INTENT(IN) :: HSUBG_RC_RR_ACCR
@@ -299,7 +299,7 @@ REAL, DIMENSION(KSIZE), INTENT(OUT) :: PHLC_HRC
REAL, DIMENSION(KSIZE), INTENT(OUT) :: PHLC_LRC
REAL, DIMENSION(KIT,KJT,KKT), INTENT(OUT) :: PRAINFR ! Rain fraction
!
-!$acc declare present(KSIZE,KIB,KIE,KIT,KJB,KJE,KJT,KKB,KKE,KKT,KKL,KRR,OLDSOFT, &
+!$acc declare present(KSIZE,KIB,KIE,KIT,KJB,KJE,KJT,KKB,KKE,KKT,KKL,KRR,ODSOFT, &
!$acc& OWARM,HSUBG_RC_RR_ACCR,HSUBG_RR_EVAP,HSUBG_AUCV_RC,HSUBG_PR_PDF)
!$acc declare present(ODCOMPUTE,PEXN,PRHODREF,PLVFACT,PLSFACT,LDMICRO,K1,K2,K3,PPRES,PCF,PCIT,PT,PTHT, &
!$acc& PRVT,PRCT,PRRT,PRIT,PRST,PRGT,PRHT,PRRT3D,PSIGMA_RC,PRVHENI_MR,PRRHONG_MR,PRIMLTC_MR, &
@@ -381,8 +381,8 @@ END IF
!
!Workaround of PGI bug with OpenACC (at least up to 18.10 version)
!$acc kernels
-GDSOFT = OLDSOFT
-GWARM = OWARM
+GDSOFT = ODSOFT
+GWARM = OWARM
!$acc end kernels
!
!$acc data copyin(GDSOFT)
diff --git a/src/MNH/mnhget_surf_paramn.f90 b/src/MNH/mnhget_surf_paramn.f90
index 68acc7781cd1933dcdd35bb441b15e60351dd45b..238c9d4ae495de607bf0ea77ffb853acefb7952b 100644
--- a/src/MNH/mnhget_surf_paramn.f90
+++ b/src/MNH/mnhget_surf_paramn.f90
@@ -1,4 +1,3 @@
-
!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
diff --git a/src/MNH/ppm.f90 b/src/MNH/ppm.f90
index 2cf8d3c6c3d040f61fd55ce5b6283947a834c776..d24e1d12bbb4bfc42249f80bbe6daa2a04414c6e 100644
--- a/src/MNH/ppm.f90
+++ b/src/MNH/ppm.f90
@@ -3238,7 +3238,7 @@ END FUNCTION PPM_S0_Z
PTSTEP, PR)
! ########################################################################
USE MODE_ll
-USE MODE_IO_ll
+USE MODE_IO
#ifndef _OPENACC
USE MODI_SHUMAN
#else
@@ -3583,7 +3583,7 @@ END FUNCTION PPM_S1_X
PTSTEP, PR)
! ########################################################################
USE MODE_ll
-USE MODE_IO_ll
+USE MODE_IO
#ifndef _OPENACC
USE MODI_SHUMAN
#else
@@ -3935,7 +3935,7 @@ END FUNCTION PPM_S1_Y
PTSTEP, PR)
! ########################################################################
USE MODE_ll
-USE MODE_IO_ll
+USE MODE_IO
#ifndef _OPENACC
USE MODI_SHUMAN
#else
diff --git a/src/MNH/resolved_cloud.f90 b/src/MNH/resolved_cloud.f90
index 78e14a357529a973f4b6409088f60b1fd8f9288b..40ea2e911f569c2c532917b54c1e4d3c8cd2aee8 100644
--- a/src/MNH/resolved_cloud.f90
+++ b/src/MNH/resolved_cloud.f90
@@ -328,9 +328,8 @@ IMPLICIT NONE
!
!
!
-CHARACTER(LEN=4), INTENT(IN) :: HCLOUD ! kind of cloud
+CHARACTER(LEN=4), INTENT(IN) :: HCLOUD ! kind of cloud paramerization
CHARACTER(LEN=4), INTENT(IN) :: HACTCCN ! kind of CCN activation scheme
- ! paramerization
CHARACTER(LEN=4), INTENT(IN) :: HSCONV ! Shallow convection scheme
CHARACTER(LEN=4), INTENT(IN) :: HMF_CLOUD! Type of statistical cloud
INTEGER, INTENT(IN) :: KRR ! Number of moist variables
@@ -395,7 +394,6 @@ LOGICAL, INTENT(IN) :: OACTIT ! Switch to activate the
! evolution in C2R2 and KHKO
LOGICAL, INTENT(IN) :: OSEDC ! Switch to activate the
! cloud droplet sedimentation
- ! for C2R2 or KHKO
LOGICAL, INTENT(IN) :: OSEDI ! Switch to activate the
! cloud crystal sedimentation
LOGICAL, INTENT(IN) :: ORAIN ! Switch to activate the
@@ -631,7 +629,7 @@ IF (HCLOUD(1:3)=='ICE' .AND. LRED) THEN
ALLOCATE(ZRSMIN(SIZE(XRTMIN)))
ZRSMIN(:) = XRTMIN(:) / PTSTEP
!$acc end kernels
-ENDIF
+END IF
!
!* 2. TRANSFORMATION INTO PHYSICAL TENDENCIES
! ---------------------------------------
diff --git a/src/MNH/tke_eps_sources.f90 b/src/MNH/tke_eps_sources.f90
index ed98e4519bb820e5dd4793416885b8460cf513c4..25beedd59180b2e26b9d044e521a7db47207ac63 100644
--- a/src/MNH/tke_eps_sources.f90
+++ b/src/MNH/tke_eps_sources.f90
@@ -501,7 +501,6 @@ END IF
!$acc kernels
PRTHLS(:,:,:) = PRTHLS(:,:,:) + XCED * SQRT(PTKEM(:,:,:)) / PLEPS(:,:,:) * &
(PEXPL*PTKEM(:,:,:) + PIMPL*ZRES(:,:,:)) * PRHODJ(:,:,:) * PCOEF_DISS(:,:,:)
-PDISS(:,:,:) = -XCED * (PTKEM(:,:,:)**1.5) / PLEPS(:,:,:)
!
!----------------------------------------------------------------------------
!
diff --git a/src/MNH/tridiag_thermo.f90 b/src/MNH/tridiag_thermo.f90
index aa0bf75979681974c8b5a65b5291b29c1a352745..a92e811388c133262dae56adec5501ca3d80d983 100644
--- a/src/MNH/tridiag_thermo.f90
+++ b/src/MNH/tridiag_thermo.f90
@@ -249,7 +249,6 @@ ZY(:,:,IKB) = PRHODJ(:,:,IKB)*PVARM(:,:,IKB)/PTSTEP &
- ZRHODJ_DFDDTDZ_O_DZ2(:,:,IKB+KKL) * PIMPL * PVARM(:,:,IKB )
!$acc end kernels
!
-! array notation
!$acc kernels async
ZY(:,:,IKTB+1:IKTE-1) = PRHODJ(:,:,IKTB+1:IKTE-1)*PVARM(:,:,IKTB+1:IKTE-1)/PTSTEP &
- ZMZM_RHODJ(:,:,IKTB+1+KKL:IKTE-1+KKL) * PF(:,:,IKTB+1+KKL:IKTE-1+KKL)/PDZZ(:,:,IKTB+1+KKL:IKTE-1+KKL) &
@@ -285,7 +284,6 @@ IF ( PIMPL > 1.E-10 ) THEN
!
!$acc kernels async
ZC(:,:,IKB) = ZRHODJ_DFDDTDZ_O_DZ2(:,:,IKB+KKL) * PIMPL
-
!$acc end kernels
!
!$acc kernels async
diff --git a/src/MNH/tridiag_w.f90 b/src/MNH/tridiag_w.f90
index eebf1cf75d50b7aaf4a4c05b852a21a75ee3a3ab..57eaef202f43ce5637ed8781f3874c082a04e30f 100644
--- a/src/MNH/tridiag_w.f90
+++ b/src/MNH/tridiag_w.f90
@@ -249,17 +249,6 @@ ZY(:,:,IKB) = ZMZM_RHODJ(:,:,IKB)*PVARM(:,:,IKB)/PTSTEP &
- ZRHODJ_DFDDWDZ_O_DZ2(:,:,IKB) * PVARM(:,:,IKB )
!$acc end kernels
!
-! DO JK=IKB+1,IKE-1
-! !$acc kernels
-! ZY(:,:,JK) = ZMZM_RHODJ(:,:,JK)*PVARM(:,:,JK)/PTSTEP &
-! - PRHODJ(:,:,JK ) * PF(:,:,JK )/PMZF_DZZ(:,:,JK ) &
-! + PRHODJ(:,:,JK-1) * PF(:,:,JK-1)/PMZF_DZZ(:,:,JK-1) &
-! + ZRHODJ_DFDDWDZ_O_DZ2(:,:,JK ) * PVARM(:,:,JK+1) &
-! - ZRHODJ_DFDDWDZ_O_DZ2(:,:,JK ) * PVARM(:,:,JK ) &
-! - ZRHODJ_DFDDWDZ_O_DZ2(:,:,JK-1) * PVARM(:,:,JK ) &
-! + ZRHODJ_DFDDWDZ_O_DZ2(:,:,JK-1) * PVARM(:,:,JK-1)
-! !$acc end kernels
-! END DO
!$acc kernels async
ZY(:,:,IKB+1:IKE-1) = ZMZM_RHODJ(:,:,IKB+1:IKE-1)*PVARM(:,:,IKB+1:IKE-1)/PTSTEP &
- PRHODJ(:,:,IKB+1:IKE-1 ) * PF(:,:,IKB+1:IKE-1 )/PMZF_DZZ(:,:,IKB+1:IKE-1 ) &
@@ -300,15 +289,6 @@ ZY(:,:,IKE) = ZMZM_RHODJ(:,:,IKE)*PVARM(:,:,IKE)/PTSTEP &
ZC(:,:,IKB) = ZRHODJ_DFDDWDZ_O_DZ2(:,:,IKB)
!$acc end kernels
-! DO JK=IKB+1,IKE-1
-! !$acc kernels
-! ZA(:,:,JK) = ZRHODJ_DFDDWDZ_O_DZ2(:,:,JK-1)
-! ZB(:,:,JK) = ZMZM_RHODJ(:,:,JK)/PTSTEP &
-! - ZRHODJ_DFDDWDZ_O_DZ2(:,:,JK ) &
-! - ZRHODJ_DFDDWDZ_O_DZ2(:,:,JK-1)
-! ZC(:,:,JK) = ZRHODJ_DFDDWDZ_O_DZ2(:,:,JK )
-! !$acc end kernels
-! END DO
!$acc kernels async
ZA(:,:,IKB+1:IKE-1) = ZRHODJ_DFDDWDZ_O_DZ2(:,:,IKB:IKE-2)
ZB(:,:,IKB+1:IKE-1) = ZMZM_RHODJ(:,:,IKB+1:IKE-1)/PTSTEP &
diff --git a/src/MNH/tridiag_wind.f90 b/src/MNH/tridiag_wind.f90
index 4a4a3092b49d260835a48cdf9d5ce51ff1302afe..9f769b152e3547eaa2b6118a72a9d84b09a59b35 100644
--- a/src/MNH/tridiag_wind.f90
+++ b/src/MNH/tridiag_wind.f90
@@ -211,15 +211,6 @@ ZY(:,:,IKB) = PVARM(:,:,IKB) + PTSTEP*PSOURCE(:,:,IKB) - &
PEXPL / PRHODJA(:,:,IKB) * PA(:,:,IKB+KKL) * (PVARM(:,:,IKB+KKL) - PVARM(:,:,IKB))
!$acc end kernels
!
-! DO JK=IKTB+1,IKTE-1
-! ZY(:,:,JK)= PVARM(:,:,JK) + PTSTEP*PSOURCE(:,:,JK) - &
-! PEXPL / PRHODJA(:,:,JK) * &
-! ( PVARM(:,:,JK-KKL)*PA(:,:,JK) &
-! -PVARM(:,:,JK)*(PA(:,:,JK)+PA(:,:,JK+KKL)) &
-! +PVARM(:,:,JK+KKL)*PA(:,:,JK+KKL) &
-! )
-! END DO
- !array notation
!$acc kernels async
ZY(:,:,IKTB+1:IKTE-1)= PVARM(:,:,IKTB+1:IKTE-1) + PTSTEP*PSOURCE(:,:,IKTB+1:IKTE-1) - &
PEXPL / PRHODJA(:,:,IKTB+1:IKTE-1) * &
diff --git a/src/MNH/turb.f90 b/src/MNH/turb.f90
index 03573095bad297e5abc533d0e8cd7db033630516..6f599fade16126e0a60b6ac8225aad05037bb095 100644
--- a/src/MNH/turb.f90
+++ b/src/MNH/turb.f90
@@ -656,7 +656,7 @@ ZRVORD= XRV / XRD
!$acc update device(PTHLT,PRT)
!$acc kernels
!Copy data into ZTHLM and ZRM only if needed
-IF (HTURBLEN=='BL89' .OR. ORMC01) THEN
+IF (HTURBLEN=='BL89' .OR. HTURBLEN=='RM17' .OR. ORMC01) THEN
ZTHLM(:,:,:) = PTHLT(:,:,:)
ZRM(:,:,:,:) = PRT(:,:,:,:)
END IF
@@ -1237,11 +1237,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN
TZFIELD%NTYPE = TYPEREAL
TZFIELD%NDIMS = 3
TZFIELD%LTIMEDEP = .TRUE.
-<<<<<<< HEAD
- CALL IO_WRITE_FIELD(TPFILE,TZFIELD,PLEM)
-=======
- CALL IO_Field_write(TPFILE,TZFIELD,ZLM)
->>>>>>> MNH-55X
+ CALL IO_Field_write(TPFILE,TZFIELD,PLEM)
!
IF (KRR /= 0) THEN
!
@@ -1767,10 +1763,8 @@ REAL, DIMENSION(SIZE(PTHLT,1),SIZE(PTHLT,2),SIZE(PTHLT,3)) :: ZTMP1_DEVICE,ZTMP2
!
! initialize the mixing length with the mesh grid
!$acc kernels
+! 1D turbulence scheme
PLM(:,:,IKTB:IKTE) = PZZ(:,:,IKTB+KKL:IKTE+KKL) - PZZ(:,:,IKTB:IKTE)
-!DO JK = IKTB,IKTE ! 1D turbulence scheme
-! PLM(:,:,JK) = PZZ(:,:,JK+KKL) - PZZ(:,:,JK)
-!END DO
PLM(:,:,KKU) = PLM(:,:,IKE)
PLM(:,:,KKA) = PZZ(:,:,IKB) - PZZ(:,:,KKA)
!$acc end kernels
diff --git a/src/MNH/turb_hor_thermo_flux.f90 b/src/MNH/turb_hor_thermo_flux.f90
index 540ac628ba3028a0cadaf92d425605e1e0d7d4dc..896d992b5fecbe1caba87d4d7726874b6655779a 100644
--- a/src/MNH/turb_hor_thermo_flux.f90
+++ b/src/MNH/turb_hor_thermo_flux.f90
@@ -837,7 +837,7 @@ END IF
TZFIELD%NTYPE = TYPEREAL
TZFIELD%NDIMS = 3
TZFIELD%LTIMEDEP = .TRUE.
- CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLX)
+ CALL IO_Field_write(TPFILE,TZFIELD,ZFLX)
END IF
!
IF (KSPLT==1 .AND. LLES_CALL) THEN
@@ -1218,7 +1218,7 @@ IF ( OCLOSE_OUT .AND. OTURB_FLX ) THEN
TZFIELD%NTYPE = TYPEREAL
TZFIELD%NDIMS = 3
TZFIELD%LTIMEDEP = .TRUE.
- CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLX)
+ CALL IO_Field_write(TPFILE,TZFIELD,ZFLX)
END IF
!
IF (KSPLT==1 .AND. LLES_CALL) THEN
@@ -1554,7 +1554,7 @@ IF (KRR/=0) THEN
TZFIELD%NTYPE = TYPEREAL
TZFIELD%NDIMS = 3
TZFIELD%LTIMEDEP = .TRUE.
- CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLX)
+ CALL IO_Field_write(TPFILE,TZFIELD,ZFLX)
END IF
!
IF (KSPLT==1 .AND. LLES_CALL) THEN
diff --git a/src/configure b/src/configure
index 06328f15970bf4de1132717556e2b53a4cc1f0ee..03587c46eabf707d695b0a7dc7226288298d306f 100755
--- a/src/configure
+++ b/src/configure
@@ -324,20 +324,6 @@ export I_MPI_PIN_PROCESSOR_LIST=all:map=spread
"}
;;
-'Linux occigen'*)
- export ARCH=${ARCH:-LXifort}
- export VER_MPI=${VER_MPI:-MPIINTEL}
- export OPTLEVEL=${OPTLEVEL:-O2}
- export VER_CDF=${VER_CDF:-CDFAUTO}
- export MNHENV=${MNHENV:-"
-ulimit -s unlimited
-module load intel/15.0.0.090
-module load intelmpi/5.0.1.035
-export SLURM_CPU_BIND=none
-export I_MPI_PIN_PROCESSOR_LIST=all:map=spread
-"}
- ;;
-
Linux*)
export ARCH=${ARCH:-LXgfortran}
export VER_MPI=${VER_MPI:-MPIVIDE}