From 24021e7595af510748715d9662542a920bfb8e49 Mon Sep 17 00:00:00 2001 From: Quentin Rodier <quentin.rodier@meteo.fr> Date: Tue, 19 Jul 2022 16:41:22 +0200 Subject: [PATCH] Quentin 19/07/2022: bugfix merge GPU (conflict forgotten) --- src/common/turb/modi_turb.F90 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/common/turb/modi_turb.F90 b/src/common/turb/modi_turb.F90 index 9a0b9c7f1..117326e5e 100644 --- a/src/common/turb/modi_turb.F90 +++ b/src/common/turb/modi_turb.F90 @@ -173,11 +173,7 @@ REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(OUT), OPTIONAL :: PEDR ! EDR REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(OUT), OPTIONAL :: PLEM ! Mixing length REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(OUT), OPTIONAL :: PTR ! Transport prod. of TKE REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(OUT), OPTIONAL :: PDISS ! Dissipation of TKE -<<<<<<< HEAD -REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(INOUT), OPTIONAL :: PCURRENT_TKE_DISS ! if ODIAG_IN_RUN in mesonh -======= REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(INOUT), OPTIONAL :: PCURRENT_TKE_DISS ! if ODIAG_IN_RUN in mesonh ->>>>>>> GPU ! !------------------------------------------------------------------------------- ! -- GitLab