diff --git a/src/MNH/mode_prandtl.f90 b/src/MNH/mode_prandtl.f90
index 56f23a59de4ce8498d3547841566cecef185e2c4..492fa71f014c1be8b60d46deae6e1f438f845735 100644
--- a/src/MNH/mode_prandtl.f90
+++ b/src/MNH/mode_prandtl.f90
@@ -644,10 +644,7 @@ END SUBROUTINE D_M3_WTH_WTH2_O_DDTDZ
#ifndef MNH_OPENACC
FUNCTION M3_WTH_W2TH(PREDTH1,PREDR1,PD,PKEFF,PTKE) RESULT(PM3_WTH_W2TH)
#else
-SUBROUTINE M3_WTH_W2TH(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PKEFF,PTKE,PM3_WTH_W2TH)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE M3_WTH_W2TH(PREDTH1,PREDR1,PD,PKEFF,PTKE,PM3_WTH_W2TH)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
@@ -706,10 +703,7 @@ END SUBROUTINE M3_WTH_W2TH
#ifndef MNH_OPENACC
FUNCTION D_M3_WTH_W2TH_O_DDTDZ(PREDTH1,PREDR1,PD,PBLL_O_E,PETHETA,PKEFF,PTKE) RESULT(PD_M3_WTH_W2TH_O_DDTDZ)
#else
-SUBROUTINE D_M3_WTH_W2TH_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PBLL_O_E,PETHETA,PKEFF,PTKE,PD_M3_WTH_W2TH_O_DDTDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_WTH_W2TH_O_DDTDZ(PREDTH1,PREDR1,PD,PBLL_O_E,PETHETA,PKEFF,PTKE,PD_M3_WTH_W2TH_O_DDTDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
@@ -780,12 +774,7 @@ END SUBROUTINE D_M3_WTH_W2TH_O_DDTDZ
#ifndef MNH_OPENACC
FUNCTION M3_WTH_W2R(PD,PKEFF,PTKE,PBLL_O_E,PEMOIST,PDTDZ) RESULT(PM3_WTH_W2R)
#else
-SUBROUTINE M3_WTH_W2R(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PKEFF,PTKE,PBLL_O_E,PEMOIST,PDTDZ,PM3_WTH_W2R)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
- REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
- REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
+SUBROUTINE M3_WTH_W2R(PD,PKEFF,PTKE,PBLL_O_E,PEMOIST,PDTDZ,PM3_WTH_W2R)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PKEFF
@@ -843,10 +832,7 @@ END SUBROUTINE M3_WTH_W2R
#ifndef MNH_OPENACC
FUNCTION D_M3_WTH_W2R_O_DDTDZ(PREDTH1,PREDR1,PD,PKEFF,PTKE,PBLL_O_E,PEMOIST) RESULT(PD_M3_WTH_W2R_O_DDTDZ)
#else
-SUBROUTINE D_M3_WTH_W2R_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PKEFF,PTKE,PBLL_O_E,PEMOIST,PD_M3_WTH_W2R_O_DDTDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_WTH_W2R_O_DDTDZ(PREDTH1,PREDR1,PD,PKEFF,PTKE,PBLL_O_E,PEMOIST,PD_M3_WTH_W2R_O_DDTDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
@@ -907,12 +893,7 @@ END SUBROUTINE D_M3_WTH_W2R_O_DDTDZ
#ifndef MNH_OPENACC
FUNCTION M3_WTH_WR2(PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PEMOIST,PDTDZ) RESULT(PM3_WTH_WR2)
#else
-SUBROUTINE M3_WTH_WR2(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PEMOIST,PDTDZ,PM3_WTH_WR2)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
- REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
- REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
+SUBROUTINE M3_WTH_WR2(PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PEMOIST,PDTDZ,PM3_WTH_WR2)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PKEFF
@@ -933,7 +914,7 @@ SUBROUTINE M3_WTH_WR2(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_
REAL, DIMENSION(:,:,:), allocatable :: ZTMP1_DEVICE, ZTMP2_DEVICE
#endif
-!$acc data present( PREDTH1, PREDR1, PD, PKEFF, PTKE, PSQRT_TKE, PBLL_O_E, PBETA, PLEPS, PEMOIST, PDTDZ, PM3_WTH_WR2 )
+!$acc data present( PD, PKEFF, PTKE, PSQRT_TKE, PBLL_O_E, PBETA, PLEPS, PEMOIST, PDTDZ, PM3_WTH_WR2 )
#ifdef MNH_OPENACC
call Print_msg( NVERB_WARNING, 'GEN', 'M3_WTH_WR2', 'OpenACC: not yet tested' )
@@ -988,11 +969,8 @@ END SUBROUTINE M3_WTH_WR2
FUNCTION D_M3_WTH_WR2_O_DDTDZ(PREDTH1,PREDR1,PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PEMOIST) &
RESULT(PD_M3_WTH_WR2_O_DDTDZ)
#else
-SUBROUTINE D_M3_WTH_WR2_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PEMOIST, &
+SUBROUTINE D_M3_WTH_WR2_O_DDTDZ(PREDTH1,PREDR1,PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PEMOIST, &
PD_M3_WTH_WR2_O_DDTDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
@@ -1070,10 +1048,7 @@ END SUBROUTINE D_M3_WTH_WR2_O_DDTDZ
#ifndef MNH_OPENACC
FUNCTION M3_WTH_WTHR(PREDR1,PD,PKEFF,PTKE,PSQRT_TKE,PBETA,PLEPS,PEMOIST) RESULT(PM3_WTH_WTHR)
#else
-SUBROUTINE M3_WTH_WTHR(KKA,KKU,KKL,PREDR1,PD,PKEFF,PTKE,PSQRT_TKE,PBETA,PLEPS,PEMOIST,PM3_WTH_WTHR)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE M3_WTH_WTHR(PREDR1,PD,PKEFF,PTKE,PSQRT_TKE,PBETA,PLEPS,PEMOIST,PM3_WTH_WTHR)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -1179,10 +1154,7 @@ END SUBROUTINE D_M3_WTH_WTHR_O_DDTDZ
#ifndef MNH_OPENACC
FUNCTION M3_TH2_W2TH(PREDTH1,PREDR1,PD,PDTDZ,PLM,PLEPS,PTKE) RESULT(PM3_TH2_W2TH)
#else
-SUBROUTINE M3_TH2_W2TH(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PDTDZ,PLM,PLEPS,PTKE,PM3_TH2_W2TH)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE M3_TH2_W2TH(PREDTH1,PREDR1,PD,PDTDZ,PLM,PLEPS,PTKE,PM3_TH2_W2TH)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
@@ -1247,10 +1219,7 @@ END SUBROUTINE M3_TH2_W2TH
#ifndef MNH_OPENACC
FUNCTION D_M3_TH2_W2TH_O_DDTDZ(PREDTH1,PREDR1,PD,PLM,PLEPS,PTKE,OUSERV) RESULT(PD_M3_TH2_W2TH_O_DDTDZ)
#else
-SUBROUTINE D_M3_TH2_W2TH_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLM,PLEPS,PTKE,OUSERV,PD_M3_TH2_W2TH_O_DDTDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_TH2_W2TH_O_DDTDZ(PREDTH1,PREDR1,PD,PLM,PLEPS,PTKE,OUSERV,PD_M3_TH2_W2TH_O_DDTDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
@@ -1350,10 +1319,7 @@ END SUBROUTINE D_M3_TH2_W2TH_O_DDTDZ
#ifndef MNH_OPENACC
FUNCTION M3_TH2_WTH2(PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE) RESULT(PM3_TH2_WTH2)
#else
-SUBROUTINE M3_TH2_WTH2(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PM3_TH2_WTH2)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE M3_TH2_WTH2(PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PM3_TH2_WTH2)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
@@ -1423,10 +1389,7 @@ END SUBROUTINE M3_TH2_WTH2
#ifndef MNH_OPENACC
FUNCTION D_M3_TH2_WTH2_O_DDTDZ(PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA) RESULT(PD_M3_TH2_WTH2_O_DDTDZ)
#else
-SUBROUTINE D_M3_TH2_WTH2_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PD_M3_TH2_WTH2_O_DDTDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_TH2_WTH2_O_DDTDZ(PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PD_M3_TH2_WTH2_O_DDTDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
@@ -1502,10 +1465,7 @@ END SUBROUTINE D_M3_TH2_WTH2_O_DDTDZ
#ifndef MNH_OPENACC
FUNCTION M3_TH2_W2R(PD,PLM,PLEPS,PTKE,PBLL_O_E,PEMOIST,PDTDZ) RESULT(PM3_TH2_W2R)
#else
-SUBROUTINE M3_TH2_W2R(KKA,KKU,KKL,PD,PLM,PLEPS,PTKE,PBLL_O_E,PEMOIST,PDTDZ,PM3_TH2_W2R)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE M3_TH2_W2R(PD,PLM,PLEPS,PTKE,PBLL_O_E,PEMOIST,PDTDZ,PM3_TH2_W2R)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PLM
@@ -1580,10 +1540,7 @@ END SUBROUTINE M3_TH2_W2R
#ifndef MNH_OPENACC
FUNCTION D_M3_TH2_W2R_O_DDTDZ(PREDTH1,PREDR1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PEMOIST,PDTDZ) RESULT(PD_M3_TH2_W2R_O_DDTDZ)
#else
-SUBROUTINE D_M3_TH2_W2R_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PEMOIST,PDTDZ,PD_M3_TH2_W2R_O_DDTDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_TH2_W2R_O_DDTDZ(PREDTH1,PREDR1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PEMOIST,PDTDZ,PD_M3_TH2_W2R_O_DDTDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
@@ -1658,10 +1615,7 @@ END SUBROUTINE D_M3_TH2_W2R_O_DDTDZ
#ifndef MNH_OPENACC
FUNCTION M3_TH2_WR2(PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ) RESULT(PM3_TH2_WR2)
#else
-SUBROUTINE M3_TH2_WR2(KKA,KKU,KKL,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ,PM3_TH2_WR2)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE M3_TH2_WR2(PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ,PM3_TH2_WR2)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PLEPS
@@ -1735,10 +1689,7 @@ END SUBROUTINE M3_TH2_WR2
#ifndef MNH_OPENACC
FUNCTION D_M3_TH2_WR2_O_DDTDZ(PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ) RESULT(PD_M3_TH2_WR2_O_DDTDZ)
#else
-SUBROUTINE D_M3_TH2_WR2_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ,PD_M3_TH2_WR2_O_DDTDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_TH2_WR2_O_DDTDZ(PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ,PD_M3_TH2_WR2_O_DDTDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
@@ -1816,10 +1767,7 @@ END SUBROUTINE D_M3_TH2_WR2_O_DDTDZ
#ifndef MNH_OPENACC
FUNCTION M3_TH2_WTHR(PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ) RESULT(PM3_TH2_WTHR)
#else
-SUBROUTINE M3_TH2_WTHR(KKA,KKU,KKL,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ,PM3_TH2_WTHR)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE M3_TH2_WTHR(PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ,PM3_TH2_WTHR)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -1883,10 +1831,7 @@ END SUBROUTINE M3_TH2_WTHR
#ifndef MNH_OPENACC
FUNCTION D_M3_TH2_WTHR_O_DDTDZ(PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ) RESULT(PD_M3_TH2_WTHR_O_DDTDZ)
#else
-SUBROUTINE D_M3_TH2_WTHR_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ,PD_M3_TH2_WTHR_O_DDTDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_TH2_WTHR_O_DDTDZ(PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ,PD_M3_TH2_WTHR_O_DDTDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
@@ -1952,10 +1897,7 @@ END SUBROUTINE D_M3_TH2_WTHR_O_DDTDZ
#ifndef MNH_OPENACC
FUNCTION M3_THR_WTHR(PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE) RESULT(PM3_THR_WTHR)
#else
-SUBROUTINE M3_THR_WTHR(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PM3_THR_WTHR)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE M3_THR_WTHR(PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PM3_THR_WTHR)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
@@ -2017,10 +1959,7 @@ END SUBROUTINE M3_THR_WTHR
#ifndef MNH_OPENACC
FUNCTION D_M3_THR_WTHR_O_DDTDZ(PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA) RESULT(PD_M3_THR_WTHR_O_DDTDZ)
#else
-SUBROUTINE D_M3_THR_WTHR_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PD_M3_THR_WTHR_O_DDTDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_THR_WTHR_O_DDTDZ(PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PD_M3_THR_WTHR_O_DDTDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
@@ -2084,10 +2023,7 @@ END SUBROUTINE D_M3_THR_WTHR_O_DDTDZ
#ifndef MNH_OPENACC
FUNCTION M3_THR_WTH2(PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ) RESULT(PM3_THR_WTH2)
#else
-SUBROUTINE M3_THR_WTH2(KKA,KKU,KKL,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PM3_THR_WTH2)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE M3_THR_WTH2(PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PM3_THR_WTH2)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -2151,10 +2087,7 @@ END SUBROUTINE M3_THR_WTH2
#ifndef MNH_OPENACC
FUNCTION D_M3_THR_WTH2_O_DDTDZ(PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ) RESULT(PD_M3_THR_WTH2_O_DDTDZ)
#else
-SUBROUTINE D_M3_THR_WTH2_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PD_M3_THR_WTH2_O_DDTDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_THR_WTH2_O_DDTDZ(PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PD_M3_THR_WTH2_O_DDTDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
@@ -2232,10 +2165,7 @@ END SUBROUTINE D_M3_THR_WTH2_O_DDTDZ
#ifndef MNH_OPENACC
FUNCTION D_M3_THR_WTH2_O_DDRDZ(PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA) RESULT(PD_M3_THR_WTH2_O_DDRDZ)
#else
-SUBROUTINE D_M3_THR_WTH2_O_DDRDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PD_M3_THR_WTH2_O_DDRDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_THR_WTH2_O_DDRDZ(PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PD_M3_THR_WTH2_O_DDRDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
@@ -2302,10 +2232,7 @@ END SUBROUTINE D_M3_THR_WTH2_O_DDRDZ
#ifndef MNH_OPENACC
FUNCTION M3_THR_W2TH(PREDR1,PD,PLM,PLEPS,PTKE,PDRDZ) RESULT(PM3_THR_W2TH)
#else
-SUBROUTINE M3_THR_W2TH(KKA,KKU,KKL,PREDR1,PD,PLM,PLEPS,PTKE,PDRDZ,PM3_THR_W2TH)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE M3_THR_W2TH(PREDR1,PD,PLM,PLEPS,PTKE,PDRDZ,PM3_THR_W2TH)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -2368,10 +2295,7 @@ END SUBROUTINE M3_THR_W2TH
#ifndef MNH_OPENACC
FUNCTION D_M3_THR_W2TH_O_DDTDZ(PREDTH1,PREDR1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PDRDZ,PETHETA) RESULT(PD_M3_THR_W2TH_O_DDTDZ)
#else
-SUBROUTINE D_M3_THR_W2TH_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PDRDZ,PETHETA,PD_M3_THR_W2TH_O_DDTDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_THR_W2TH_O_DDTDZ(PREDTH1,PREDR1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PDRDZ,PETHETA,PD_M3_THR_W2TH_O_DDTDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
@@ -2450,10 +2374,7 @@ END SUBROUTINE D_M3_THR_W2TH_O_DDTDZ
#ifndef MNH_OPENACC
FUNCTION D_M3_THR_W2TH_O_DDRDZ(PREDTH1,PREDR1,PD,PLM,PLEPS,PTKE) RESULT(PD_M3_THR_W2TH_O_DDRDZ)
#else
-SUBROUTINE D_M3_THR_W2TH_O_DDRDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLM,PLEPS,PTKE,PD_M3_THR_W2TH_O_DDRDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_THR_W2TH_O_DDRDZ(PREDTH1,PREDR1,PD,PLM,PLEPS,PTKE,PD_M3_THR_W2TH_O_DDRDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
@@ -2728,10 +2649,7 @@ END SUBROUTINE D_M3_WR_WR2_O_DDRDZ
#ifndef MNH_OPENACC
FUNCTION M3_WR_W2R(PREDR1,PREDTH1,PD,PKEFF,PTKE) RESULT(PM3_WR_W2R)
#else
-SUBROUTINE M3_WR_W2R(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PM3_WR_W2R)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE M3_WR_W2R(PREDR1,PREDTH1,PD,PKEFF,PTKE,PM3_WR_W2R)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
@@ -2751,7 +2669,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'M3_WR_W2R', 'OpenACC: not yet tested' )
PM3_WR_W2R = M3_WTH_W2TH(PREDR1,PREDTH1,PD,PKEFF,PTKE)
#else
!$acc data present( PREDR1, PREDTH1, PD, PKEFF, PTKE, PM3_WR_W2R )
-CALL M3_WTH_W2TH(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PM3_WR_W2R)
+CALL M3_WTH_W2TH(PREDR1,PREDTH1,PD,PKEFF,PTKE,PM3_WR_W2R)
!$acc end data
#endif
!
@@ -2764,10 +2682,7 @@ END SUBROUTINE M3_WR_W2R
#ifndef MNH_OPENACC
FUNCTION D_M3_WR_W2R_O_DDRDZ(PREDR1,PREDTH1,PD,PBLL_O_E,PEMOIST,PKEFF,PTKE) RESULT(PD_M3_WR_W2R_O_DDRDZ)
#else
-SUBROUTINE D_M3_WR_W2R_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PBLL_O_E,PEMOIST,PKEFF,PTKE,PD_M3_WR_W2R_O_DDRDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_WR_W2R_O_DDRDZ(PREDR1,PREDTH1,PD,PBLL_O_E,PEMOIST,PKEFF,PTKE,PD_M3_WR_W2R_O_DDRDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
@@ -2789,7 +2704,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_WR_W2R_O_DDRDZ', 'OpenACC: not yet t
PD_M3_WR_W2R_O_DDRDZ = D_M3_WTH_W2TH_O_DDTDZ(PREDR1,PREDTH1,PD,PBLL_O_E,PEMOIST,PKEFF,PTKE)
#else
!$acc data present( PREDR1, PREDTH1, PD, PBLL_O_E, PEMOIST, PKEFF, PTKE, PD_M3_WR_W2R_O_DDRDZ )
-CALL D_M3_WTH_W2TH_O_DDTDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PBLL_O_E,PEMOIST,PKEFF,PTKE,PD_M3_WR_W2R_O_DDRDZ)
+CALL D_M3_WTH_W2TH_O_DDTDZ( PREDR1, PREDTH1, PD, PBLL_O_E, PEMOIST, PKEFF, PTKE, PD_M3_WR_W2R_O_DDRDZ )
!$acc end data
#endif
!
@@ -2802,12 +2717,7 @@ END SUBROUTINE D_M3_WR_W2R_O_DDRDZ
#ifndef MNH_OPENACC
FUNCTION M3_WR_W2TH(PD,PKEFF,PTKE,PBLL_O_E,PETHETA,PDRDZ) RESULT(PM3_WR_W2TH)
#else
-SUBROUTINE M3_WR_W2TH(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PBLL_O_E,PETHETA,PDRDZ,PM3_WR_W2TH)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
- REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
- REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
+SUBROUTINE M3_WR_W2TH(PD,PKEFF,PTKE,PBLL_O_E,PETHETA,PDRDZ,PM3_WR_W2TH)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PKEFF
@@ -2827,8 +2737,8 @@ call Print_msg( NVERB_WARNING, 'GEN', 'M3_WR_W2TH', 'OpenACC: not yet tested' )
#ifndef MNH_OPENACC
PM3_WR_W2TH = M3_WTH_W2R(PD,PKEFF,PTKE,PBLL_O_E,PETHETA,PDRDZ)
#else
-!$acc data present( PREDR1, PREDTH1, PD, PKEFF, PTKE, PBLL_O_E, PETHETA, PDRDZ, PM3_WR_W2TH )
-CALL M3_WTH_W2R(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PBLL_O_E,PETHETA,PDRDZ,PM3_WR_W2TH)
+!$acc data present( PD, PKEFF, PTKE, PBLL_O_E, PETHETA, PDRDZ, PM3_WR_W2TH )
+CALL M3_WTH_W2R(PD,PKEFF,PTKE,PBLL_O_E,PETHETA,PDRDZ,PM3_WR_W2TH)
!$acc end data
#endif
!
@@ -2841,10 +2751,7 @@ END SUBROUTINE M3_WR_W2TH
#ifndef MNH_OPENACC
FUNCTION D_M3_WR_W2TH_O_DDRDZ(PREDR1,PREDTH1,PD,PKEFF,PTKE,PBLL_O_E,PETHETA) RESULT(PD_M3_WR_W2TH_O_DDRDZ)
#else
-SUBROUTINE D_M3_WR_W2TH_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PBLL_O_E,PETHETA,PD_M3_WR_W2TH_O_DDRDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_WR_W2TH_O_DDRDZ(PREDR1,PREDTH1,PD,PKEFF,PTKE,PBLL_O_E,PETHETA,PD_M3_WR_W2TH_O_DDRDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
@@ -2866,7 +2773,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_WR_W2TH_O_DDRDZ', 'OpenACC: not yet
PD_M3_WR_W2TH_O_DDRDZ = D_M3_WTH_W2R_O_DDTDZ(PREDR1,PREDTH1,PD,PKEFF,PTKE,PBLL_O_E,PETHETA)
#else
!$acc data present( PREDR1, PREDTH1, PD, PKEFF, PTKE, PBLL_O_E, PETHETA, PD_M3_WR_W2TH_O_DDRDZ )
-CALL D_M3_WTH_W2R_O_DDTDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PBLL_O_E,PETHETA,PD_M3_WR_W2TH_O_DDRDZ)
+CALL D_M3_WTH_W2R_O_DDTDZ( PREDR1, PREDTH1, PD, PKEFF, PTKE, PBLL_O_E, PETHETA, PD_M3_WR_W2TH_O_DDRDZ )
!$acc end data
#endif
!
@@ -2879,12 +2786,7 @@ END SUBROUTINE D_M3_WR_W2TH_O_DDRDZ
#ifndef MNH_OPENACC
FUNCTION M3_WR_WTH2(PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PETHETA,PDRDZ) RESULT(PM3_WR_WTH2)
#else
-SUBROUTINE M3_WR_WTH2(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PETHETA,PDRDZ,PM3_WR_WTH2)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
- REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
- REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
+SUBROUTINE M3_WR_WTH2(PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PETHETA,PDRDZ,PM3_WR_WTH2)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PKEFF
@@ -2907,8 +2809,8 @@ call Print_msg( NVERB_WARNING, 'GEN', 'M3_WR_WTH2', 'OpenACC: not yet tested' )
#ifndef MNH_OPENACC
PM3_WR_WTH2 = M3_WTH_WR2(PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PETHETA,PDRDZ)
#else
-!$acc data present( PREDR1, PREDTH1, PD, PKEFF, PTKE, PSQRT_TKE, PBLL_O_E, PBETA, PLEPS, PETHETA, PDRDZ, PM3_WR_WTH2 )
-CALL M3_WTH_WR2(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PETHETA,PDRDZ,PM3_WR_WTH2)
+!$acc data present( PD, PKEFF, PTKE, PSQRT_TKE, PBLL_O_E, PBETA, PLEPS, PETHETA, PDRDZ, PM3_WR_WTH2 )
+CALL M3_WTH_WR2( PD, PKEFF, PTKE, PSQRT_TKE, PBLL_O_E, PBETA, PLEPS, PETHETA, PDRDZ, PM3_WR_WTH2 )
!$acc end data
#endif
!
@@ -2922,11 +2824,8 @@ END SUBROUTINE M3_WR_WTH2
FUNCTION D_M3_WR_WTH2_O_DDRDZ(PREDR1,PREDTH1,PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PETHETA) &
RESULT(PD_M3_WR_WTH2_O_DDRDZ)
#else
-SUBROUTINE D_M3_WR_WTH2_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PETHETA, &
+SUBROUTINE D_M3_WR_WTH2_O_DDRDZ(PREDR1,PREDTH1,PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PETHETA, &
PD_M3_WR_WTH2_O_DDRDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
@@ -2951,7 +2850,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_WR_WTH2_O_DDRDZ', 'OpenACC: not yet
PD_M3_WR_WTH2_O_DDRDZ = D_M3_WTH_WR2_O_DDTDZ(PREDR1,PREDTH1,PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PETHETA)
#else
!$acc data present( PREDR1, PREDTH1, PD, PKEFF, PTKE, PSQRT_TKE, PBLL_O_E, PBETA, PLEPS, PETHETA, PD_M3_WR_WTH2_O_DDRDZ )
-CALL D_M3_WTH_WR2_O_DDTDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PETHETA,PD_M3_WR_WTH2_O_DDRDZ)
+CALL D_M3_WTH_WR2_O_DDTDZ( PREDR1, PREDTH1, PD, PKEFF, PTKE, PSQRT_TKE, PBLL_O_E, PBETA, PLEPS, PETHETA, PD_M3_WR_WTH2_O_DDRDZ )
!$acc end data
#endif
!
@@ -2964,10 +2863,7 @@ END SUBROUTINE D_M3_WR_WTH2_O_DDRDZ
#ifndef MNH_OPENACC
FUNCTION M3_WR_WTHR(PREDTH1,PD,PKEFF,PTKE,PSQRT_TKE,PBETA,PLEPS,PETHETA) RESULT(PM3_WR_WTHR)
#else
-SUBROUTINE M3_WR_WTHR(KKA,KKU,KKL,PREDTH1,PD,PKEFF,PTKE,PSQRT_TKE,PBETA,PLEPS,PETHETA,PM3_WR_WTHR)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE M3_WR_WTHR(PREDTH1,PD,PKEFF,PTKE,PSQRT_TKE,PBETA,PLEPS,PETHETA,PM3_WR_WTHR)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -2990,7 +2886,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'M3_WR_WTHR', 'OpenACC: not yet tested' )
PM3_WR_WTHR = M3_WTH_WTHR(PREDTH1,PD,PKEFF,PTKE,PSQRT_TKE,PBETA,PLEPS,PETHETA)
#else
!$acc data present( PREDTH1, PD, PKEFF, PTKE, PSQRT_TKE, PBETA, PLEPS, PETHETA, PM3_WR_WTHR )
-CALL M3_WTH_WTHR(KKA,KKU,KKL,PREDTH1,PD,PKEFF,PTKE,PSQRT_TKE,PBETA,PLEPS,PETHETA,PM3_WR_WTHR)
+CALL M3_WTH_WTHR( PREDTH1, PD, PKEFF, PTKE, PSQRT_TKE, PBETA, PLEPS, PETHETA, PM3_WR_WTHR )
!$acc end data
#endif
!
@@ -3003,10 +2899,7 @@ END SUBROUTINE M3_WR_WTHR
#ifndef MNH_OPENACC
FUNCTION D_M3_WR_WTHR_O_DDRDZ(PM3_WR_WTHR,PREDR1,PREDTH1,PD,PBLL_O_E,PEMOIST) RESULT(PD_M3_WR_WTHR_O_DDRDZ)
#else
-SUBROUTINE D_M3_WR_WTHR_O_DDRDZ(KKA,KKU,KKL,PM3_WR_WTHR,PREDR1,PREDTH1,PD,PBLL_O_E,PEMOIST,PD_M3_WR_WTHR_O_DDRDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_WR_WTHR_O_DDRDZ(PM3_WR_WTHR,PREDR1,PREDTH1,PD,PBLL_O_E,PEMOIST,PD_M3_WR_WTHR_O_DDRDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PM3_WR_WTHR
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
@@ -3040,10 +2933,7 @@ END SUBROUTINE D_M3_WR_WTHR_O_DDRDZ
#ifndef MNH_OPENACC
FUNCTION M3_R2_W2R(PREDR1,PREDTH1,PD,PDRDZ,PLM,PLEPS,PTKE) RESULT(PM3_R2_W2R)
#else
-SUBROUTINE M3_R2_W2R(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PDRDZ,PLM,PLEPS,PTKE,PM3_R2_W2R)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE M3_R2_W2R(PREDR1,PREDTH1,PD,PDRDZ,PLM,PLEPS,PTKE,PM3_R2_W2R)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
@@ -3065,7 +2955,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'M3_R2_W2R', 'OpenACC: not yet tested' )
PM3_R2_W2R = M3_TH2_W2TH(PREDR1,PREDTH1,PD,PDRDZ,PLM,PLEPS,PTKE)
#else
!$acc data present( PREDR1, PREDTH1, PD, PDRDZ, PLM, PLEPS, PTKE, PM3_R2_W2R )
-CALL M3_TH2_W2TH(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PDRDZ,PLM,PLEPS,PTKE,PM3_R2_W2R)
+CALL M3_TH2_W2TH( PREDR1, PREDTH1, PD, PDRDZ, PLM, PLEPS, PTKE, PM3_R2_W2R )
!$acc end data
#endif
!
@@ -3078,10 +2968,7 @@ END SUBROUTINE M3_R2_W2R
#ifndef MNH_OPENACC
FUNCTION D_M3_R2_W2R_O_DDRDZ(PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,OUSERV) RESULT(PD_M3_R2_W2R_O_DDRDZ)
#else
-SUBROUTINE D_M3_R2_W2R_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,OUSERV,PD_M3_R2_W2R_O_DDRDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_R2_W2R_O_DDRDZ(PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,OUSERV,PD_M3_R2_W2R_O_DDRDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
@@ -3103,7 +2990,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_R2_W2R_O_DDRDZ', 'OpenACC: not yet t
PD_M3_R2_W2R_O_DDRDZ = D_M3_TH2_W2TH_O_DDTDZ(PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,OUSERV)
#else
!$acc data present( PREDR1, PREDTH1, PD, PLM, PLEPS, PTKE,OUSERV, PD_M3_R2_W2R_O_DDRDZ )
-CALL D_M3_TH2_W2TH_O_DDTDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,OUSERV,PD_M3_R2_W2R_O_DDRDZ)
+CALL D_M3_TH2_W2TH_O_DDTDZ(PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,OUSERV,PD_M3_R2_W2R_O_DDRDZ)
!$acc end data
#endif
!
@@ -3116,10 +3003,7 @@ END SUBROUTINE D_M3_R2_W2R_O_DDRDZ
#ifndef MNH_OPENACC
FUNCTION M3_R2_WR2(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE) RESULT(PM3_R2_WR2)
#else
-SUBROUTINE M3_R2_WR2(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PM3_R2_WR2)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE M3_R2_WR2(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PM3_R2_WR2)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
@@ -3139,7 +3023,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'M3_R2_WR2', 'OpenACC: not yet tested' )
PM3_R2_WR2 = M3_TH2_WTH2(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE)
#else
!$acc data present( PREDR1, PREDTH1, PD, PLEPS, PSQRT_TKE, PM3_R2_WR2 )
-CALL M3_TH2_WTH2(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PM3_R2_WR2)
+CALL M3_TH2_WTH2(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PM3_R2_WR2)
!$acc end data
#endif
!
@@ -3152,10 +3036,7 @@ END SUBROUTINE M3_R2_WR2
#ifndef MNH_OPENACC
FUNCTION D_M3_R2_WR2_O_DDRDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST) RESULT(PD_M3_R2_WR2_O_DDRDZ)
#else
-SUBROUTINE D_M3_R2_WR2_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PD_M3_R2_WR2_O_DDRDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_R2_WR2_O_DDRDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PD_M3_R2_WR2_O_DDRDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
@@ -3177,7 +3058,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_R2_WR2_O_DDRDZ', 'OpenACC: not yet t
PD_M3_R2_WR2_O_DDRDZ = D_M3_TH2_WTH2_O_DDTDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST)
#else
!$acc data present( PREDR1, PREDTH1, PD, PLEPS, PSQRT_TKE, PBLL_O_E, PEMOIST, PD_M3_R2_WR2_O_DDRDZ )
-CALL D_M3_TH2_WTH2_O_DDTDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PD_M3_R2_WR2_O_DDRDZ)
+CALL D_M3_TH2_WTH2_O_DDTDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PD_M3_R2_WR2_O_DDRDZ)
!$acc end data
#endif
!
@@ -3190,10 +3071,7 @@ END SUBROUTINE D_M3_R2_WR2_O_DDRDZ
#ifndef MNH_OPENACC
FUNCTION M3_R2_W2TH(PD,PLM,PLEPS,PTKE,PBLL_O_E,PETHETA,PDRDZ) RESULT(PM3_R2_W2TH)
#else
-SUBROUTINE M3_R2_W2TH(KKA,KKU,KKL,PD,PLM,PLEPS,PTKE,PBLL_O_E,PETHETA,PDRDZ,PM3_R2_W2TH)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE M3_R2_W2TH(PD,PLM,PLEPS,PTKE,PBLL_O_E,PETHETA,PDRDZ,PM3_R2_W2TH)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PLM
@@ -3215,7 +3093,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'M3_R2_W2TH', 'OpenACC: not yet tested' )
PM3_R2_W2TH = M3_TH2_W2R(PD,PLM,PLEPS,PTKE,PBLL_O_E,PETHETA,PDRDZ)
#else
!$acc data present( PD, PLM, PLEPS, PTKE, PBLL_O_E, PETHETA, PDRDZ, PM3_R2_W2TH )
-CALL M3_TH2_W2R(KKA,KKU,KKL,PD,PLM,PLEPS,PTKE,PBLL_O_E,PETHETA,PDRDZ,PM3_R2_W2TH)
+CALL M3_TH2_W2R(PD,PLM,PLEPS,PTKE,PBLL_O_E,PETHETA,PDRDZ,PM3_R2_W2TH)
!$acc end data
#endif
!
@@ -3228,10 +3106,7 @@ END SUBROUTINE M3_R2_W2TH
#ifndef MNH_OPENACC
FUNCTION D_M3_R2_W2TH_O_DDRDZ(PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PETHETA,PDRDZ) RESULT(PD_M3_R2_W2TH_O_DDRDZ)
#else
-SUBROUTINE D_M3_R2_W2TH_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PETHETA,PDRDZ,PD_M3_R2_W2TH_O_DDRDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_R2_W2TH_O_DDRDZ(PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PETHETA,PDRDZ,PD_M3_R2_W2TH_O_DDRDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
@@ -3255,7 +3130,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_R2_W2TH_O_DDRDZ', 'OpenACC: not yet
PD_M3_R2_W2TH_O_DDRDZ = D_M3_TH2_W2R_O_DDTDZ(PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PETHETA,PDRDZ)
#else
!$acc data present( PREDR1, PREDTH1, PD, PLM, PLEPS, PTKE, PBLL_O_E, PETHETA, PDRDZ, PD_M3_R2_W2TH_O_DDRDZ )
-CALL D_M3_TH2_W2R_O_DDTDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PETHETA,PDRDZ,PD_M3_R2_W2TH_O_DDRDZ)
+CALL D_M3_TH2_W2R_O_DDTDZ(PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PETHETA,PDRDZ,PD_M3_R2_W2TH_O_DDRDZ)
!$acc end data
#endif
!
@@ -3268,10 +3143,7 @@ END SUBROUTINE D_M3_R2_W2TH_O_DDRDZ
#ifndef MNH_OPENACC
FUNCTION M3_R2_WTH2(PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ) RESULT(PM3_R2_WTH2)
#else
-SUBROUTINE M3_R2_WTH2(KKA,KKU,KKL,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PM3_R2_WTH2)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE M3_R2_WTH2(PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PM3_R2_WTH2)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PLEPS
@@ -3292,7 +3164,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'M3_R2_WTH2', 'OpenACC: not yet tested' )
PM3_R2_WTH2 = M3_TH2_WR2(PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ)
#else
!$acc data present( PD, PLEPS, PSQRT_TKE, PBLL_O_E, PETHETA, PDRDZ, PM3_R2_WTH2 )
-CALL M3_TH2_WR2(KKA,KKU,KKL,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PM3_R2_WTH2)
+CALL M3_TH2_WR2(PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PM3_R2_WTH2)
!$acc end data
#endif
!
@@ -3305,10 +3177,7 @@ END SUBROUTINE M3_R2_WTH2
#ifndef MNH_OPENACC
FUNCTION D_M3_R2_WTH2_O_DDRDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ) RESULT(PD_M3_R2_WTH2_O_DDRDZ)
#else
-SUBROUTINE D_M3_R2_WTH2_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PD_M3_R2_WTH2_O_DDRDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_R2_WTH2_O_DDRDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PD_M3_R2_WTH2_O_DDRDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
@@ -3331,7 +3200,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_R2_WTH2_O_DDRDZ', 'OpenACC: not yet
PD_M3_R2_WTH2_O_DDRDZ = D_M3_TH2_WR2_O_DDTDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ)
#else
!$acc data present( PREDR1, PREDTH1, PD, PLEPS, PSQRT_TKE, PBLL_O_E, PETHETA, PDRDZ, PD_M3_R2_WTH2_O_DDRDZ )
-CALL D_M3_TH2_WR2_O_DDTDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PD_M3_R2_WTH2_O_DDRDZ)
+CALL D_M3_TH2_WR2_O_DDTDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PD_M3_R2_WTH2_O_DDRDZ)
!$acc end data
#endif
!
@@ -3344,10 +3213,7 @@ END SUBROUTINE D_M3_R2_WTH2_O_DDRDZ
#ifndef MNH_OPENACC
FUNCTION M3_R2_WTHR(PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ) RESULT(PM3_R2_WTHR)
#else
-SUBROUTINE M3_R2_WTHR(KKA,KKU,KKL,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PM3_R2_WTHR)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE M3_R2_WTHR(PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PM3_R2_WTHR)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -3369,7 +3235,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'M3_R2_WTHR', 'OpenACC: not yet tested' )
PM3_R2_WTHR = M3_TH2_WTHR(PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ)
#else
!$acc data present( PREDTH1, PD, PLEPS, PSQRT_TKE, PBLL_O_E, PETHETA, PDRDZ, PM3_R2_WTHR )
-CALL M3_TH2_WTHR(KKA,KKU,KKL,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PM3_R2_WTHR)
+CALL M3_TH2_WTHR(PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PM3_R2_WTHR)
!$acc end data
#endif
!
@@ -3382,10 +3248,7 @@ END SUBROUTINE M3_R2_WTHR
#ifndef MNH_OPENACC
FUNCTION D_M3_R2_WTHR_O_DDRDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ) RESULT(PD_M3_R2_WTHR_O_DDRDZ)
#else
-SUBROUTINE D_M3_R2_WTHR_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PD_M3_R2_WTHR_O_DDRDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_R2_WTHR_O_DDRDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PD_M3_R2_WTHR_O_DDRDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
@@ -3408,7 +3271,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_R2_WTHR_O_DDRDZ', 'OpenACC: not yet
PD_M3_R2_WTHR_O_DDRDZ = D_M3_TH2_WTHR_O_DDTDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ)
#else
!$acc data present( PREDR1, PREDTH1, PD, PLEPS, PSQRT_TKE, PBLL_O_E, PETHETA, PDRDZ, PD_M3_R2_WTHR_O_DDRDZ )
-CALL D_M3_TH2_WTHR_O_DDTDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PD_M3_R2_WTHR_O_DDRDZ)
+CALL D_M3_TH2_WTHR_O_DDTDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PD_M3_R2_WTHR_O_DDRDZ)
!$acc end data
#endif
!
@@ -3421,10 +3284,7 @@ END SUBROUTINE D_M3_R2_WTHR_O_DDRDZ
#ifndef MNH_OPENACC
FUNCTION D_M3_THR_WTHR_O_DDRDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST) RESULT(PD_M3_THR_WTHR_O_DDRDZ)
#else
-SUBROUTINE D_M3_THR_WTHR_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PD_M3_THR_WTHR_O_DDRDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_THR_WTHR_O_DDRDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PD_M3_THR_WTHR_O_DDRDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
@@ -3446,7 +3306,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_THR_WTHR_O_DDRDZ', 'OpenACC: not yet
PD_M3_THR_WTHR_O_DDRDZ = D_M3_THR_WTHR_O_DDTDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST)
#else
!$acc data present( PREDR1, PREDTH1, PD, PLEPS, PSQRT_TKE, PBLL_O_E, PEMOIST, PD_M3_THR_WTHR_O_DDRDZ )
-CALL D_M3_THR_WTHR_O_DDTDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PD_M3_THR_WTHR_O_DDRDZ)
+CALL D_M3_THR_WTHR_O_DDTDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PD_M3_THR_WTHR_O_DDRDZ)
!$acc end data
#endif
!
@@ -3459,10 +3319,7 @@ END SUBROUTINE D_M3_THR_WTHR_O_DDRDZ
#ifndef MNH_OPENACC
FUNCTION M3_THR_WR2(PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ) RESULT(PM3_THR_WR2)
#else
-SUBROUTINE M3_THR_WR2(KKA,KKU,KKL,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ,PM3_THR_WR2)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE M3_THR_WR2(PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ,PM3_THR_WR2)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -3484,7 +3341,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'M3_THR_WR2', 'OpenACC: not yet tested' )
PM3_THR_WR2 = M3_THR_WTH2(PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ)
#else
!$acc data present( PREDTH1, PD, PLEPS, PSQRT_TKE, PBLL_O_E, PEMOIST, PDTDZ, PM3_THR_WR2 )
-CALL M3_THR_WTH2(KKA,KKU,KKL,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ,PM3_THR_WR2)
+CALL M3_THR_WTH2(PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ,PM3_THR_WR2)
!$acc end data
#endif
!
@@ -3497,10 +3354,7 @@ END SUBROUTINE M3_THR_WR2
#ifndef MNH_OPENACC
FUNCTION D_M3_THR_WR2_O_DDRDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ) RESULT(PD_M3_THR_WR2_O_DDRDZ)
#else
-SUBROUTINE D_M3_THR_WR2_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ,PD_M3_THR_WR2_O_DDRDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_THR_WR2_O_DDRDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ,PD_M3_THR_WR2_O_DDRDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
@@ -3523,7 +3377,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_THR_WR2_O_DDRDZ', 'OpenACC: not yet
PD_M3_THR_WR2_O_DDRDZ = D_M3_THR_WTH2_O_DDTDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ)
#else
!$acc data present( PREDR1, PREDTH1, PD, PLEPS, PSQRT_TKE, PBLL_O_E, PEMOIST, PDTDZ, PD_M3_THR_WR2_O_DDRDZ )
-CALL D_M3_THR_WTH2_O_DDTDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ,PD_M3_THR_WR2_O_DDRDZ)
+CALL D_M3_THR_WTH2_O_DDTDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ,PD_M3_THR_WR2_O_DDRDZ)
!$acc end data
#endif
!
@@ -3536,10 +3390,7 @@ END SUBROUTINE D_M3_THR_WR2_O_DDRDZ
#ifndef MNH_OPENACC
FUNCTION D_M3_THR_WR2_O_DDTDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST) RESULT(PD_M3_THR_WR2_O_DDTDZ)
#else
-SUBROUTINE D_M3_THR_WR2_O_DDTDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PD_M3_THR_WR2_O_DDTDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_THR_WR2_O_DDTDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PD_M3_THR_WR2_O_DDTDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
@@ -3561,7 +3412,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_THR_WR2_O_DDTDZ', 'OpenACC: not yet
PD_M3_THR_WR2_O_DDTDZ = D_M3_THR_WTH2_O_DDRDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST)
#else
!$acc data present( PREDR1, PREDTH1, PD, PLEPS, PSQRT_TKE, PBLL_O_E, PEMOIST, PD_M3_THR_WR2_O_DDTDZ )
-CALL D_M3_THR_WTH2_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PD_M3_THR_WR2_O_DDTDZ)
+CALL D_M3_THR_WTH2_O_DDRDZ(PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PD_M3_THR_WR2_O_DDTDZ)
!$acc end data
#endif
!
@@ -3574,10 +3425,7 @@ END SUBROUTINE D_M3_THR_WR2_O_DDTDZ
#ifndef MNH_OPENACC
FUNCTION M3_THR_W2R(PREDTH1,PD,PLM,PLEPS,PTKE,PDTDZ) RESULT(PM3_THR_W2R)
#else
-SUBROUTINE M3_THR_W2R(KKA,KKU,KKL,PREDTH1,PD,PLM,PLEPS,PTKE,PDTDZ,PM3_THR_W2R)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE M3_THR_W2R(PREDTH1,PD,PLM,PLEPS,PTKE,PDTDZ,PM3_THR_W2R)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -3598,7 +3446,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'M3_THR_W2R', 'OpenACC: not yet tested' )
PM3_THR_W2R = M3_THR_W2TH(PREDTH1,PD,PLM,PLEPS,PTKE,PDTDZ)
#else
!$acc data present( PREDTH1, PD, PLM, PLEPS, PTKE, PDTDZ, PM3_THR_W2R )
-CALL M3_THR_W2TH(KKA,KKU,KKL,PREDTH1,PD,PLM,PLEPS,PTKE,PDTDZ,PM3_THR_W2R)
+CALL M3_THR_W2TH(PREDTH1,PD,PLM,PLEPS,PTKE,PDTDZ,PM3_THR_W2R)
!$acc end data
#endif
!
@@ -3611,10 +3459,7 @@ END SUBROUTINE M3_THR_W2R
#ifndef MNH_OPENACC
FUNCTION D_M3_THR_W2R_O_DDRDZ(PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PDTDZ,PEMOIST) RESULT(PD_M3_THR_W2R_O_DDRDZ)
#else
-SUBROUTINE D_M3_THR_W2R_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PDTDZ,PEMOIST,PD_M3_THR_W2R_O_DDRDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_THR_W2R_O_DDRDZ(PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PDTDZ,PEMOIST,PD_M3_THR_W2R_O_DDRDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
@@ -3638,7 +3483,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_THR_W2R_O_DDRDZ', 'OpenACC: not yet
PD_M3_THR_W2R_O_DDRDZ = D_M3_THR_W2TH_O_DDTDZ(PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PDTDZ,PEMOIST)
#else
!$acc data present( PREDR1, PREDTH1, PD, PLM, PLEPS, PTKE, PBLL_O_E, PDTDZ, PEMOIST, PD_M3_THR_W2R_O_DDRDZ )
-CALL D_M3_THR_W2TH_O_DDTDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PDTDZ,PEMOIST,PD_M3_THR_W2R_O_DDRDZ)
+CALL D_M3_THR_W2TH_O_DDTDZ(PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PDTDZ,PEMOIST,PD_M3_THR_W2R_O_DDRDZ)
!$acc end data
#endif
!
@@ -3651,10 +3496,7 @@ END SUBROUTINE D_M3_THR_W2R_O_DDRDZ
#ifndef MNH_OPENACC
FUNCTION D_M3_THR_W2R_O_DDTDZ(PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE) RESULT(PD_M3_THR_W2R_O_DDTDZ)
#else
-SUBROUTINE D_M3_THR_W2R_O_DDTDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PD_M3_THR_W2R_O_DDTDZ)
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
- INTEGER, INTENT(IN) :: KKL
+SUBROUTINE D_M3_THR_W2R_O_DDTDZ(PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PD_M3_THR_W2R_O_DDTDZ)
#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
@@ -3675,7 +3517,7 @@ call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_THR_W2R_O_DDTDZ', 'OpenACC: not yet
PD_M3_THR_W2R_O_DDTDZ = D_M3_THR_W2TH_O_DDRDZ(PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE)
#else
!$acc data present( PREDR1, PREDTH1, PD, PLM, PLEPS, PTKE, PD_M3_THR_W2R_O_DDTDZ )
-CALL D_M3_THR_W2TH_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PD_M3_THR_W2R_O_DDTDZ)
+CALL D_M3_THR_W2TH_O_DDRDZ(PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PD_M3_THR_W2R_O_DDTDZ)
!$acc end data
#endif
!
diff --git a/src/MNH/turb_ver_thermo_corr.f90 b/src/MNH/turb_ver_thermo_corr.f90
index b5fa0ccffeea5dd059a4e83b845eccde7a7d00a2..aabdbebf42439d41b28db34b7875a31ba8dc252a 100644
--- a/src/MNH/turb_ver_thermo_corr.f90
+++ b/src/MNH/turb_ver_thermo_corr.f90
@@ -600,11 +600,11 @@ END IF
END IF
#else
IF (GFTH2) THEN
- CALL M3_TH2_WTH2(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),ZTMP1_DEVICE(:,:,:))
+ CALL M3_TH2_WTH2( PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),ZTMP1_DEVICE(:,:,:))
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFTH2(:,:,:)
!$acc end kernels
- CALL D_M3_TH2_WTH2_O_DDTDZ(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),&
+ CALL D_M3_TH2_WTH2_O_DDTDZ( PREDTH1(:,:,:),PREDR1(:,:,:),&
& PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PETHETA(:,:,:),ZTMP2_DEVICE(:,:,:))
!$acc kernels
ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + ZTMP2_DEVICE(:,:,:) * PFTH2(:,:,:)
@@ -623,12 +623,11 @@ END IF
#else
IF (GFWTH) THEN
CALL MZF_DEVICE( PFWTH(:,:,:), ZTMP1_DEVICE(:,:,:) )
- CALL M3_TH2_W2TH(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),PDTH_DZ(:,:,:),&
- & PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),ZTMP2_DEVICE(:,:,:))
+ CALL M3_TH2_W2TH( PREDTH1(:,:,:), PREDR1(:,:,:), PD(:,:,:), PDTH_DZ(:,:,:), PLM(:,:,:), PLEPS(:,:,:), PTKEM(:,:,:), ZTMP2_DEVICE(:,:,:) )
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + ZTMP2_DEVICE(:,:,:) * ZTMP1_DEVICE(:,:,:)
!$acc end kernels
- CALL D_M3_TH2_W2TH_O_DDTDZ(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),&
+ CALL D_M3_TH2_W2TH_O_DDTDZ( PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),&
& PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),GUSERV,ZTMP2_DEVICE(:,:,:))
!$acc kernels
ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + ZTMP2_DEVICE(:,:,:) * ZTMP1_DEVICE(:,:,:)
@@ -647,12 +646,12 @@ END IF
END IF
#else
IF (GFR2) THEN
- CALL M3_TH2_WR2(KKA,KKU,KKL,PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),&
+ CALL M3_TH2_WR2( PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),&
& PEMOIST(:,:,:),PDTH_DZ(:,:,:),ZTMP1_DEVICE(:,:,:))
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFR2(:,:,:)
!$acc end kernels
- CALL D_M3_TH2_WR2_O_DDTDZ(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),&
+ CALL D_M3_TH2_WR2_O_DDTDZ( PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),&
& PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PEMOIST(:,:,:),PDTH_DZ(:,:,:),ZTMP2_DEVICE(:,:,:))
!$acc kernels
ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + ZTMP2_DEVICE(:,:,:) * PFR2(:,:,:)
@@ -671,9 +670,9 @@ END IF
#else
IF (GFWR) THEN
CALL MZF_DEVICE( PFWR(:,:,:), ZTMP1_DEVICE(:,:,:) )
- CALL M3_TH2_W2R(KKA,KKU,KKL,PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),PBLL_O_E(:,:,:),&
+ CALL M3_TH2_W2R( PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),PBLL_O_E(:,:,:),&
& PEMOIST(:,:,:),PDTH_DZ(:,:,:),ZTMP2_DEVICE(:,:,:))
- CALL D_M3_TH2_W2R_O_DDTDZ(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),&
+ CALL D_M3_TH2_W2R_O_DDTDZ( PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),&
& PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),PBLL_O_E(:,:,:),PEMOIST(:,:,:),PDTH_DZ(:,:,:),ZTMP3_DEVICE(:,:,:))
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + ZTMP2_DEVICE(:,:,:) * ZTMP1_DEVICE(:,:,:)
@@ -694,12 +693,12 @@ END IF
END IF
#else
IF (GFTHR) THEN
- CALL M3_TH2_WTHR(KKA,KKU,KKL,PREDR1(:,:,:),PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),&
+ CALL M3_TH2_WTHR( PREDR1(:,:,:),PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),&
& PBLL_O_E(:,:,:),PEMOIST(:,:,:),PDTH_DZ(:,:,:),ZTMP1_DEVICE(:,:,:))
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFTHR(:,:,:)
!$acc end kernels
- CALL D_M3_TH2_WTHR_O_DDTDZ(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),&
+ CALL D_M3_TH2_WTHR_O_DDTDZ( PREDTH1(:,:,:),PREDR1(:,:,:),&
& PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PEMOIST(:,:,:),PDTH_DZ(:,:,:),ZTMP2_DEVICE(:,:,:))
!$acc kernels
ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + ZTMP2_DEVICE(:,:,:) * PFTHR(:,:,:)
@@ -877,17 +876,17 @@ END IF
END IF
#else
IF (GFTH2) THEN
- CALL M3_THR_WTH2(KKA,KKU,KKL,PREDR1(:,:,:),PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),&
+ CALL M3_THR_WTH2( PREDR1(:,:,:),PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),&
& PBLL_O_E(:,:,:),PETHETA(:,:,:),PDR_DZ(:,:,:),ZTMP1_DEVICE(:,:,:))
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFTH2(:,:,:)
!$acc end kernels
- CALL D_M3_THR_WTH2_O_DDTDZ(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),&
+ CALL D_M3_THR_WTH2_O_DDTDZ( PREDTH1(:,:,:),PREDR1(:,:,:),&
& PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PETHETA(:,:,:),PDR_DZ(:,:,:),ZTMP1_DEVICE(:,:,:))
!$acc kernels
ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFTH2(:,:,:)
!$acc end kernels
- CALL D_M3_THR_WTH2_O_DDRDZ(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),&
+ CALL D_M3_THR_WTH2_O_DDRDZ( PREDTH1(:,:,:),PREDR1(:,:,:),&
& PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PETHETA(:,:,:),ZTMP1_DEVICE(:,:,:))
!$acc kernels
ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFTH2(:,:,:)
@@ -907,18 +906,18 @@ END IF
END IF
#else
IF (GFWTH) THEN
- CALL M3_THR_W2TH(KKA,KKU,KKL,PREDR1(:,:,:),PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),&
+ CALL M3_THR_W2TH( PREDR1(:,:,:),PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),&
& PDR_DZ(:,:,:),ZTMP1_DEVICE(:,:,:))
CALL MZF_DEVICE( PFWTH(:,:,:), ZTMP2_DEVICE(:,:,:) )
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + ZTMP1_DEVICE(:,:,:) * ZTMP2_DEVICE(:,:,:)
!$acc end kernels
- CALL D_M3_THR_W2TH_O_DDTDZ(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),&
+ CALL D_M3_THR_W2TH_O_DDTDZ( PREDTH1(:,:,:),PREDR1(:,:,:),&
& PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),PBLL_O_E(:,:,:),PDR_DZ(:,:,:),PETHETA(:,:,:),ZTMP1_DEVICE(:,:,:))
!$acc kernels
ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + ZTMP1_DEVICE(:,:,:) * ZTMP2_DEVICE(:,:,:)
!$acc end kernels
- CALL D_M3_THR_W2TH_O_DDRDZ(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),&
+ CALL D_M3_THR_W2TH_O_DDRDZ( PREDTH1(:,:,:),PREDR1(:,:,:),&
& PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),ZTMP1_DEVICE(:,:,:))
!$acc kernels
ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + ZTMP1_DEVICE(:,:,:) * ZTMP2_DEVICE(:,:,:)
@@ -938,17 +937,17 @@ END IF
END IF
#else
IF (GFR2) THEN
- CALL M3_THR_WR2(KKA,KKU,KKL,PREDTH1(:,:,:),PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),&
+ CALL M3_THR_WR2( PREDTH1(:,:,:),PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),&
& PBLL_O_E(:,:,:),PEMOIST(:,:,:),PDTH_DZ(:,:,:),ZTMP1_DEVICE(:,:,:))
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFR2(:,:,:)
!$acc end kernels
- CALL D_M3_THR_WR2_O_DDTDZ(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),&
+ CALL D_M3_THR_WR2_O_DDTDZ( PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),&
& PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PEMOIST(:,:,:),ZTMP1_DEVICE(:,:,:))
!$acc kernels
ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFR2(:,:,:)
!$acc end kernels
- CALL D_M3_THR_WR2_O_DDRDZ(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),&
+ CALL D_M3_THR_WR2_O_DDRDZ( PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),&
& PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PEMOIST(:,:,:),PDTH_DZ(:,:,:),ZTMP1_DEVICE(:,:,:))
!$acc kernels
ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFR2(:,:,:)
@@ -969,17 +968,17 @@ END IF
#else
IF (GFWR) THEN
CALL MZF_DEVICE( PFWR(:,:,:), ZTMP1_DEVICE(:,:,:) )
- CALL M3_THR_W2R(KKA,KKU,KKL,PREDTH1(:,:,:),PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),&
+ CALL M3_THR_W2R( PREDTH1(:,:,:),PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),&
& PDTH_DZ(:,:,:),ZTMP2_DEVICE(:,:,:))
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + ZTMP2_DEVICE(:,:,:) * ZTMP1_DEVICE(:,:,:)
!$acc end kernels
- CALL D_M3_THR_W2R_O_DDTDZ(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),&
+ CALL D_M3_THR_W2R_O_DDTDZ( PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),&
& PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),ZTMP2_DEVICE(:,:,:))
!$acc kernels
ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + ZTMP2_DEVICE(:,:,:) * ZTMP1_DEVICE(:,:,:)
!$acc end kernels
- CALL D_M3_THR_W2R_O_DDRDZ(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),&
+ CALL D_M3_THR_W2R_O_DDRDZ( PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),&
& PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),PBLL_O_E(:,:,:),PDTH_DZ(:,:,:),PEMOIST(:,:,:),ZTMP2_DEVICE(:,:,:))
!$acc kernels
ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + ZTMP2_DEVICE(:,:,:) * ZTMP1_DEVICE(:,:,:)
@@ -999,17 +998,17 @@ END IF
END IF
#else
IF (GFTHR) THEN
- CALL M3_THR_WTHR(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),PLEPS(:,:,:),&
+ CALL M3_THR_WTHR( PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),PLEPS(:,:,:),&
& PSQRT_TKE(:,:,:),ZTMP1_DEVICE(:,:,:))
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFTHR(:,:,:)
!$acc end kernels
- CALL D_M3_THR_WTHR_O_DDTDZ(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),&
+ CALL D_M3_THR_WTHR_O_DDTDZ( PREDTH1(:,:,:),PREDR1(:,:,:),&
& PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PETHETA(:,:,:),ZTMP1_DEVICE(:,:,:))
!$acc kernels
ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFTHR(:,:,:)
!$acc end kernels
- CALL D_M3_THR_WTHR_O_DDRDZ(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),&
+ CALL D_M3_THR_WTHR_O_DDRDZ( PREDR1(:,:,:),PREDTH1(:,:,:),&
& PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PEMOIST(:,:,:),ZTMP1_DEVICE(:,:,:))
!$acc kernels
ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFTHR(:,:,:)
@@ -1244,12 +1243,12 @@ END IF
END IF
#else
IF (GFR2) THEN
- CALL M3_R2_WR2(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),PLEPS(:,:,:),&
+ CALL M3_R2_WR2( PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),PLEPS(:,:,:),&
& PSQRT_TKE(:,:,:),ZTMP1_DEVICE(:,:,:))
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFR2(:,:,:)
!$acc end kernels
- CALL D_M3_R2_WR2_O_DDRDZ(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),&
+ CALL D_M3_R2_WR2_O_DDRDZ( PREDR1(:,:,:),PREDTH1(:,:,:),&
& PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PEMOIST(:,:,:),ZTMP1_DEVICE(:,:,:))
!$acc kernels
ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFR2(:,:,:)
@@ -1268,12 +1267,12 @@ END IF
#else
IF (GFWR) THEN
CALL MZF_DEVICE( PFWR(:,:,:), ZTMP1_DEVICE(:,:,:) )
- CALL M3_R2_W2R(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),PDR_DZ(:,:,:),&
+ CALL M3_R2_W2R( PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),PDR_DZ(:,:,:),&
& PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),ZTMP2_DEVICE(:,:,:))
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + ZTMP2_DEVICE(:,:,:) * ZTMP1_DEVICE(:,:,:)
!$acc end kernels
- CALL D_M3_R2_W2R_O_DDRDZ(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),&
+ CALL D_M3_R2_W2R_O_DDRDZ( PREDR1(:,:,:),PREDTH1(:,:,:),&
& PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),GUSERV,ZTMP3_DEVICE(:,:,:))
!$acc kernels
ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + ZTMP3_DEVICE(:,:,:) * ZTMP1_DEVICE(:,:,:)
@@ -1292,12 +1291,12 @@ END IF
END IF
#else
IF (GFTH2) THEN
- CALL M3_R2_WTH2(KKA,KKU,KKL,PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),&
+ CALL M3_R2_WTH2( PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),&
& PBLL_O_E(:,:,:),PETHETA(:,:,:),PDR_DZ(:,:,:),ZTMP1_DEVICE(:,:,:))
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFTH2(:,:,:)
!$acc end kernels
- CALL D_M3_R2_WTH2_O_DDRDZ(KKA,KKU,KKL,PREDR1(:,:,:),&
+ CALL D_M3_R2_WTH2_O_DDRDZ( PREDR1(:,:,:),&
& PREDTH1(:,:,:),PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PETHETA(:,:,:),PDR_DZ(:,:,:),ZTMP2_DEVICE(:,:,:))
!$acc kernels
ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + ZTMP2_DEVICE(:,:,:) * PFTH2(:,:,:)
@@ -1317,12 +1316,12 @@ END IF
#else
IF (GFWTH) THEN
CALL MZF_DEVICE( PFWTH(:,:,:), ZTMP1_DEVICE(:,:,:) )
- CALL M3_R2_W2TH(KKA,KKU,KKL,PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),&
+ CALL M3_R2_W2TH( PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),&
& PBLL_O_E(:,:,:),PETHETA(:,:,:),PDR_DZ(:,:,:),ZTMP2_DEVICE(:,:,:))
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + ZTMP2_DEVICE(:,:,:) * ZTMP1_DEVICE(:,:,:)
!$acc end kernels
- CALL D_M3_R2_W2TH_O_DDRDZ(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),&
+ CALL D_M3_R2_W2TH_O_DDRDZ( PREDR1(:,:,:),PREDTH1(:,:,:),&
& PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),PBLL_O_E(:,:,:),PETHETA(:,:,:),PDR_DZ(:,:,:),ZTMP3_DEVICE(:,:,:))
!$acc kernels
ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + ZTMP3_DEVICE(:,:,:) * ZTMP1_DEVICE(:,:,:)
@@ -1340,12 +1339,12 @@ END IF
END IF
#else
IF (GFTHR) THEN
- CALL M3_R2_WTHR(KKA,KKU,KKL,PREDTH1(:,:,:),PD(:,:,:),PLEPS(:,:,:),&
+ CALL M3_R2_WTHR( PREDTH1(:,:,:),PD(:,:,:),PLEPS(:,:,:),&
& PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PETHETA(:,:,:),PDR_DZ(:,:,:),ZTMP1_DEVICE(:,:,:))
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFTHR(:,:,:)
!$acc end kernels
- CALL D_M3_R2_WTHR_O_DDRDZ(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),&
+ CALL D_M3_R2_WTHR_O_DDRDZ( PREDR1(:,:,:),PREDTH1(:,:,:),&
& PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PETHETA(:,:,:),PDR_DZ(:,:,:),ZTMP2_DEVICE(:,:,:))
!$acc kernels
ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + ZTMP2_DEVICE(:,:,:) * PFTHR(:,:,:)
diff --git a/src/MNH/turb_ver_thermo_flux.f90 b/src/MNH/turb_ver_thermo_flux.f90
index 660a8e7197c22e6d2c6b28845089de0e673acbb8..f2b661492aef286424ed573e6f114d052ff77456 100644
--- a/src/MNH/turb_ver_thermo_flux.f90
+++ b/src/MNH/turb_ver_thermo_flux.f90
@@ -780,13 +780,12 @@ IF (GFWTH) THEN
END IF
#else
IF (GFWTH) THEN
- CALL M3_WTH_W2TH(KKA,KKU,KKL,PREDTH1,PREDR1,PD,ZKEFF,PTKEM,Z3RDMOMENT)
+ CALL M3_WTH_W2TH( PREDTH1, PREDR1, PD, ZKEFF, PTKEM, Z3RDMOMENT )
!
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + Z3RDMOMENT(:,:,:) * PFWTH(:,:,:)
!$acc end kernels
- CALL D_M3_WTH_W2TH_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,&
- & PD,PBLL_O_E,PETHETA,ZKEFF,PTKEM,ZTMP1_DEVICE)
+ CALL D_M3_WTH_W2TH_O_DDTDZ( PREDTH1, PREDR1, PD,PBLL_O_E, PETHETA, ZKEFF, PTKEM, ZTMP1_DEVICE )
!$acc kernels
ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFWTH(:,:,:)
!$acc end kernels
@@ -829,13 +828,11 @@ IF (GFWR) THEN
END IF
#else
IF (GFWR) THEN
- CALL M3_WTH_W2R(KKA,KKU,KKL,PREDTH1,PREDR1,PD,ZKEFF,&
- & PTKEM,PBLL_O_E,PEMOIST,PDTH_DZ,ZTMP1_DEVICE)
+ CALL M3_WTH_W2R( PD, ZKEFF, PTKEM, PBLL_O_E, PEMOIST, PDTH_DZ, ZTMP1_DEVICE )
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFWR(:,:,:)
!$acc end kernels
- CALL D_M3_WTH_W2R_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,&
- & PD,ZKEFF,PTKEM,PBLL_O_E,PEMOIST,ZTMP2_DEVICE)
+ CALL D_M3_WTH_W2R_O_DDTDZ( PREDTH1, PREDR1, PD, ZKEFF, PTKEM, PBLL_O_E, PEMOIST, ZTMP2_DEVICE )
!$acc kernels
ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + ZTMP2_DEVICE(:,:,:) * PFWR(:,:,:)
!$acc end kernels
@@ -852,14 +849,12 @@ IF (GFR2) THEN
END IF
#else
IF (GFR2) THEN
- CALL M3_WTH_WR2(KKA,KKU,KKL,PREDTH1,PREDR1,PD,ZKEFF,PTKEM,&
- & PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PEMOIST,PDTH_DZ,ZTMP1_DEVICE)
+ CALL M3_WTH_WR2( PD, ZKEFF, PTKEM, PSQRT_TKE, PBLL_O_E, PBETA, PLEPS, PEMOIST, PDTH_DZ, ZTMP1_DEVICE )
CALL MZM_DEVICE(PFR2,ZTMP2_DEVICE)
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + ZTMP1_DEVICE(:,:,:) * ZTMP2_DEVICE(:,:,:)
!$acc end kernels
- CALL D_M3_WTH_WR2_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,&
- & ZKEFF,PTKEM,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PEMOIST,ZTMP1_DEVICE)
+ CALL D_M3_WTH_WR2_O_DDTDZ( PREDTH1, PREDR1, PD, ZKEFF, PTKEM, PSQRT_TKE, PBLL_O_E, PBETA, PLEPS, PEMOIST, ZTMP1_DEVICE )
CALL MZM_DEVICE(PFR2,ZTMP2_DEVICE)
!$acc kernels
ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + ZTMP1_DEVICE(:,:,:) * ZTMP2_DEVICE(:,:,:)
@@ -878,8 +873,7 @@ IF (GFTHR) THEN
END IF
#else
IF (GFTHR) THEN
- CALL M3_WTH_WTHR(KKA,KKU,KKL,PREDR1,PD,ZKEFF,PTKEM,PSQRT_TKE,PBETA,&
- & PLEPS,PEMOIST,Z3RDMOMENT)
+ CALL M3_WTH_WTHR( PREDR1, PD, ZKEFF, PTKEM, PSQRT_TKE, PBETA, PLEPS, PEMOIST, Z3RDMOMENT )
!
CALL MZM_DEVICE(PFTHR,ZTMP1_DEVICE)
!$acc kernels
@@ -1272,13 +1266,12 @@ IF (KRR /= 0) THEN
END IF
#else
IF (GFWR) THEN
- CALL M3_WR_W2R(KKA,KKU,KKL,PREDR1,PREDTH1,PD,ZKEFF,PTKEM,Z3RDMOMENT)
+ CALL M3_WR_W2R(PREDR1,PREDTH1,PD,ZKEFF,PTKEM,Z3RDMOMENT)
!
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + Z3RDMOMENT(:,:,:) * PFWR(:,:,:)
!$acc end kernels
- CALL D_M3_WR_W2R_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,&
- & PBLL_O_E,PEMOIST,ZKEFF,PTKEM,ZTMP1_DEVICE)
+ CALL D_M3_WR_W2R_O_DDRDZ( PREDR1, PREDTH1, PD, PBLL_O_E, PEMOIST, ZKEFF, PTKEM, ZTMP1_DEVICE )
!$acc kernels
ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFWR(:,:,:)
!$acc end kernels
@@ -1320,13 +1313,12 @@ IF (KRR /= 0) THEN
END IF
#else
IF (GFWTH) THEN
- CALL M3_WR_W2TH(KKA,KKU,KKL,PREDR1,PREDTH1,PD,ZKEFF,&
+ CALL M3_WR_W2TH( PD,ZKEFF,&
& PTKEM,PBLL_O_E,PETHETA,PDR_DZ,ZTMP1_DEVICE)
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFWTH(:,:,:)
!$acc end kernels
- CALL D_M3_WR_W2TH_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,&
- & PD,ZKEFF,PTKEM,PBLL_O_E,PETHETA,ZTMP1_DEVICE)
+ CALL D_M3_WR_W2TH_O_DDRDZ( PREDR1, PREDTH1, PD, ZKEFF, PTKEM, PBLL_O_E, PETHETA, ZTMP1_DEVICE )
!$acc kernels
ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + ZTMP1_DEVICE(:,:,:) * PFWTH(:,:,:)
!$acc end kernels
@@ -1343,14 +1335,12 @@ IF (KRR /= 0) THEN
END IF
#else
IF (GFTH2) THEN
- CALL M3_WR_WTH2(KKA,KKU,KKL,PREDR1,PREDTH1,PD,ZKEFF,PTKEM,&
- & PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PETHETA,PDR_DZ,ZTMP1_DEVICE)
+ CALL M3_WR_WTH2( PD, ZKEFF, PTKEM, PSQRT_TKE, PBLL_O_E, PBETA, PLEPS, PETHETA, PDR_DZ, ZTMP1_DEVICE )
CALL MZM_DEVICE(PFTH2,ZTMP2_DEVICE)
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + ZTMP1_DEVICE(:,:,:) * ZTMP2_DEVICE(:,:,:)
!$acc end kernels
- CALL D_M3_WR_WTH2_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,&
- &ZKEFF,PTKEM,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PETHETA,ZTMP1_DEVICE)
+ CALL D_M3_WR_WTH2_O_DDRDZ( PREDR1, PREDTH1, PD, ZKEFF, PTKEM, PSQRT_TKE, PBLL_O_E, PBETA, PLEPS, PETHETA, ZTMP1_DEVICE )
!$acc kernels
ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + ZTMP1_DEVICE(:,:,:) * ZTMP2_DEVICE(:,:,:)
!$acc end kernels
@@ -1369,14 +1359,13 @@ IF (KRR /= 0) THEN
END IF
#else
IF (GFTHR) THEN
- CALL M3_WR_WTHR(KKA,KKU,KKL,PREDTH1,PD,ZKEFF,PTKEM,PSQRT_TKE,PBETA,&
- & PLEPS,PETHETA,Z3RDMOMENT)
+ CALL M3_WR_WTHR( PREDTH1, PD, ZKEFF, PTKEM, PSQRT_TKE, PBETA, PLEPS, PETHETA, Z3RDMOMENT )
!
CALL MZM_DEVICE(PFTHR,ZTMP1_DEVICE)
!$acc kernels
ZF(:,:,:) = ZF(:,:,:) + Z3RDMOMENT(:,:,:) * ZTMP1_DEVICE(:,:,:)
!$acc end kernels
- CALL D_M3_WR_WTHR_O_DDRDZ(KKA,KKU,KKL,Z3RDMOMENT,PREDR1, &
+ CALL D_M3_WR_WTHR_O_DDRDZ( Z3RDMOMENT,PREDR1, &
& PREDTH1,PD,PBLL_O_E,PEMOIST,ZTMP2_DEVICE)
!$acc kernels
ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + ZTMP2_DEVICE(:,:,:) * ZTMP1_DEVICE(:,:,:)