From 988c5932e6f0c74e90c7e6332f50f7dd20e8b28a Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Thu, 16 Jan 2020 14:22:45 +0100
Subject: [PATCH] Philippe 09/01/2020: remove unused dummy arguments for
mode_prandtl functions
# Conflicts:
# src/MNH/mode_prandtl.f90
# src/MNH/turb_ver_thermo_corr.f90
# src/MNH/turb_ver_thermo_flux.f90
---
src/MNH/mode_prandtl.f90 | 448 +++++++++++++++----------------
src/MNH/turb_ver_thermo_corr.f90 | 70 ++---
src/MNH/turb_ver_thermo_flux.f90 | 30 +--
3 files changed, 274 insertions(+), 274 deletions(-)
diff --git a/src/MNH/mode_prandtl.f90 b/src/MNH/mode_prandtl.f90
index f90b4713b..ca0c98476 100644
--- a/src/MNH/mode_prandtl.f90
+++ b/src/MNH/mode_prandtl.f90
@@ -561,13 +561,13 @@ END SUBROUTINE D_M3_WTH_WTH2_O_DDTDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_WTH_W2TH(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PKEFF,PTKE) RESULT(PM3_WTH_W2TH)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -623,13 +623,13 @@ END SUBROUTINE M3_WTH_W2TH
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_WTH_W2TH_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PBLL_O_E,PETHETA,PKEFF,PTKE) RESULT(PD_M3_WTH_W2TH_O_DDTDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -697,15 +697,15 @@ END SUBROUTINE D_M3_WTH_W2TH_O_DDTDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_WTH_W2R(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PKEFF,PTKE,PBLL_O_E,PEMOIST,PDTDZ) RESULT(PM3_WTH_W2R)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PKEFF
REAL, DIMENSION(:,:,:), INTENT(IN) :: PTKE
@@ -760,13 +760,13 @@ END SUBROUTINE M3_WTH_W2R
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_WTH_W2R_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PKEFF,PTKE,PBLL_O_E,PEMOIST) RESULT(PD_M3_WTH_W2R_O_DDTDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -824,15 +824,15 @@ END SUBROUTINE D_M3_WTH_W2R_O_DDTDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_WTH_WR2(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PEMOIST,PDTDZ) RESULT(PM3_WTH_WR2)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PKEFF
REAL, DIMENSION(:,:,:), INTENT(IN) :: PTKE
@@ -904,15 +904,15 @@ END SUBROUTINE M3_WTH_WR2
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_WTH_WR2_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PEMOIST) &
+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, &
PD_M3_WTH_WR2_O_DDTDZ)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -987,13 +987,13 @@ END SUBROUTINE D_M3_WTH_WR2_O_DDTDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_WTH_WTHR(KKA,KKU,KKL,PREDR1,PD,PKEFF,PTKE,PSQRT_TKE,PBETA,PLEPS,PEMOIST) RESULT(PM3_WTH_WTHR)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PKEFF
@@ -1096,13 +1096,13 @@ END SUBROUTINE D_M3_WTH_WTHR_O_DDTDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_TH2_W2TH(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PDTDZ,PLM,PLEPS,PTKE) RESULT(PM3_TH2_W2TH)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -1164,13 +1164,13 @@ END SUBROUTINE M3_TH2_W2TH
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_TH2_W2TH_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLM,PLEPS,PTKE,OUSERV) RESULT(PD_M3_TH2_W2TH_O_DDTDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -1267,13 +1267,13 @@ END SUBROUTINE D_M3_TH2_W2TH_O_DDTDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_TH2_WTH2(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE) RESULT(PM3_TH2_WTH2)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -1340,13 +1340,13 @@ END SUBROUTINE M3_TH2_WTH2
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_TH2_WTH2_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA) RESULT(PD_M3_TH2_WTH2_O_DDTDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -1419,13 +1419,13 @@ END SUBROUTINE D_M3_TH2_WTH2_O_DDTDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_TH2_W2R(KKA,KKU,KKL,PD,PLM,PLEPS,PTKE,PBLL_O_E,PEMOIST,PDTDZ) RESULT(PM3_TH2_W2R)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PLM
REAL, DIMENSION(:,:,:), INTENT(IN) :: PLEPS
@@ -1497,13 +1497,13 @@ END SUBROUTINE M3_TH2_W2R
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_TH2_W2R_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PEMOIST,PDTDZ) RESULT(PD_M3_TH2_W2R_O_DDTDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -1575,13 +1575,13 @@ END SUBROUTINE D_M3_TH2_W2R_O_DDTDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_TH2_WR2(KKA,KKU,KKL,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ) RESULT(PM3_TH2_WR2)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PLEPS
REAL, DIMENSION(:,:,:), INTENT(IN) :: PSQRT_TKE
@@ -1652,13 +1652,13 @@ END SUBROUTINE M3_TH2_WR2
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_TH2_WR2_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ) RESULT(PD_M3_TH2_WR2_O_DDTDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -1733,13 +1733,13 @@ END SUBROUTINE D_M3_TH2_WR2_O_DDTDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_TH2_WTHR(KKA,KKU,KKL,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ) RESULT(PM3_TH2_WTHR)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PLEPS
@@ -1800,13 +1800,13 @@ END SUBROUTINE M3_TH2_WTHR
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_TH2_WTHR_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ) RESULT(PD_M3_TH2_WTHR_O_DDTDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -1869,13 +1869,13 @@ END SUBROUTINE D_M3_TH2_WTHR_O_DDTDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_THR_WTHR(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE) RESULT(PM3_THR_WTHR)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -1934,13 +1934,13 @@ END SUBROUTINE M3_THR_WTHR
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_THR_WTHR_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA) RESULT(PD_M3_THR_WTHR_O_DDTDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -2001,13 +2001,13 @@ END SUBROUTINE D_M3_THR_WTHR_O_DDTDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_THR_WTH2(KKA,KKU,KKL,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ) RESULT(PM3_THR_WTH2)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PLEPS
@@ -2068,13 +2068,13 @@ END SUBROUTINE M3_THR_WTH2
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_THR_WTH2_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ) RESULT(PD_M3_THR_WTH2_O_DDTDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -2149,13 +2149,13 @@ END SUBROUTINE D_M3_THR_WTH2_O_DDTDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_THR_WTH2_O_DDRDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA) RESULT(PD_M3_THR_WTH2_O_DDRDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -2219,13 +2219,13 @@ END SUBROUTINE D_M3_THR_WTH2_O_DDRDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_THR_W2TH(KKA,KKU,KKL,PREDR1,PD,PLM,PLEPS,PTKE,PDRDZ) RESULT(PM3_THR_W2TH)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PLM
@@ -2285,13 +2285,13 @@ END SUBROUTINE M3_THR_W2TH
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_THR_W2TH_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PDRDZ,PETHETA) RESULT(PD_M3_THR_W2TH_O_DDTDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -2367,13 +2367,13 @@ END SUBROUTINE D_M3_THR_W2TH_O_DDTDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_THR_W2TH_O_DDRDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,PLM,PLEPS,PTKE) RESULT(PD_M3_THR_W2TH_O_DDRDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -2645,13 +2645,13 @@ END SUBROUTINE D_M3_WR_WR2_O_DDRDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_WR_W2R(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE) RESULT(PM3_WR_W2R)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -2667,7 +2667,7 @@ SUBROUTINE M3_WR_W2R(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PM3_WR_W2R)
call Print_msg( NVERB_WARNING, 'GEN', 'M3_WR_W2R', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PM3_WR_W2R = M3_WTH_W2TH(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE)
+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)
@@ -2681,13 +2681,13 @@ END SUBROUTINE M3_WR_W2R
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_WR_W2R_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PBLL_O_E,PEMOIST,PKEFF,PTKE) RESULT(PD_M3_WR_W2R_O_DDRDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -2705,7 +2705,7 @@ SUBROUTINE D_M3_WR_W2R_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PBLL_O_E,PEMOIST,PK
call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_WR_W2R_O_DDRDZ', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PD_M3_WR_W2R_O_DDRDZ = D_M3_WTH_W2TH_O_DDTDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PBLL_O_E,PEMOIST,PKEFF,PTKE)
+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)
@@ -2719,15 +2719,15 @@ END SUBROUTINE D_M3_WR_W2R_O_DDRDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_WR_W2TH(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PBLL_O_E,PETHETA,PDRDZ) RESULT(PM3_WR_W2TH)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PKEFF
REAL, DIMENSION(:,:,:), INTENT(IN) :: PTKE
@@ -2744,7 +2744,7 @@ SUBROUTINE M3_WR_W2TH(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PBLL_O_E,PETHETA,
call Print_msg( NVERB_WARNING, 'GEN', 'M3_WR_W2TH', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PM3_WR_W2TH = M3_WTH_W2R(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PBLL_O_E,PETHETA,PDRDZ)
+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)
@@ -2758,13 +2758,13 @@ END SUBROUTINE M3_WR_W2TH
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_WR_W2TH_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PBLL_O_E,PETHETA) RESULT(PD_M3_WR_W2TH_O_DDRDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -2782,7 +2782,7 @@ SUBROUTINE D_M3_WR_W2TH_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PBLL_O_
call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_WR_W2TH_O_DDRDZ', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PD_M3_WR_W2TH_O_DDRDZ = D_M3_WTH_W2R_O_DDTDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PBLL_O_E,PETHETA)
+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)
@@ -2796,15 +2796,15 @@ END SUBROUTINE D_M3_WR_W2TH_O_DDRDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_WR_WTH2(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PETHETA,PDRDZ) RESULT(PM3_WR_WTH2)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PKEFF
REAL, DIMENSION(:,:,:), INTENT(IN) :: PTKE
@@ -2824,7 +2824,7 @@ SUBROUTINE M3_WR_WTH2(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_
call Print_msg( NVERB_WARNING, 'GEN', 'M3_WR_WTH2', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PM3_WR_WTH2 = M3_WTH_WR2(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PETHETA,PDRDZ)
+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)
@@ -2838,15 +2838,15 @@ END SUBROUTINE M3_WR_WTH2
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_WR_WTH2_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PETHETA) &
+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, &
PD_M3_WR_WTH2_O_DDRDZ)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -2867,7 +2867,7 @@ SUBROUTINE D_M3_WR_WTH2_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PKEFF,PTKE,PSQRT_T
call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_WR_WTH2_O_DDRDZ', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PD_M3_WR_WTH2_O_DDRDZ = 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 = 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)
@@ -2881,13 +2881,13 @@ END SUBROUTINE D_M3_WR_WTH2_O_DDRDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_WR_WTHR(KKA,KKU,KKL,PREDTH1,PD,PKEFF,PTKE,PSQRT_TKE,PBETA,PLEPS,PETHETA) RESULT(PM3_WR_WTHR)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PKEFF
@@ -2906,7 +2906,7 @@ SUBROUTINE M3_WR_WTHR(KKA,KKU,KKL,PREDTH1,PD,PKEFF,PTKE,PSQRT_TKE,PBETA,PLEPS,PE
call Print_msg( NVERB_WARNING, 'GEN', 'M3_WR_WTHR', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PM3_WR_WTHR = M3_WTH_WTHR(KKA,KKU,KKL,PREDTH1,PD,PKEFF,PTKE,PSQRT_TKE,PBETA,PLEPS,PETHETA)
+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)
@@ -2920,13 +2920,13 @@ END SUBROUTINE M3_WR_WTHR
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_WR_WTHR_O_DDRDZ(KKA,KKU,KKL,PM3_WR_WTHR,PREDR1,PREDTH1,PD,PBLL_O_E,PEMOIST) RESULT(PD_M3_WR_WTHR_O_DDRDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PM3_WR_WTHR
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
@@ -2957,13 +2957,13 @@ END SUBROUTINE D_M3_WR_WTHR_O_DDRDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_R2_W2R(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PDRDZ,PLM,PLEPS,PTKE) RESULT(PM3_R2_W2R)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -2981,7 +2981,7 @@ SUBROUTINE M3_R2_W2R(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PDRDZ,PLM,PLEPS,PTKE,PM3_R2_W
call Print_msg( NVERB_WARNING, 'GEN', 'M3_R2_W2R', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PM3_R2_W2R = M3_TH2_W2TH(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PDRDZ,PLM,PLEPS,PTKE)
+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)
@@ -2995,13 +2995,13 @@ END SUBROUTINE M3_R2_W2R
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_R2_W2R_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,OUSERV) RESULT(PD_M3_R2_W2R_O_DDRDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -3019,7 +3019,7 @@ SUBROUTINE D_M3_R2_W2R_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,OUSE
call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_R2_W2R_O_DDRDZ', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PD_M3_R2_W2R_O_DDRDZ = D_M3_TH2_W2TH_O_DDTDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,OUSERV)
+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)
@@ -3033,13 +3033,13 @@ END SUBROUTINE D_M3_R2_W2R_O_DDRDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_R2_WR2(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE) RESULT(PM3_R2_WR2)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -3055,7 +3055,7 @@ SUBROUTINE M3_R2_WR2(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PM3_R2_WR2)
call Print_msg( NVERB_WARNING, 'GEN', 'M3_R2_WR2', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PM3_R2_WR2 = M3_TH2_WTH2(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE)
+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)
@@ -3069,13 +3069,13 @@ END SUBROUTINE M3_R2_WR2
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_R2_WR2_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST) RESULT(PD_M3_R2_WR2_O_DDRDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -3093,7 +3093,7 @@ SUBROUTINE D_M3_R2_WR2_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBL
call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_R2_WR2_O_DDRDZ', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PD_M3_R2_WR2_O_DDRDZ = 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 = 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)
@@ -3107,13 +3107,13 @@ END SUBROUTINE D_M3_R2_WR2_O_DDRDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_R2_W2TH(KKA,KKU,KKL,PD,PLM,PLEPS,PTKE,PBLL_O_E,PETHETA,PDRDZ) RESULT(PM3_R2_W2TH)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PLM
REAL, DIMENSION(:,:,:), INTENT(IN) :: PLEPS
@@ -3131,7 +3131,7 @@ SUBROUTINE M3_R2_W2TH(KKA,KKU,KKL,PD,PLM,PLEPS,PTKE,PBLL_O_E,PETHETA,PDRDZ,PM3_R
call Print_msg( NVERB_WARNING, 'GEN', 'M3_R2_W2TH', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PM3_R2_W2TH = M3_TH2_W2R(KKA,KKU,KKL,PD,PLM,PLEPS,PTKE,PBLL_O_E,PETHETA,PDRDZ)
+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)
@@ -3145,13 +3145,13 @@ END SUBROUTINE M3_R2_W2TH
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_R2_W2TH_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PETHETA,PDRDZ) RESULT(PD_M3_R2_W2TH_O_DDRDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -3171,7 +3171,7 @@ SUBROUTINE D_M3_R2_W2TH_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PBL
call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_R2_W2TH_O_DDRDZ', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PD_M3_R2_W2TH_O_DDRDZ = 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 = 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)
@@ -3185,13 +3185,13 @@ END SUBROUTINE D_M3_R2_W2TH_O_DDRDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_R2_WTH2(KKA,KKU,KKL,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ) RESULT(PM3_R2_WTH2)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PLEPS
REAL, DIMENSION(:,:,:), INTENT(IN) :: PSQRT_TKE
@@ -3208,7 +3208,7 @@ SUBROUTINE M3_R2_WTH2(KKA,KKU,KKL,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ,PM3_
call Print_msg( NVERB_WARNING, 'GEN', 'M3_R2_WTH2', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PM3_R2_WTH2 = M3_TH2_WR2(KKA,KKU,KKL,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ)
+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)
@@ -3222,13 +3222,13 @@ END SUBROUTINE M3_R2_WTH2
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_R2_WTH2_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ) RESULT(PD_M3_R2_WTH2_O_DDRDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -3247,7 +3247,7 @@ SUBROUTINE D_M3_R2_WTH2_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PB
call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_R2_WTH2_O_DDRDZ', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PD_M3_R2_WTH2_O_DDRDZ = 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 = 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)
@@ -3261,13 +3261,13 @@ END SUBROUTINE D_M3_R2_WTH2_O_DDRDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_R2_WTHR(KKA,KKU,KKL,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ) RESULT(PM3_R2_WTHR)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PLEPS
@@ -3285,7 +3285,7 @@ SUBROUTINE M3_R2_WTHR(KKA,KKU,KKL,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PD
call Print_msg( NVERB_WARNING, 'GEN', 'M3_R2_WTHR', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PM3_R2_WTHR = M3_TH2_WTHR(KKA,KKU,KKL,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ)
+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)
@@ -3299,13 +3299,13 @@ END SUBROUTINE M3_R2_WTHR
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_R2_WTHR_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PETHETA,PDRDZ) RESULT(PD_M3_R2_WTHR_O_DDRDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -3324,7 +3324,7 @@ SUBROUTINE D_M3_R2_WTHR_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PB
call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_R2_WTHR_O_DDRDZ', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PD_M3_R2_WTHR_O_DDRDZ = 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 = 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)
@@ -3338,13 +3338,13 @@ END SUBROUTINE D_M3_R2_WTHR_O_DDRDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_THR_WTHR_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST) RESULT(PD_M3_THR_WTHR_O_DDRDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -3362,7 +3362,7 @@ SUBROUTINE D_M3_THR_WTHR_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,P
call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_THR_WTHR_O_DDRDZ', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PD_M3_THR_WTHR_O_DDRDZ = 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 = 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)
@@ -3376,13 +3376,13 @@ END SUBROUTINE D_M3_THR_WTHR_O_DDRDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_THR_WR2(KKA,KKU,KKL,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ) RESULT(PM3_THR_WR2)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PLEPS
@@ -3400,7 +3400,7 @@ SUBROUTINE M3_THR_WR2(KKA,KKU,KKL,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PD
call Print_msg( NVERB_WARNING, 'GEN', 'M3_THR_WR2', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PM3_THR_WR2 = M3_THR_WTH2(KKA,KKU,KKL,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ)
+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)
@@ -3414,13 +3414,13 @@ END SUBROUTINE M3_THR_WR2
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_THR_WR2_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST,PDTDZ) RESULT(PD_M3_THR_WR2_O_DDRDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -3439,7 +3439,7 @@ SUBROUTINE D_M3_THR_WR2_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PB
call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_THR_WR2_O_DDRDZ', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PD_M3_THR_WR2_O_DDRDZ = 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 = 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)
@@ -3453,13 +3453,13 @@ END SUBROUTINE D_M3_THR_WR2_O_DDRDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_THR_WR2_O_DDTDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PBLL_O_E,PEMOIST) RESULT(PD_M3_THR_WR2_O_DDTDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -3477,7 +3477,7 @@ SUBROUTINE D_M3_THR_WR2_O_DDTDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLEPS,PSQRT_TKE,PB
call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_THR_WR2_O_DDTDZ', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PD_M3_THR_WR2_O_DDTDZ = 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 = 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)
@@ -3491,13 +3491,13 @@ END SUBROUTINE D_M3_THR_WR2_O_DDTDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION M3_THR_W2R(KKA,KKU,KKL,PREDTH1,PD,PLM,PLEPS,PTKE,PDTDZ) RESULT(PM3_THR_W2R)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PLM
@@ -3514,7 +3514,7 @@ SUBROUTINE M3_THR_W2R(KKA,KKU,KKL,PREDTH1,PD,PLM,PLEPS,PTKE,PDTDZ,PM3_THR_W2R)
call Print_msg( NVERB_WARNING, 'GEN', 'M3_THR_W2R', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PM3_THR_W2R = M3_THR_W2TH(KKA,KKU,KKL,PREDTH1,PD,PLM,PLEPS,PTKE,PDTDZ)
+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)
@@ -3528,13 +3528,13 @@ END SUBROUTINE M3_THR_W2R
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_THR_W2R_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PBLL_O_E,PDTDZ,PEMOIST) RESULT(PD_M3_THR_W2R_O_DDRDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -3554,7 +3554,7 @@ SUBROUTINE D_M3_THR_W2R_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PBL
call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_THR_W2R_O_DDRDZ', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PD_M3_THR_W2R_O_DDRDZ = 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 = 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)
@@ -3568,13 +3568,13 @@ END SUBROUTINE D_M3_THR_W2R_O_DDRDZ
#endif
!----------------------------------------------------------------------------
#ifndef MNH_OPENACC
-FUNCTION D_M3_THR_W2R_O_DDTDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE) RESULT(PD_M3_THR_W2R_O_DDTDZ)
+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)
-#endif
- INTEGER, INTENT(IN) :: KKA
- INTEGER, INTENT(IN) :: KKU
+ INTEGER, INTENT(IN) :: KKA
+ INTEGER, INTENT(IN) :: KKU
INTEGER, INTENT(IN) :: KKL
+#endif
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDR1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PREDTH1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PD
@@ -3591,7 +3591,7 @@ SUBROUTINE D_M3_THR_W2R_O_DDTDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE,PD_
call Print_msg( NVERB_WARNING, 'GEN', 'D_M3_THR_W2R_O_DDTDZ', 'OpenACC: not yet tested' )
#endif
#ifndef MNH_OPENACC
-PD_M3_THR_W2R_O_DDTDZ = D_M3_THR_W2TH_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,PLM,PLEPS,PTKE)
+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)
diff --git a/src/MNH/turb_ver_thermo_corr.f90 b/src/MNH/turb_ver_thermo_corr.f90
index a10e61878..8bdb18ba4 100644
--- a/src/MNH/turb_ver_thermo_corr.f90
+++ b/src/MNH/turb_ver_thermo_corr.f90
@@ -561,9 +561,9 @@ END IF
! d(w'th'2)/dz
#ifndef MNH_OPENACC
IF (GFTH2) THEN
- ZF(:,:,:) = ZF(:,:,:) + M3_TH2_WTH2(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),PLEPS(:,:,:),&
+ ZF(:,:,:) = ZF(:,:,:) + M3_TH2_WTH2(PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),PLEPS(:,:,:),&
& PSQRT_TKE(:,:,:)) * PFTH2(:,:,:)
- ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_TH2_WTH2_O_DDTDZ(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),&
+ ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_TH2_WTH2_O_DDTDZ(PREDTH1(:,:,:),PREDR1(:,:,:),&
& PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PETHETA(:,:,:)) * PFTH2(:,:,:)
END IF
#else
@@ -583,9 +583,9 @@ END IF
! d(w'2th')/dz
#ifndef MNH_OPENACC
IF (GFWTH) THEN
- ZF(:,:,:) = ZF(:,:,:) + M3_TH2_W2TH(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),PDTH_DZ(:,:,:),&
+ ZF(:,:,:) = ZF(:,:,:) + M3_TH2_W2TH(PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),PDTH_DZ(:,:,:),&
& PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:)) * MZF(PFWTH(:,:,:))
- ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_TH2_W2TH_O_DDTDZ(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),&
+ ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_TH2_W2TH_O_DDTDZ(PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),&
& PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),GUSERV) * MZF(PFWTH(:,:,:))
END IF
#else
@@ -608,9 +608,9 @@ END IF
! d(w'r'2)/dz
#ifndef MNH_OPENACC
IF (GFR2) THEN
- ZF(:,:,:) = ZF(:,:,:) + M3_TH2_WR2(KKA,KKU,KKL,PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),&
+ ZF(:,:,:) = ZF(:,:,:) + M3_TH2_WR2(PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),&
& PEMOIST(:,:,:),PDTH_DZ(:,:,:)) * PFR2(:,:,:)
- ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_TH2_WR2_O_DDTDZ(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),&
+ ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_TH2_WR2_O_DDTDZ(PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),&
& PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PEMOIST(:,:,:),PDTH_DZ(:,:,:)) * PFR2(:,:,:)
END IF
#else
@@ -631,9 +631,9 @@ END IF
! d(w'2r')/dz
#ifndef MNH_OPENACC
IF (GFWR) THEN
- ZF(:,:,:) = ZF(:,:,:) + M3_TH2_W2R(KKA,KKU,KKL,PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),PBLL_O_E(:,:,:),&
+ ZF(:,:,:) = ZF(:,:,:) + M3_TH2_W2R(PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),PBLL_O_E(:,:,:),&
& PEMOIST(:,:,:),PDTH_DZ(:,:,:)) * MZF(PFWR(:,:,:))
- ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_TH2_W2R_O_DDTDZ(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),&
+ ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_TH2_W2R_O_DDTDZ(PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),&
& PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),PBLL_O_E(:,:,:),PEMOIST(:,:,:),PDTH_DZ(:,:,:)) * MZF(PFWR(:,:,:))
END IF
#else
@@ -655,9 +655,9 @@ END IF
! d(w'th'r')/dz
#ifndef MNH_OPENACC
IF (GFTHR) THEN
- ZF(:,:,:) = ZF(:,:,:) + M3_TH2_WTHR(KKA,KKU,KKL,PREDR1(:,:,:),PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),&
+ ZF(:,:,:) = ZF(:,:,:) + M3_TH2_WTHR(PREDR1(:,:,:),PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),&
& PBLL_O_E(:,:,:),PEMOIST(:,:,:),PDTH_DZ(:,:,:)) * PFTHR(:,:,:)
- ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_TH2_WTHR_O_DDTDZ(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),&
+ ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_TH2_WTHR_O_DDTDZ(PREDTH1(:,:,:),PREDR1(:,:,:),&
& PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PEMOIST(:,:,:),PDTH_DZ(:,:,:)) * PFTHR(:,:,:)
END IF
#else
@@ -819,11 +819,11 @@ END IF
! d(w'th'2)/dz
#ifndef MNH_OPENACC
IF (GFTH2) THEN
- ZF(:,:,:) = ZF(:,:,:) + M3_THR_WTH2(KKA,KKU,KKL,PREDR1(:,:,:),PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),&
+ ZF(:,:,:) = ZF(:,:,:) + M3_THR_WTH2(PREDR1(:,:,:),PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),&
& PBLL_O_E(:,:,:),PETHETA(:,:,:),PDR_DZ(:,:,:)) * PFTH2(:,:,:)
- ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_THR_WTH2_O_DDTDZ(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),&
+ ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_THR_WTH2_O_DDTDZ(PREDTH1(:,:,:),PREDR1(:,:,:),&
& PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PETHETA(:,:,:),PDR_DZ(:,:,:)) * PFTH2(:,:,:)
- ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_THR_WTH2_O_DDRDZ(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),&
+ ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_THR_WTH2_O_DDRDZ(PREDTH1(:,:,:),PREDR1(:,:,:),&
& PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PETHETA(:,:,:)) * PFTH2(:,:,:)
END IF
#else
@@ -849,11 +849,11 @@ END IF
! d(w'2th')/dz
#ifndef MNH_OPENACC
IF (GFWTH) THEN
- ZF(:,:,:) = ZF(:,:,:) + M3_THR_W2TH(KKA,KKU,KKL,PREDR1(:,:,:),PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),&
+ ZF(:,:,:) = ZF(:,:,:) + M3_THR_W2TH(PREDR1(:,:,:),PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),&
PDR_DZ(:,:,:)) * MZF(PFWTH(:,:,:))
- ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_THR_W2TH_O_DDTDZ(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),&
+ ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_THR_W2TH_O_DDTDZ(PREDTH1(:,:,:),PREDR1(:,:,:),&
PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),PBLL_O_E(:,:,:),PDR_DZ(:,:,:),PETHETA(:,:,:)) * MZF(PFWTH(:,:,:))
- ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_THR_W2TH_O_DDRDZ(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),&
+ ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_THR_W2TH_O_DDRDZ(PREDTH1(:,:,:),PREDR1(:,:,:),&
PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:)) * MZF(PFWTH(:,:,:))
END IF
#else
@@ -880,11 +880,11 @@ END IF
! d(w'r'2)/dz
#ifndef MNH_OPENACC
IF (GFR2) THEN
- ZF(:,:,:) = ZF(:,:,:) + M3_THR_WR2(KKA,KKU,KKL,PREDTH1(:,:,:),PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),&
+ ZF(:,:,:) = ZF(:,:,:) + M3_THR_WR2(PREDTH1(:,:,:),PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),&
& PBLL_O_E(:,:,:),PEMOIST(:,:,:),PDTH_DZ(:,:,:)) * PFR2(:,:,:)
- ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_THR_WR2_O_DDTDZ(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),&
+ ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_THR_WR2_O_DDTDZ(PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),&
& PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PEMOIST(:,:,:)) * PFR2(:,:,:)
- ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_THR_WR2_O_DDRDZ(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),&
+ ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_THR_WR2_O_DDRDZ(PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),&
& PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PEMOIST(:,:,:),PDTH_DZ(:,:,:)) * PFR2(:,:,:)
END IF
#else
@@ -910,11 +910,11 @@ END IF
! d(w'2r')/dz
#ifndef MNH_OPENACC
IF (GFWR) THEN
- ZF(:,:,:) = ZF(:,:,:) + M3_THR_W2R(KKA,KKU,KKL,PREDTH1(:,:,:),PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),&
+ ZF(:,:,:) = ZF(:,:,:) + M3_THR_W2R(PREDTH1(:,:,:),PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),&
& PDTH_DZ(:,:,:)) * MZF(PFWR(:,:,:))
- ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_THR_W2R_O_DDTDZ(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),&
+ ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_THR_W2R_O_DDTDZ(PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),&
& PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:)) * MZF(PFWR(:,:,:))
- ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_THR_W2R_O_DDRDZ(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),&
+ ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_THR_W2R_O_DDRDZ(PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),&
& PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),PBLL_O_E(:,:,:),PDTH_DZ(:,:,:),PEMOIST(:,:,:)) * MZF(PFWR(:,:,:))
END IF
#else
@@ -941,11 +941,11 @@ END IF
! d(w'th'r')/dz
#ifndef MNH_OPENACC
IF (GFTHR) THEN
- ZF(:,:,:) = ZF(:,:,:) + M3_THR_WTHR(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),PLEPS(:,:,:),&
+ ZF(:,:,:) = ZF(:,:,:) + M3_THR_WTHR(PREDTH1(:,:,:),PREDR1(:,:,:),PD(:,:,:),PLEPS(:,:,:),&
& PSQRT_TKE(:,:,:)) * PFTHR(:,:,:)
- ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_THR_WTHR_O_DDTDZ(KKA,KKU,KKL,PREDTH1(:,:,:),PREDR1(:,:,:),&
+ ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_THR_WTHR_O_DDTDZ(PREDTH1(:,:,:),PREDR1(:,:,:),&
& PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PETHETA(:,:,:)) * PFTHR(:,:,:)
- ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_THR_WTHR_O_DDRDZ(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),&
+ ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_THR_WTHR_O_DDRDZ(PREDR1(:,:,:),PREDTH1(:,:,:),&
& PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PEMOIST(:,:,:)) * PFTHR(:,:,:)
END IF
#else
@@ -1164,9 +1164,9 @@ END IF
! d(w'r'2)/dz
#ifndef MNH_OPENACC
IF (GFR2) THEN
- ZF(:,:,:) = ZF(:,:,:) + M3_R2_WR2(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),PLEPS(:,:,:),&
+ ZF(:,:,:) = ZF(:,:,:) + M3_R2_WR2(PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),PLEPS(:,:,:),&
& PSQRT_TKE(:,:,:)) * PFR2(:,:,:)
- ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_R2_WR2_O_DDRDZ(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),&
+ ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_R2_WR2_O_DDRDZ(PREDR1(:,:,:),PREDTH1(:,:,:),&
& PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PEMOIST(:,:,:)) * PFR2(:,:,:)
END IF
#else
@@ -1187,9 +1187,9 @@ END IF
! d(w'2r')/dz
#ifndef MNH_OPENACC
IF (GFWR) THEN
- ZF(:,:,:) = ZF(:,:,:) + M3_R2_W2R(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),PDR_DZ(:,:,:),&
+ ZF(:,:,:) = ZF(:,:,:) + M3_R2_W2R(PREDR1(:,:,:),PREDTH1(:,:,:),PD(:,:,:),PDR_DZ(:,:,:),&
& PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:)) * MZF(PFWR(:,:,:))
- ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_R2_W2R_O_DDRDZ(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),&
+ ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_R2_W2R_O_DDRDZ(PREDR1(:,:,:),PREDTH1(:,:,:),&
& PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),GUSERV) * MZF(PFWR(:,:,:))
END IF
#else
@@ -1212,9 +1212,9 @@ END IF
! d(w'r'2)/dz
#ifndef MNH_OPENACC
IF (GFTH2) THEN
- ZF(:,:,:) = ZF(:,:,:) + M3_R2_WTH2(KKA,KKU,KKL,PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),&
+ ZF(:,:,:) = ZF(:,:,:) + M3_R2_WTH2(PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),&
& PBLL_O_E(:,:,:),PETHETA(:,:,:),PDR_DZ(:,:,:)) * PFTH2(:,:,:)
- ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_R2_WTH2_O_DDRDZ(KKA,KKU,KKL,PREDR1(:,:,:),&
+ ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_R2_WTH2_O_DDRDZ(PREDR1(:,:,:),&
& PREDTH1(:,:,:),PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PETHETA(:,:,:),PDR_DZ(:,:,:)) * PFTH2(:,:,:)
END IF
#else
@@ -1235,9 +1235,9 @@ END IF
! d(w'2r')/dz
#ifndef MNH_OPENACC
IF (GFWTH) THEN
- ZF(:,:,:) = ZF(:,:,:) + M3_R2_W2TH(KKA,KKU,KKL,PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),&
+ ZF(:,:,:) = ZF(:,:,:) + M3_R2_W2TH(PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),&
PBLL_O_E(:,:,:),PETHETA(:,:,:),PDR_DZ(:,:,:)) * MZF(PFWTH(:,:,:))
- ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_R2_W2TH_O_DDRDZ(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),&
+ ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_R2_W2TH_O_DDRDZ(PREDR1(:,:,:),PREDTH1(:,:,:),&
PD(:,:,:),PLM(:,:,:),PLEPS(:,:,:),PTKEM(:,:,:),PBLL_O_E(:,:,:),PETHETA(:,:,:),PDR_DZ(:,:,:)) &
* MZF(PFWTH(:,:,:))
END IF
@@ -1260,9 +1260,9 @@ END IF
! d(w'th'r')/dz
#ifndef MNH_OPENACC
IF (GFTHR) THEN
- ZF(:,:,:) = ZF(:,:,:) + M3_R2_WTHR(KKA,KKU,KKL,PREDTH1(:,:,:),PD(:,:,:),PLEPS(:,:,:),&
+ ZF(:,:,:) = ZF(:,:,:) + M3_R2_WTHR(PREDTH1(:,:,:),PD(:,:,:),PLEPS(:,:,:),&
& PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PETHETA(:,:,:),PDR_DZ(:,:,:)) * PFTHR(:,:,:)
- ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_R2_WTHR_O_DDRDZ(KKA,KKU,KKL,PREDR1(:,:,:),PREDTH1(:,:,:),&
+ ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_R2_WTHR_O_DDRDZ(PREDR1(:,:,:),PREDTH1(:,:,:),&
& PD(:,:,:),PLEPS(:,:,:),PSQRT_TKE(:,:,:),PBLL_O_E(:,:,:),PETHETA(:,:,:),PDR_DZ(:,:,:)) * PFTHR(:,:,:)
END IF
#else
diff --git a/src/MNH/turb_ver_thermo_flux.f90 b/src/MNH/turb_ver_thermo_flux.f90
index 1e0baf898..001e1728d 100644
--- a/src/MNH/turb_ver_thermo_flux.f90
+++ b/src/MNH/turb_ver_thermo_flux.f90
@@ -620,10 +620,10 @@ ZDFDDTDZ(:,:,:) = -XCSHF*ZKEFF(:,:,:)*ZTMP2_DEVICE(:,:,:)
! d(w'2th')/dz
#ifndef MNH_OPENACC
IF (GFWTH) THEN
- Z3RDMOMENT(:,:,:)= M3_WTH_W2TH(KKA,KKU,KKL,PREDTH1,PREDR1,PD,ZKEFF,PTKEM)
+ Z3RDMOMENT(:,:,:)= M3_WTH_W2TH(PREDTH1,PREDR1,PD,ZKEFF,PTKEM)
!
ZF(:,:,:) = ZF(:,:,:) + Z3RDMOMENT(:,:,:) * PFWTH(:,:,:)
- ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_WTH_W2TH_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,&
+ ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_WTH_W2TH_O_DDTDZ(PREDTH1,PREDR1,&
& PD,PBLL_O_E,PETHETA,ZKEFF,PTKEM) * PFWTH(:,:,:)
END IF
#else
@@ -670,9 +670,9 @@ END IF
! d(w'2r')/dz
#ifndef MNH_OPENACC
IF (GFWR) THEN
- ZF(:,:,:) = ZF(:,:,:) + M3_WTH_W2R(KKA,KKU,KKL,PREDTH1,PREDR1,PD,ZKEFF,&
+ ZF(:,:,:) = ZF(:,:,:) + M3_WTH_W2R(PD,ZKEFF,&
& PTKEM,PBLL_O_E,PEMOIST,PDTH_DZ) * PFWR(:,:,:)
- ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_WTH_W2R_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,&
+ ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_WTH_W2R_O_DDTDZ(PREDTH1,PREDR1,&
& PD,ZKEFF,PTKEM,PBLL_O_E,PEMOIST) * PFWR(:,:,:)
END IF
#else
@@ -693,9 +693,9 @@ END IF
! d(w'r'2)/dz
#ifndef MNH_OPENACC
IF (GFR2) THEN
- ZF(:,:,:) = ZF(:,:,:) + M3_WTH_WR2(KKA,KKU,KKL,PREDTH1,PREDR1,PD,ZKEFF,PTKEM,&
+ ZF(:,:,:) = ZF(:,:,:) + M3_WTH_WR2(PD,ZKEFF,PTKEM,&
& PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PEMOIST,PDTH_DZ) * MZM(PFR2)
- ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_WTH_WR2_O_DDTDZ(KKA,KKU,KKL,PREDTH1,PREDR1,PD,&
+ ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_WTH_WR2_O_DDTDZ(PREDTH1,PREDR1,PD,&
& ZKEFF,PTKEM,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PEMOIST) * MZM(PFR2)
END IF
#else
@@ -718,7 +718,7 @@ END IF
! d(w'th'r')/dz
#ifndef MNH_OPENACC
IF (GFTHR) THEN
- Z3RDMOMENT(:,:,:)= M3_WTH_WTHR(KKA,KKU,KKL,PREDR1,PD,ZKEFF,PTKEM,PSQRT_TKE,PBETA,PLEPS,PEMOIST)
+ Z3RDMOMENT(:,:,:)= M3_WTH_WTHR(PREDR1,PD,ZKEFF,PTKEM,PSQRT_TKE,PBETA,PLEPS,PEMOIST)
!
ZF(:,:,:) = ZF(:,:,:) + Z3RDMOMENT(:,:,:) * MZM(PFTHR)
ZDFDDTDZ(:,:,:) = ZDFDDTDZ(:,:,:) + D_M3_WTH_WTHR_O_DDTDZ(Z3RDMOMENT,PREDTH1,&
@@ -1019,10 +1019,10 @@ IF (KRR /= 0) THEN
! d(w'2r')/dz
#ifndef MNH_OPENACC
IF (GFWR) THEN
- Z3RDMOMENT(:,:,:)= M3_WR_W2R(KKA,KKU,KKL,PREDR1,PREDTH1,PD,ZKEFF,PTKEM)
+ Z3RDMOMENT(:,:,:)= M3_WR_W2R(PREDR1,PREDTH1,PD,ZKEFF,PTKEM)
!
ZF(:,:,:) = ZF(:,:,:) + Z3RDMOMENT(:,:,:) * PFWR(:,:,:)
- ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_WR_W2R_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,&
+ ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_WR_W2R_O_DDRDZ(PREDR1,PREDTH1,PD,&
& PBLL_O_E,PEMOIST,ZKEFF,PTKEM) * PFWR(:,:,:)
END IF
#else
@@ -1068,9 +1068,9 @@ IF (KRR /= 0) THEN
! d(w'2th')/dz
#ifndef MNH_OPENACC
IF (GFWTH) THEN
- ZF(:,:,:) = ZF(:,:,:) + M3_WR_W2TH(KKA,KKU,KKL,PREDR1,PREDTH1,PD,ZKEFF,&
+ ZF(:,:,:) = ZF(:,:,:) + M3_WR_W2TH(PD,ZKEFF,&
& PTKEM,PBLL_O_E,PETHETA,PDR_DZ) * PFWTH(:,:,:)
- ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_WR_W2TH_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,&
+ ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_WR_W2TH_O_DDRDZ(PREDR1,PREDTH1,&
& PD,ZKEFF,PTKEM,PBLL_O_E,PETHETA) * PFWTH(:,:,:)
END IF
#else
@@ -1091,9 +1091,9 @@ IF (KRR /= 0) THEN
! d(w'th'2)/dz
#ifndef MNH_OPENACC
IF (GFTH2) THEN
- ZF(:,:,:) = ZF(:,:,:) + M3_WR_WTH2(KKA,KKU,KKL,PREDR1,PREDTH1,PD,ZKEFF,PTKEM,&
+ ZF(:,:,:) = ZF(:,:,:) + M3_WR_WTH2(PD,ZKEFF,PTKEM,&
& PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PETHETA,PDR_DZ) * MZM(PFTH2)
- ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_WR_WTH2_O_DDRDZ(KKA,KKU,KKL,PREDR1,PREDTH1,PD,&
+ ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_WR_WTH2_O_DDRDZ(PREDR1,PREDTH1,PD,&
&ZKEFF,PTKEM,PSQRT_TKE,PBLL_O_E,PBETA,PLEPS,PETHETA) * MZM(PFTH2)
END IF
#else
@@ -1115,11 +1115,11 @@ IF (KRR /= 0) THEN
! d(w'th'r')/dz
#ifndef MNH_OPENACC
IF (GFTHR) THEN
- Z3RDMOMENT(:,:,:)= M3_WR_WTHR(KKA,KKU,KKL,PREDTH1,PD,ZKEFF,PTKEM,PSQRT_TKE,PBETA,&
+ Z3RDMOMENT(:,:,:)= M3_WR_WTHR(PREDTH1,PD,ZKEFF,PTKEM,PSQRT_TKE,PBETA,&
& PLEPS,PETHETA)
!
ZF(:,:,:) = ZF(:,:,:) + Z3RDMOMENT(:,:,:) * MZM(PFTHR)
- ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_WR_WTHR_O_DDRDZ(KKA,KKU,KKL,Z3RDMOMENT,PREDR1, &
+ ZDFDDRDZ(:,:,:) = ZDFDDRDZ(:,:,:) + D_M3_WR_WTHR_O_DDRDZ(Z3RDMOMENT,PREDR1, &
& PREDTH1,PD,PBLL_O_E,PEMOIST) * MZM(PFTHR)
END IF
#else
--
GitLab