diff --git a/src/MNH/advection_metsv.f90 b/src/MNH/advection_metsv.f90
index b846cefbaf48e614406154b4dc6a8720d08d7972..d2e8df403d594c60e03f029ff88f576fdea7220a 100644
--- a/src/MNH/advection_metsv.f90
+++ b/src/MNH/advection_metsv.f90
@@ -423,8 +423,7 @@ CALL MNH_GET_ZT3D(IZ1, IZ2)
!
IF(LBLOWSNOW) THEN ! Put 2D Canopy blowing snow variables into a 3D array for advection
#ifdef _OPENACC
- PRINT *,'OPENACC: ADVECTION_METSV::LBLOWSNOW not yet implemented'
- CALL ABORT
+ call Print_msg( NVERB_ERROR, 'GEN', 'ADVECTION_METSV', 'OpenACC: LBLOWSNOW not yet implemented' )
#endif
ZSNWC_INIT = 0.
ZRSNWCS = 0.
@@ -935,8 +934,7 @@ END IF
!
IF ((HCLOUD == 'KHKO') .OR. (HCLOUD == 'C2R2')) THEN
#ifdef _OPENACC
- PRINT *,'OPENACC: ADVECTION_METSV::HCLOUD=''KHKO'' OR ''C2R2'' not yet implemented'
- CALL ABORT
+ call Print_msg( NVERB_ERROR, 'GEN', 'ADVECTION_METSV', 'OpenACC: HCLOUD=''KHKO'' OR ''C2R2'' not yet implemented' )
#endif
ZEXN(:,:,:)= (PPABST(:,:,:)/XP00)**(XRD/XCPD)
ZT(:,:,:)= PTHT(:,:,:)*ZEXN(:,:,:)
diff --git a/src/MNH/advection_uvw.f90 b/src/MNH/advection_uvw.f90
index 9bc529b5f638daab2f2e5a0e2bd0544c2a10c57a..df15f611e9e59212c211fde6335f695a47728e51 100644
--- a/src/MNH/advection_uvw.f90
+++ b/src/MNH/advection_uvw.f90
@@ -295,8 +295,7 @@ SELECT CASE (HTEMP_SCHEME)
CASE('RK65')
ISPL = 6
CASE DEFAULT
- PRINT *,'ERROR: UNKNOWN HTEMP_SCHEME'
- CALL ABORT()
+ call Print_msg( NVERB_FATAL, 'GEN', 'ADVECTION_UVW', 'unknown htemp_scheme' )
END SELECT
!
CALL MNH_GET_ZT3D(IZUT, IZVT, IZWT, IZ1, IZ2)
diff --git a/src/MNH/advection_uvw_cen.f90 b/src/MNH/advection_uvw_cen.f90
index 888ef5cc75cf4b356429b1056e5bc39b92e5baf8..45885968129f284481c757b4ce862236b1fb9f5e 100644
--- a/src/MNH/advection_uvw_cen.f90
+++ b/src/MNH/advection_uvw_cen.f90
@@ -116,6 +116,7 @@ USE MODI_BUDGET
#ifdef _OPENACC
USE MODE_DEVICE
USE MODE_MNH_ZWORK, ONLY : ZT3D, MNH_GET_ZT3D , MNH_REL_ZT3D
+use mode_msg
#endif
!
!-------------------------------------------------------------------------------
@@ -290,8 +291,7 @@ ZRWS(:,:,:) = PWM(:,:,:) * ZMZM_RHODJ(:,:,:)/(2.*PTSTEP)
IF (HUVW_ADV_SCHEME=='CEN2ND' ) THEN
!
#ifdef _OPENACC
-PRINT *,'OPENACC: advection_uvw_cen::ADVECUVW_2ND not yet implemented'
-CALL ABORT
+ call Print_msg( NVERB_ERROR, 'GEN', 'ADVECTION_UVW_CEN', 'OpenACC: CEN2ND not yet implemented' )
#endif
CALL ADVECUVW_2ND (PUT,PVT,PWT,ZRUCT,ZRVCT,ZRWCT,ZRUS,ZRVS,ZRWS)
!
diff --git a/src/MNH/contrav.f90 b/src/MNH/contrav.f90
index 4a1d6da58d6444c57391d01c29ded49a742aa271..e4556009d3fc48d1f55fda0c24d28a5b4319fa67 100644
--- a/src/MNH/contrav.f90
+++ b/src/MNH/contrav.f90
@@ -524,17 +524,19 @@ END SUBROUTINE CONTRAV
!
!* 0. DECLARATIONS
! ------------
+USE MODD_ARGSLIST_ll, ONLY: HALO2LIST_ll
USE MODD_CONF
+USE MODD_GRID_n, ONLY: XZZ
USE MODD_PARAMETERS
-USE MODD_GRID_n, ONLY: XZZ
!
-USE MODD_ARGSLIST_ll, ONLY : HALO2LIST_ll
USE MODE_ll
+USE MODE_MPPDB
+#ifdef _OPENACC
+use mode_msg
+#endif
!
-USE MODI_SHUMAN
USE MODI_GET_HALO
-!
-USE MODE_MPPDB
+USE MODI_SHUMAN
!
IMPLICIT NONE
!
@@ -686,8 +688,7 @@ END IF
!
IF (KADV_ORDER == 2 ) THEN
#ifdef _OPENACC
-PRINT *,'OPENACC: contrav::KADV_ORDER=2 and LFLAT=.TRUE. not yet tested'
-CALL ABORT
+ call Print_msg( NVERB_WARNING, 'GEN', 'CONTRAV', 'OpenACC: KADV_ORDER=2 and LFLAT=.TRUE. not yet tested' )
#endif
!
!$acc loop independent collapse(3)
diff --git a/src/MNH/les_ver_int.f90 b/src/MNH/les_ver_int.f90
index 09740547c672e7ef85aad17984758df89ea14e7f..f87e87d153e3caa7b904778ca4ea975eb8192cde 100644
--- a/src/MNH/les_ver_int.f90
+++ b/src/MNH/les_ver_int.f90
@@ -150,6 +150,7 @@ USE MODD_LES
USE MODD_PARAMETERS
!
USE MODE_ll
+use mode_msg
!
USE MODI_VER_INTERP_LIN
!
@@ -169,7 +170,7 @@ INTEGER :: JK ! vertical loop counter
!
!-------------------------------------------------------------------------------
!
-PRINT *,'OPENACC: LES_VER_INT_DEVICE not yet tested'
+call Print_msg( NVERB_WARNING, 'GEN', 'LES_VER_INT_DEVICE', 'OpenACC: not yet tested' )
IF (CLES_LEVEL_TYPE=='K') THEN
!$acc kernels present_or_copyin(NLES_LEVELS)
DO JK = 1, NLES_K
@@ -187,10 +188,7 @@ ELSE IF (CLES_LEVEL_TYPE=='Z') THEN
!$acc end kernels
!$acc end data !present_or_copyin(NKLIN_CURRENT_LES,XCOEFLIN_CURRENT_LES)
ELSE
- PRINT*, '-------> STOP in LES_VER_INT_DEVICE <----------'
-!callabortstop
-CALL ABORT
- STOP
+ call Print_msg( NVERB_FATAL, 'GEN', 'LES_VER_INT', 'invalid CLES_LEVEL_TYPE (' // trim( CLES_LEVEL_TYPE ) // ')' )
END IF
!
!-------------------------------------------------------------------------------
diff --git a/src/MNH/mode_mnh_zwork.f90 b/src/MNH/mode_mnh_zwork.f90
index e98ade2724e42cc89e1c2d9827524062bb78b58b..255953083f5fa5b2791354146a2a2df7a98e17ad 100644
--- a/src/MNH/mode_mnh_zwork.f90
+++ b/src/MNH/mode_mnh_zwork.f90
@@ -1,5 +1,7 @@
MODULE MODE_MNH_ZWORK
+ use mode_msg
+
IMPLICIT NONE
INTEGER, SAVE :: IIB,IJB,IKB ! Begining useful area in x,y,z directions
@@ -21,7 +23,7 @@ MODULE MODE_MNH_ZWORK
REAL, SAVE, ALLOCATABLE , DIMENSION(:,:,:) :: ZUNIT3D
!acc declare device_resident(ZUNIT3D)
- INTEGER :: JPMAX_T3D = 40
+ INTEGER, parameter :: JPMAX_T3D = 40
INTEGER , ALLOCATABLE, DIMENSION (:) :: NT3D_POOL
INTEGER :: NT3D_TOP , NT3D_TOP_MAX = 0
!REAL , ALLOCATABLE, DIMENSION(:,:,:,:) , TARGET :: ZT3D_A1,ZT3D_A2,ZT3D_A3,ZT3D_A4
@@ -124,14 +126,12 @@ CONTAINS
INTEGER :: KTEMP
IF (NT3D_TOP == JPMAX_T3D ) THEN
- print*," MNH_GET_ZT3D JPMAX_T3D OVER FLOW=", JPMAX_T3D
- call ABORT()
+ call Print_msg( NVERB_FATAL, 'GEN', 'MNH_GET_ZT3D_N0', 'NT3D_TOP too big (increaze JPMAX_T3D)' )
ELSE
NT3D_TOP = NT3D_TOP + 1
KTEMP = NT3D_POOL(NT3D_TOP)
IF ( NT3D_POOL(NT3D_TOP) == -1 ) THEN
- PRINT *,'MNH_GET_ZT3D_N0 ERROR: slice already reserved'
- STOP
+ call Print_msg( NVERB_FATAL, 'GEN', 'MNH_GET_ZT3D_N0', 'slice already reserved' )
END IF
NT3D_POOL(NT3D_TOP) = -1
IF ( NT3D_TOP > NT3D_TOP_MAX ) THEN
@@ -184,16 +184,14 @@ CONTAINS
INTEGER :: JI
IF (NT3D_TOP + KSIZE > JPMAX_T3D ) THEN
- print *," MNH_GET_ZT4D JPMAX_T3D OVER FLOW=", JPMAX_T3D
- call ABORT()
+ call Print_msg( NVERB_FATAL, 'GEN', 'MNH_GET_ZT4D', 'NT3D_TOP too big (increaze JPMAX_T3D)' )
ELSE
KBEG = NT3D_TOP + 1
KEND = NT3D_TOP + KSIZE
NT3D_TOP = NT3D_TOP + KSIZE
DO JI = KBEG, KEND
IF (NT3D_POOL(JI) == -1) THEN
- print *," MNH_GET_ZT4D ERROR: trying to use area already reserved"
- call ABORT()
+ call Print_msg( NVERB_FATAL, 'GEN', 'MNH_GET_ZT4D', 'trying to use area already reserved' )
END IF
NT3D_POOL(JI) = -1
END DO
@@ -213,8 +211,7 @@ CONTAINS
INTEGER :: KTEMP
IF ( ( NT3D_TOP > JPMAX_T3D ) .OR. ( NT3D_TOP < 1 ) ) THEN
- print*," MNH_REL_ZT3D NT3D_TOP OVER FLOW NT3D_TOP=", NT3D_TOP
- call ABORT()
+ call Print_msg( NVERB_FATAL, 'GEN', 'MNH_REL_ZT3D_N0', 'invalid value for NT3D_TOP' )
ELSE
NT3D_POOL(KTEMP) = KTEMP
IF (KTEMP == NT3D_TOP) THEN
@@ -265,23 +262,23 @@ CONTAINS
INTEGER, INTENT(IN) :: KSIZE
INTEGER, INTENT(IN) :: KBEG
+ character(len=16) :: ytxt1, ytxt2
INTEGER :: JI
IF ( KBEG + KSIZE -1 /= NT3D_TOP ) THEN
!PW TODO: implement holes management
- WRITE(*,'("MNH_REL_ZT4D ERROR: trying to free area (",I4,I4,") not at the end of range (",I4,")")' ) &
- KBEG,KBEG+KSIZE-1,NT3D_TOP
- call ABORT()
+ write( ytxt1, '( I4, "-", I4 )' ) kbeg, kbeg + ksize - 1
+ write( ytxt2, '( I4 )' ) NT3D_TOP
+ call Print_msg( NVERB_ERROR, 'GEN', 'MNH_REL_ZT4D', 'trying to free area (' // trim( ytxt1 ) // &
+ ') not at the end of range (' // trim( ytxt2 ) // ')' )
END IF
IF ( ( KBEG + KSIZE > JPMAX_T3D ) .OR. ( KBEG < 1 ) ) THEN
- print *," MNH_REL_ZT4D ERROR: out of range"
- call ABORT()
+ call Print_msg( NVERB_FATAL, 'GEN', 'MNH_REL_ZT4D', 'out of range' )
END IF
DO JI = KBEG, KBEG+KSIZE-1
IF (NT3D_POOL(JI) /= -1) THEN
- print *," MNH_REL_ZT4D ERROR: trying to free area not reserved"
- call ABORT()
+ call Print_msg( NVERB_ERROR, 'GEN', 'MNH_REL_ZT4D', 'trying to free area not reserved' )
END IF
NT3D_POOL(JI) = JI
END DO
diff --git a/src/MNH/ppm_scalar.f90 b/src/MNH/ppm_scalar.f90
index f2a70f386b5b9da328cb7585a6434d193c345271..7e4e3dec325a2ce3915abd1d7a89906868d2a943 100644
--- a/src/MNH/ppm_scalar.f90
+++ b/src/MNH/ppm_scalar.f90
@@ -165,18 +165,19 @@ CONTAINS
!* 0. DECLARATIONS
! ------------
!
-!USE MODE_ll
-!
-USE MODD_PARAMETERS
+USE MODD_ARGSLIST_ll, ONLY: HALO2LIST_ll
USE MODD_CONF
-USE MODD_ARGSLIST_ll, ONLY : HALO2LIST_ll
-USE MODD_TYPE_DATE, ONLY: DATE_TIME
+USE MODD_PARAMETERS
+USE MODD_TYPE_DATE, ONLY: DATE_TIME
!
use mode_mppdb
+#ifdef _OPENACC
+use mode_msg
+#endif
!
-USE MODI_SHUMAN
-USE MODI_PPM
USE MODI_ADVEC_PPM_ALGO
+USE MODI_PPM
+USE MODI_SHUMAN
!
!
IMPLICIT NONE
@@ -244,8 +245,7 @@ IGRID = 1
!
DO JSV=1,KSV
#ifdef _OPENACC
-PRINT *,'OPENACC: ppm_scalar::KSV>0 not yet tested'
-CALL ABORT
+ call Print_msg( NVERB_WARNING, 'GEN', 'PPM_SCALAR', 'KSV>0 not yet tested' )
#endif
CALL ADVEC_PPM_ALGO(HSV_ADV_SCHEME, HLBCX, HLBCY, IGRID, PSVT(:,:,:,JSV), &
PRHODJ, PTSTEP, PTSTEP_PPM, &
diff --git a/src/MNH/sbl_depth.f90 b/src/MNH/sbl_depth.f90
index 08bc9184168aaaa7df8e4e17f5a8f509d336e57c..425249c1cc1270261f0023ec6d7b85ced89dbd8f 100644
--- a/src/MNH/sbl_depth.f90
+++ b/src/MNH/sbl_depth.f90
@@ -67,7 +67,11 @@ END MODULE MODI_SBL_DEPTH
!
USE MODD_PARAMETERS, ONLY : XUNDEF
USE MODD_CTURB, ONLY : XFTOP_O_FSURF, XSBL_O_BL
-!
+
+#ifdef _OPENACC
+use mode_msg
+#endif
+
USE MODI_BL_DEPTH_DIAG
!
IMPLICIT NONE
@@ -100,8 +104,7 @@ REAL, DIMENSION(SIZE(PFLXU,1),SIZE(PFLXU,2),SIZE(PFLXU,3)) :: ZWIND
REAL, DIMENSION(SIZE(PZZ,1),SIZE(PZZ,2)) :: ZSBL_THER! SBL wih thermal criteria
REAL, DIMENSION(SIZE(PZZ,1),SIZE(PZZ,2)) :: ZA ! ponderation coefficient
#ifdef _OPENACC
-PRINT *,'OPENACC: SBL_DEPTH:: not yet implemented'
-CALL ABORT
+call Print_msg( NVERB_FATAL, 'GEN', 'SBL_DEPTH', 'not yet implemented' )
#endif
!----------------------------------------------------------------------------
!
diff --git a/src/MNH/turb.f90 b/src/MNH/turb.f90
index 623044a6f935fbc7426e9aaebc8ebd0bdec970c1..2910212afad6d787ea1088162589f2603614f992 100644
--- a/src/MNH/turb.f90
+++ b/src/MNH/turb.f90
@@ -7,6 +7,10 @@
module mode_turb
!###############
+#ifdef _OPENACC
+use mode_msg
+#endif
+
#ifdef MNH_BITREP
use modi_bitrep
#endif
@@ -687,8 +691,7 @@ SELECT CASE (HTURBLEN)
CASE ('BL89')
#ifdef _OPENACC
- PRINT *,'OPENACC: TURB::HTURBLEN=BL89 not yet implemented'
- CALL ABORT
+ call Print_msg( NVERB_FATAL, 'GEN', 'TURB', 'OpenACC: HTURBLEN=BL89 not yet implemented' )
#endif
ZSHEAR=0.
CALL BL89(KKA,KKU,KKL,PZZ,PDZZ,PTHVREF,ZTHLM,KRR,ZRM,PTKET,ZSHEAR,PLEM)
@@ -698,8 +701,7 @@ SELECT CASE (HTURBLEN)
CASE ('RM17')
#ifdef _OPENACC
- PRINT *,'OPENACC: TURB::HTURBLEN=RM17 not yet implemented'
- CALL ABORT
+ call Print_msg( NVERB_FATAL, 'GEN', 'TURB', 'OpenACC: HTURBLEN=RM17 not yet implemented' )
#endif
ZDUDZ = MXF(MZF(1,KKU,1,GZ_U_UW(1,KKU,1,PUT,PDZZ)))
ZDVDZ = MYF(MZF(1,KKU,1,GZ_V_VW(1,KKU,1,PVT,PDZZ)))
@@ -711,8 +713,7 @@ SELECT CASE (HTURBLEN)
!
CASE ('DELT')
#ifdef _OPENACC
- PRINT *,'OPENACC: TURB::HTURBLEN=DELT not yet implemented'
- CALL ABORT
+ call Print_msg( NVERB_FATAL, 'GEN', 'TURB', 'OpenACC: HTURBLEN=DELT not yet implemented' )
#endif
CALL DELT(KKA,KKU,KKL,IKB, IKE,IKTB, IKTE,ORMC01,HTURBDIM,PDXX, PDYY,PZZ,PDIRCOSZW,PLEM)
!
@@ -728,8 +729,7 @@ SELECT CASE (HTURBLEN)
!
CASE ('BLKR')
#ifdef _OPENACC
- PRINT *,'OPENACC: TURB::HTURBLEN=BLKR not yet implemented'
- CALL ABORT
+ call Print_msg( NVERB_FATAL, 'GEN', 'TURB', 'OpenACC: HTURBLEN=BLKR not yet implemented' )
#endif
ZL0 = 100.
PLEM(:,:,:) = ZL0
@@ -755,8 +755,7 @@ END SELECT
! -----------------------
IF (KMODEL_CL==KMI .AND. HTURBLEN_CL/='NONE') THEN
#ifdef _OPENACC
- PRINT *,'OPENACC: TURB::CLOUD_MODIF_LM not yet implemented'
- CALL ABORT
+ call Print_msg( NVERB_FATAL, 'GEN', 'TURB', 'OpenACC: CLOUD_MODIF_LM not yet implemented' )
#endif
CALL CLOUD_MODIF_LM
END IF
@@ -776,8 +775,7 @@ ZLMO=XUNDEF
IF (ORMC01) THEN
!$acc update self(PLEM,ZLEPS)
#ifdef _OPENACC
- PRINT *,'OPENACC: TURB::ORMC01 not yet implemented'
- CALL ABORT
+ call Print_msg( NVERB_FATAL, 'GEN', 'TURB', 'OpenACC: ORMC01 not yet implemented' )
#endif
#ifndef MNH_BITREP
ZUSTAR=(PSFU**2+PSFV**2)**(0.25)
@@ -872,8 +870,7 @@ IF (HTOM=='TM06') THEN
!ZFR2 = -GZ_W_M(KKA,KKU,KKL,ZMR2, PDZZ) ! -d(w'r'2 )/dz
!ZFTHR = -GZ_W_M(KKA,KKU,KKL,ZMTHR,PDZZ) ! -d(w'th'r')/dz
#else
- PRINT *,'OPENACC: TURB::TM06 not yet implemented'
- CALL ABORT
+ call Print_msg( NVERB_FATAL, 'GEN', 'TURB', 'OpenACC: TM06 not yet implemented' )
CALL TM06(KKA,KKU,KKL,PTHVREF,PBL_DEPTH,PZZ,PSFTH,ZMWTH,ZMTH2)
!
CALL GZ_M_W_DEVICE(KKA,KKU,KKL,ZMWTH,PDZZ,ZFWTH) ! -d(w'2th' )/dz
@@ -1180,8 +1177,7 @@ END IF
!
IF ((HCLOUD == 'KHKO') .OR. (HCLOUD == 'C2R2')) THEN
#ifdef _OPENACC
-PRINT *,'OPENACC: TURB::HCLOUD=KHKO or C2R2 not yet implemented'
-CALL ABORT
+ call Print_msg( NVERB_FATAL, 'GEN', 'TURB', 'OpenACC: HCLOUD=KHKO or C2R2 not yet implemented' )
#endif
ZEXNE(:,:,:)= (PPABST(:,:,:)/XP00)**(XRD/XCPD)
ZTT(:,:,:)= PTHLT(:,:,:)*ZEXNE(:,:,:)
@@ -1578,8 +1574,7 @@ REAL, DIMENSION(SIZE(PUT,1),SIZE(PUT,2),SIZE(PUT,3)) :: ZLM_CLOUD
!
!-------------------------------------------------------------------------------
#ifdef _OPENACC
-PRINT *,'OPENACC: TURB::CLOUD_MODIF_LM not yet implemented'
-CALL ABORT
+call Print_msg( NVERB_FATAL, 'GEN', 'TURB', 'OpenACC: CLOUD_MODIF_LM not yet implemented' )
#endif
!
!* 1. INITIALISATION
@@ -1753,8 +1748,7 @@ REAL :: ZD ! distance to the surface
!-------------------------------------------------------------------------------
!
#ifdef _OPENACC
-PRINT *,'OPENACC: TURB::DELT not yet implemented'
-CALL ABORT
+ call Print_msg( NVERB_FATAL, 'GEN', 'TURB', 'OpenACC: DELT not yet implemented' )
#endif
DO JK = KKTB,KKTE ! 1D turbulence scheme
PLM(:,:,JK) = PZZ(:,:,JK+KKL) - PZZ(:,:,JK)
diff --git a/src/MNH/turb_hor_sv_corr.f90 b/src/MNH/turb_hor_sv_corr.f90
index ff97ea3fdb535678f4f9da37d5025810b003bbd7..581c7ba39c861ad4677f0b01582d567024556626 100644
--- a/src/MNH/turb_hor_sv_corr.f90
+++ b/src/MNH/turb_hor_sv_corr.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2002-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 turb 2006/05/18 13:07:25
-!-----------------------------------------------------------------
! ############################
MODULE MODI_TURB_HOR_SV_CORR
! ############################
@@ -97,6 +92,10 @@ USE MODD_NSV, ONLY : NSV,NSV_LGBEG,NSV_LGEND
USE MODD_LES
USE MODD_BLOWSNOW
!
+#ifdef _OPENACC
+use mode_msg
+#endif
+!
USE MODI_GRADIENT_M
USE MODI_GRADIENT_U
USE MODI_GRADIENT_V
@@ -157,8 +156,7 @@ REAL :: ZCSV !constant for the scalar flux
! ---------------------------------------------------------------------------
!
#ifdef _OPENACC
-PRINT *,'OPENACC: TURB_HOR_SV_CORR:: not yet implemented'
-CALL ABORT
+call Print_msg( NVERB_FATAL, 'GEN', 'TURB_HOR_SV_CORR', 'OpenACC: not yet implemented' )
#endif
IKU=SIZE(PTKEM,3)
CALL SECOND_MNH(ZTIME1)
diff --git a/src/MNH/turb_ver_sv_corr.f90 b/src/MNH/turb_ver_sv_corr.f90
index aeb08637204254f618c3ed8922845635e81ce6bb..709af4ec15ba3927a4bf3c0270a115d169d041c9 100644
--- a/src/MNH/turb_ver_sv_corr.f90
+++ b/src/MNH/turb_ver_sv_corr.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2002-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 turb 2006/05/18 13:07:25
-!-----------------------------------------------------------------
! ####################
MODULE MODI_TURB_VER_SV_CORR
! ####################
@@ -110,6 +105,9 @@ USE MODD_CONF
USE MODD_NSV, ONLY : NSV,NSV_LGBEG,NSV_LGEND
USE MODD_BLOWSNOW
!
+#ifdef _OPENACC
+use mode_msg
+#endif
!
USE MODI_GRADIENT_U
USE MODI_GRADIENT_V
@@ -177,8 +175,7 @@ REAL :: ZCQSVD = 2.4 ! constant for humidity - scalar covariance dissipation
!----------------------------------------------------------------------------
!
#ifdef _OPENACC
-PRINT *,'OPENACC: TURB_VER_SV_CORR:: not yet implemented'
-CALL ABORT
+call Print_msg( NVERB_FATAL, 'GEN', 'TURB_VER_SV_CORR', 'OpenACC: not yet implemented' )
#endif
CALL SECOND_MNH(ZTIME1)
!
diff --git a/src/MNH/turb_ver_sv_flux.f90 b/src/MNH/turb_ver_sv_flux.f90
index bbf10274785e51588f0da32db7c40faa38b1b46b..dca667250bc22d14f17f986fb1a5125757c5a2f9 100644
--- a/src/MNH/turb_ver_sv_flux.f90
+++ b/src/MNH/turb_ver_sv_flux.f90
@@ -277,6 +277,9 @@ 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
+#ifdef _OPENACC
+use mode_msg
+#endif
!
USE MODI_GRADIENT_U
USE MODI_GRADIENT_V
@@ -367,8 +370,7 @@ TYPE(TFIELDDATA) :: TZFIELD
! -------------
!
#ifdef _OPENACC
-PRINT *,'OPENACC: TURB_VER_SV_FLUX:: not yet implemented'
-CALL ABORT
+call Print_msg( NVERB_FATAL, 'GEN', 'TURB_VER_SV_FLUX', 'OpenACC: not yet implemented' )
#endif
IKB=KKA+JPVEXT_TURB*KKL
IKE=KKU-JPVEXT_TURB*KKL