diff --git a/src/MNH/turb_ver.f90 b/src/MNH/turb_ver.f90
index 72f71a8327d220b68018461b7c4034f30de70ea2..afbe862078bfd754f9190356e6799c9de684ad27 100644
--- a/src/MNH/turb_ver.f90
+++ b/src/MNH/turb_ver.f90
@@ -696,12 +696,12 @@ END IF
                         OCLOSE_OUT,OTURB_FLX,HTURBDIM,HTOM,           &
                         PIMPL,PEXPL,PTSTEP,                           &
                         TPFILE,                                       &
-                        PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,PZZ,       &
-                        PRHODJ,PTHVREF,                               &
+                        PDZZ,PDIRCOSZW,PZZ,                           &
+                        PRHODJ,                                       &
                         PSFTHM,PSFRM,PSFTHP,PSFRP,                    &
                         PWM,PTHLM,PRM,PSVM,                           &
                         PTKEM,PLM,PLEPS,                              &
-                        PLOCPEXNM,PATHETA,PAMOIST,PSRCM,PFRAC_ICE,    &
+                        PATHETA,PAMOIST,PSRCM,PFRAC_ICE,    &
                         ZBETA, ZSQRT_TKE, ZDTH_DZ, ZDR_DZ, ZRED2TH3,  &
                         ZRED2R3, ZRED2THR3, ZBLL_O_E, ZETHETA,        &
                         ZEMOIST, ZREDTH1, ZREDR1, ZPHI3, ZPSI3, ZD,   &
@@ -712,12 +712,10 @@ END IF
                         OCLOSE_OUT,OTURB_FLX,HTURBDIM,HTOM,           &
                         PIMPL,PEXPL,                                  &
                         TPFILE,                                       &
-                        PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,           &
-                        PRHODJ,PTHVREF,                               &
-                        PSFTHM,PSFRM,PSFTHP,PSFRP,                    &
-                        PWM,PTHLM,PRM,PSVM,                           &
+                        PDZZ,                                         &
+                        PWM,PTHLM,PRM,                                &
                         PTKEM,PLM,PLEPS,                              &
-                        PLOCPEXNM,PATHETA,PAMOIST,PSRCM,              &
+                        PATHETA,PAMOIST,                              &
                         ZBETA, ZSQRT_TKE, ZDTH_DZ, ZDR_DZ, ZRED2TH3,  &
                         ZRED2R3, ZRED2THR3, ZBLL_O_E, ZETHETA,        &
                         ZEMOIST, ZREDTH1, ZREDR1, ZPHI3, ZPSI3, ZD,   &
@@ -741,7 +739,7 @@ CALL  TURB_VER_DYN_FLUX(KKA,KKU,KKL,                                &
                       OCLOSE_OUT,OTURB_FLX,KRR,                     &
                       HTURBDIM,PIMPL,PEXPL,PTSTEP,                  &
                       TPFILE,                                       &
-                      PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,PZZ,       &
+                      PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,           &
                       PCOSSLOPE,PSINSLOPE,                          &
                       PRHODJ,                                       &
                       PCDUEFF,PTAU11M,PTAU12M,PTAU33M,              &
diff --git a/src/MNH/turb_ver_dyn_flux.f90 b/src/MNH/turb_ver_dyn_flux.f90
index c8aab0d8027d6a6a775c014b4d533baf95991140..ccf34fec97770ab9e827c2896870397933d3aa30 100644
--- a/src/MNH/turb_ver_dyn_flux.f90
+++ b/src/MNH/turb_ver_dyn_flux.f90
@@ -14,7 +14,7 @@ INTERFACE
                       HTURBDIM,PIMPL,PEXPL,                         &
                       PTSTEP,                                       &
                       TPFILE,                                       &
-                      PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,PZZ,       &
+                      PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,           &
                       PCOSSLOPE,PSINSLOPE,                          &
                       PRHODJ,                                       &
                       PCDUEFF,PTAU11M,PTAU12M,PTAU33M,              &
@@ -41,7 +41,6 @@ TYPE(TFILEDATA),        INTENT(IN)   ::  TPFILE       ! Output file
 !
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PDXX, PDYY, PDZZ, PDZX, PDZY 
                                                       ! Metric coefficients
-REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PZZ          ! altitude of flux points
 REAL, DIMENSION(:,:),   INTENT(IN)   ::  PDIRCOSZW    ! Director Cosinus of the
                                                       ! normal to the ground surface
 REAL, DIMENSION(:,:),   INTENT(IN)   ::  PCOSSLOPE    ! cosinus of the angle 
@@ -90,7 +89,7 @@ END MODULE MODI_TURB_VER_DYN_FLUX
                       HTURBDIM,PIMPL,PEXPL,                         &
                       PTSTEP,                                       &
                       TPFILE,                                       &
-                      PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,PZZ,       &
+                      PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,           &
                       PCOSSLOPE,PSINSLOPE,                          &
                       PRHODJ,                                       &
                       PCDUEFF,PTAU11M,PTAU12M,PTAU33M,              &
@@ -339,7 +338,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PDXX, PDYY, PDZZ, PDZX, PDZY
                                                       ! Metric coefficients
 REAL, DIMENSION(:,:),   INTENT(IN)   ::  PDIRCOSZW    ! Director Cosinus of the
                                                       ! normal to the ground surface
-REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PZZ          ! altitude of flux points
 REAL, DIMENSION(:,:),   INTENT(IN)   ::  PCOSSLOPE    ! cosinus of the angle 
                                       ! between i and the slope vector
 REAL, DIMENSION(:,:),   INTENT(IN)   ::  PSINSLOPE    ! sinus of the angle 
@@ -411,7 +409,7 @@ REAL, DIMENSION(:,:,:), allocatable :: ZTMP1_DEVICE,ZTMP2_DEVICE,ZTMP3_DEVICE,ZT
 TYPE(TFIELDDATA) :: TZFIELD
 !----------------------------------------------------------------------------
 
-!$acc data present( PDXX, PDYY, PDZZ, PDZX, PDZY, PDIRCOSZW, PZZ,        &
+!$acc data present( PDXX, PDYY, PDZZ, PDZX, PDZY, PDIRCOSZW,             &
 !$acc &             PCOSSLOPE, PSINSLOPE,                                &
 !$acc &             PRHODJ,                                              &
 !$acc &             PCDUEFF, PTAU11M, PTAU12M, PTAU33M,                  &
diff --git a/src/MNH/turb_ver_thermo_corr.f90 b/src/MNH/turb_ver_thermo_corr.f90
index 4a34347bc1887115706e0b7c625202b9872ee9d3..5b995b825ebb05bf31264c7c82e50042fb8bf8f0 100644
--- a/src/MNH/turb_ver_thermo_corr.f90
+++ b/src/MNH/turb_ver_thermo_corr.f90
@@ -13,12 +13,10 @@ INTERFACE
                       OCLOSE_OUT,OTURB_FLX,HTURBDIM,HTOM,           &
                       PIMPL,PEXPL,                                  &
                       TPFILE,                                       &
-                      PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,           &
-                      PRHODJ,PTHVREF,                               &
-                      PSFTHM,PSFRM,PSFTHP,PSFRP,                    &
-                      PWM,PTHLM,PRM,PSVM,                           &
+                      PDZZ,                                         &
+                      PWM,PTHLM,PRM,                                &
                       PTKEM,PLM,PLEPS,                              &
-                      PLOCPEXNM,PATHETA,PAMOIST,PSRCM,              &
+                      PATHETA,PAMOIST,                              &
                       PBETA, PSQRT_TKE, PDTH_DZ, PDR_DZ, PRED2TH3,  &
                       PRED2R3, PRED2THR3, PBLL_O_E, PETHETA,        &
                       PEMOIST, PREDTH1, PREDR1, PPHI3, PPSI3, PD,   &
@@ -43,20 +41,7 @@ CHARACTER(len=4),       INTENT(IN)   ::  HTOM         ! type of Third Order Mome
 REAL,                   INTENT(IN)   ::  PIMPL, PEXPL ! Coef. for temporal disc.
 TYPE(TFILEDATA),        INTENT(IN)   ::  TPFILE       ! Output file
 !
-REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PDZZ, PDXX, PDYY, PDZX, PDZY
-                                                      ! Metric coefficients
-REAL, DIMENSION(:,:),   INTENT(IN)   ::  PDIRCOSZW    ! Director Cosinus of the
-                                                      ! normal to the ground surface
-!
-REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PRHODJ       ! dry density * grid volum
-REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PTHVREF      ! ref. state Virtual 
-                                                      ! Potential Temperature 
-!
-REAL, DIMENSION(:,:),   INTENT(IN)   ::  PSFTHM,PSFRM ! surface fluxes at time
-!                                                     ! t - deltat 
-!
-REAL, DIMENSION(:,:),   INTENT(IN)   ::  PSFTHP,PSFRP ! surface fluxes at time
-!                                                     ! t + deltat 
+REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PDZZ         ! Metric coefficients
 !
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PWM 
 ! Vertical wind
@@ -64,16 +49,12 @@ REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PTHLM
 ! potential temperature at t-Delta t
 REAL, DIMENSION(:,:,:,:), INTENT(IN) ::  PRM          ! Mixing ratios 
                                                       ! at t-Delta t
-REAL, DIMENSION(:,:,:,:), INTENT(IN) ::  PSVM         ! Mixing ratios 
 !
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PTKEM        ! TKE at time t
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PLM          ! Turb. mixing length   
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PLEPS        ! dissipative length   
-REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PLOCPEXNM    ! Lv(T)/Cp/Exnref at time t-1
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PATHETA      ! coefficients between 
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PAMOIST      ! s and Thetal and Rnp
-REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PSRCM        ! normalized 
-                  ! 2nd-order flux s'r'c/2Sigma_s2 at t-1 multiplied by Lambda_3
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PBETA        ! buoyancy coefficient
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PSQRT_TKE    ! sqrt(e)
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PDTH_DZ      ! d(th)/dz
@@ -112,12 +93,10 @@ END MODULE MODI_TURB_VER_THERMO_CORR
                       OCLOSE_OUT,OTURB_FLX,HTURBDIM,HTOM,           &
                       PIMPL,PEXPL,                                  &
                       TPFILE,                                       &
-                      PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,           &
-                      PRHODJ,PTHVREF,                               &
-                      PSFTHM,PSFRM,PSFTHP,PSFRP,                    &
-                      PWM,PTHLM,PRM,PSVM,                           &
+                      PDZZ,                                         &
+                      PWM,PTHLM,PRM,                                &
                       PTKEM,PLM,PLEPS,                              &
-                      PLOCPEXNM,PATHETA,PAMOIST,PSRCM,              &
+                      PATHETA,PAMOIST,                              &
                       PBETA, PSQRT_TKE, PDTH_DZ, PDR_DZ, PRED2TH3,  &
                       PRED2R3, PRED2THR3, PBLL_O_E, PETHETA,        &
                       PEMOIST, PREDTH1, PREDR1, PPHI3, PPSI3, PD,   &
@@ -362,20 +341,7 @@ CHARACTER(len=4),       INTENT(IN)   ::  HTOM         ! type of Third Order Mome
 REAL,                   INTENT(IN)   ::  PIMPL, PEXPL ! Coef. for temporal disc.
 TYPE(TFILEDATA),        INTENT(IN)   ::  TPFILE       ! Output file
 !
-REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PDZZ, PDXX, PDYY, PDZX, PDZY
-                                                      ! Metric coefficients
-REAL, DIMENSION(:,:),   INTENT(IN)   ::  PDIRCOSZW    ! Director Cosinus of the
-                                                      ! normal to the ground surface
-!
-REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PRHODJ       ! dry density * grid volum
-REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PTHVREF      ! ref. state Virtual 
-                                                      ! Potential Temperature 
-!
-REAL, DIMENSION(:,:),   INTENT(IN)   ::  PSFTHM,PSFRM ! surface fluxes at time
-!                                                     ! t - deltat 
-!
-REAL, DIMENSION(:,:),   INTENT(IN)   ::  PSFTHP,PSFRP ! surface fluxes at time
-!                                                     ! t + deltat 
+REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PDZZ         ! Metric coefficients
 !
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PWM 
 ! Vertical wind
@@ -383,16 +349,12 @@ REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PTHLM
 ! potential temperature at t-Delta t
 REAL, DIMENSION(:,:,:,:), INTENT(IN) ::  PRM          ! Mixing ratios 
                                                       ! at t-Delta t
-REAL, DIMENSION(:,:,:,:), INTENT(IN) ::  PSVM         ! Mixing ratios 
 !
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PTKEM        ! TKE at time t
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PLM          ! Turb. mixing length   
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PLEPS        ! dissipative length   
-REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PLOCPEXNM    ! Lv(T)/Cp/Exnref at time t-1
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PATHETA      ! coefficients between 
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PAMOIST      ! s and Thetal and Rnp
-REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PSRCM        ! normalized 
-! 2nd-order flux s'r'c/2Sigma_s2 at t-1 multiplied by Lambda_3
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PBETA        ! buoyancy coefficient
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PSQRT_TKE    ! sqrt(e)
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PDTH_DZ      ! d(th)/dz
@@ -453,12 +415,10 @@ REAL, DIMENSION(:,:,:), allocatable :: ZTMP5_DEVICE,ZTMP6_DEVICE,ZTMP7_DEVICE,ZT
 TYPE(TFIELDDATA) :: TZFIELD
 !----------------------------------------------------------------------------
 
-!$acc data present( PDXX, PDYY, PDZZ, PDZX, PDZY, PDIRCOSZW,         &
-!$acc &             PRHODJ, PTHVREF,                                 &
-!$acc &             PSFTHM, PSFRM, PSFTHP, PSFRP,                    &
-!$acc &             PWM, PTHLM, PRM, PSVM,                           &
+!$acc data present( PDZZ,                                            &
+!$acc &             PWM, PTHLM, PRM,                                 &
 !$acc &             PTKEM, PLM, PLEPS,                               &
-!$acc &             PLOCPEXNM, PATHETA, PAMOIST, PSRCM,              &
+!$acc &             PATHETA, PAMOIST,                                &
 !$acc &             PBETA,  PSQRT_TKE,  PDTH_DZ,  PDR_DZ,  PRED2TH3, &
 !$acc &             PRED2R3,  PRED2THR3,  PBLL_O_E,  PETHETA,        &
 !$acc &             PEMOIST,  PREDTH1,  PREDR1,  PPHI3,  PPSI3,  PD, &
@@ -467,29 +427,15 @@ TYPE(TFIELDDATA) :: TZFIELD
 
 if ( mppdb_initialized ) then
   !Check all in arrays
-  call Mppdb_check( pdxx,      "Turb_ver_thermo_corr beg:pdxx"      )
-  call Mppdb_check( pdyy,      "Turb_ver_thermo_corr beg:pdyy"      )
   call Mppdb_check( pdzz,      "Turb_ver_thermo_corr beg:pdzz"      )
-  call Mppdb_check( pdzx,      "Turb_ver_thermo_corr beg:pdzx"      )
-  call Mppdb_check( pdzy,      "Turb_ver_thermo_corr beg:pdzy"      )
-  call Mppdb_check( pdircoszw, "Turb_ver_thermo_corr beg:pdircoszw" )
-  call Mppdb_check( prhodj,    "Turb_ver_thermo_corr beg:prhodj"    )
-  call Mppdb_check( pthvref,   "Turb_ver_thermo_corr beg:pthvref"   )
-  call Mppdb_check( psfthm,    "Turb_ver_thermo_corr beg:psfthm"    )
-  call Mppdb_check( psfrm,     "Turb_ver_thermo_corr beg:psfrm"     )
-  call Mppdb_check( psfthp,    "Turb_ver_thermo_corr beg:psfthp"    )
-  call Mppdb_check( psfrp,     "Turb_ver_thermo_corr beg:psfrp"     )
   call Mppdb_check( pwm,       "Turb_ver_thermo_corr beg:pwm"       )
   call Mppdb_check( pthlm,     "Turb_ver_thermo_corr beg:pthlm"     )
   call Mppdb_check( prm,       "Turb_ver_thermo_corr beg:prm"       )
-  call Mppdb_check( psvm,      "Turb_ver_thermo_corr beg:psvm"      )
   call Mppdb_check( ptkem,     "Turb_ver_thermo_corr beg:ptkem"     )
   call Mppdb_check( plm,       "Turb_ver_thermo_corr beg:plm"       )
   call Mppdb_check( pleps,     "Turb_ver_thermo_corr beg:pleps"     )
-  call Mppdb_check( plocpexnm, "Turb_ver_thermo_corr beg:plocpexnm" )
   call Mppdb_check( patheta,   "Turb_ver_thermo_corr beg:patheta"   )
   call Mppdb_check( pamoist,   "Turb_ver_thermo_corr beg:pamoist"   )
-  call Mppdb_check( psrcm,     "Turb_ver_thermo_corr beg:psrcm"     )
   call Mppdb_check( pbeta,     "Turb_ver_thermo_corr beg:pbeta"     )
   call Mppdb_check( psqrt_tke, "Turb_ver_thermo_corr beg:psqrt_tke" )
   call Mppdb_check( pdth_dz,   "Turb_ver_thermo_corr beg:pdth_dz"   )
diff --git a/src/MNH/turb_ver_thermo_flux.f90 b/src/MNH/turb_ver_thermo_flux.f90
index 06dc998bdb9880e50070decbe042ef967e800ea7..7334345af5b12804f7b76195bd821923aa578a0b 100644
--- a/src/MNH/turb_ver_thermo_flux.f90
+++ b/src/MNH/turb_ver_thermo_flux.f90
@@ -14,12 +14,12 @@ INTERFACE
                       PIMPL,PEXPL,                                  &
                       PTSTEP,                                       &
                       TPFILE,                                       &
-                      PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,PZZ,       &
-                      PRHODJ,PTHVREF,                               &
+                      PDZZ,PDIRCOSZW,PZZ,                           &
+                      PRHODJ,                                       &
                       PSFTHM,PSFRM,PSFTHP,PSFRP,                    &
                       PWM,PTHLM,PRM,PSVM,                           &
                       PTKEM,PLM,PLEPS,                              &
-                      PLOCPEXNM,PATHETA,PAMOIST,PSRCM,PFRAC_ICE,    &
+                      PATHETA,PAMOIST,PSRCM,PFRAC_ICE,              &
                       PBETA, PSQRT_TKE, PDTH_DZ, PDR_DZ, PRED2TH3,  &
                       PRED2R3, PRED2THR3, PBLL_O_E, PETHETA,        &
                       PEMOIST, PREDTH1, PREDR1, PPHI3, PPSI3, PD,   &
@@ -45,15 +45,12 @@ REAL,                   INTENT(IN)   ::  PIMPL, PEXPL ! Coef. for temporal disc.
 REAL,                   INTENT(IN)   ::  PTSTEP       ! Double Time Step
 TYPE(TFILEDATA),        INTENT(IN)   ::  TPFILE       ! Output file
 !
-REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PDZZ, PDXX, PDYY, PDZX, PDZY
-                                                      ! Metric coefficients
+REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PDZZ         ! Metric coefficients
 REAL, DIMENSION(:,:),   INTENT(IN)   ::  PDIRCOSZW    ! Director Cosinus of the
                                                       ! normal to the ground surface
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PZZ          ! altitudes
 !
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PRHODJ       ! dry density * grid volum
-REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PTHVREF      ! ref. state Virtual 
-                                                      ! Potential Temperature 
 !
 REAL, DIMENSION(:,:),   INTENT(IN)   ::  PSFTHM,PSFRM ! surface fluxes at time
 !                                                     ! t - deltat 
@@ -72,7 +69,6 @@ REAL, DIMENSION(:,:,:,:), INTENT(IN) ::  PSVM         ! Mixing ratios
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PTKEM        ! TKE at time t
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PLM          ! Turb. mixing length   
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PLEPS        ! dissipative length   
-REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PLOCPEXNM    ! Lv(T)/Cp/Exnref at time t-1
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PATHETA      ! coefficients between 
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PAMOIST      ! s and Thetal and Rnp
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PSRCM        ! normalized 
@@ -125,12 +121,12 @@ END MODULE MODI_TURB_VER_THERMO_FLUX
                       PIMPL,PEXPL,                                  &
                       PTSTEP,                                       &
                       TPFILE,                                       &
-                      PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,PZZ,       &
-                      PRHODJ,PTHVREF,                               &
+                      PDZZ,PDIRCOSZW,PZZ,                           &
+                      PRHODJ,                                       &
                       PSFTHM,PSFRM,PSFTHP,PSFRP,                    &
                       PWM,PTHLM,PRM,PSVM,                           &
                       PTKEM,PLM,PLEPS,                              &
-                      PLOCPEXNM,PATHETA,PAMOIST,PSRCM,PFRAC_ICE,    &
+                      PATHETA,PAMOIST,PSRCM,PFRAC_ICE,              &
                       PBETA, PSQRT_TKE, PDTH_DZ, PDR_DZ, PRED2TH3,  &
                       PRED2R3, PRED2THR3, PBLL_O_E, PETHETA,        &
                       PEMOIST, PREDTH1, PREDR1, PPHI3, PPSI3, PD,   &
@@ -382,15 +378,12 @@ REAL,                   INTENT(IN)   ::  PIMPL, PEXPL ! Coef. for temporal disc.
 REAL,                   INTENT(IN)   ::  PTSTEP       ! Double Time Step
 TYPE(TFILEDATA),        INTENT(IN)   ::  TPFILE       ! Output file
 !
-REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PDZZ, PDXX, PDYY, PDZX, PDZY
-                                                      ! Metric coefficients
+REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PDZZ         ! Metric coefficients
 REAL, DIMENSION(:,:),   INTENT(IN)   ::  PDIRCOSZW    ! Director Cosinus of the
                                                       ! normal to the ground surface
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PZZ          ! altitudes
 !
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PRHODJ       ! dry density * grid volum
-REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PTHVREF      ! ref. state Virtual 
-                                                      ! Potential Temperature 
 !
 REAL, DIMENSION(:,:),   INTENT(IN)   ::  PSFTHM,PSFRM ! surface fluxes at time
 !                                                     ! t - deltat 
@@ -409,7 +402,6 @@ REAL, DIMENSION(:,:,:,:), INTENT(IN) ::  PSVM         ! Mixing ratios
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PTKEM        ! TKE at time t
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PLM          ! Turb. mixing length   
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PLEPS        ! dissipative length   
-REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PLOCPEXNM    ! Lv(T)/Cp/Exnref at time t-1
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PATHETA      ! coefficients between 
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PAMOIST      ! s and Thetal and Rnp
 REAL, DIMENSION(:,:,:), INTENT(IN)   ::  PSRCM        ! normalized 
@@ -481,12 +473,12 @@ REAL, DIMENSION(:,:,:), allocatable :: ZTMP1_DEVICE,ZTMP2_DEVICE,ZTMP3_DEVICE,ZT
 TYPE(TFIELDDATA) :: TZFIELD
 !----------------------------------------------------------------------------
 
-!$acc data present( PDXX, PDYY, PDZZ, PDZX, PDZY, PDIRCOSZW, PZZ,    &
-!$acc &             PRHODJ, PTHVREF,                                 &
+!$acc data present( PDZZ, PDIRCOSZW, PZZ,                            &
+!$acc &             PRHODJ,                                          &
 !$acc &             PSFTHM, PSFRM, PSFTHP, PSFRP,                    &
 !$acc &             PWM, PTHLM, PRM, PSVM,                           &
 !$acc &             PTKEM, PLM, PLEPS,                               &
-!$acc &             PLOCPEXNM, PATHETA, PAMOIST, PSRCM, PFRAC_ICE,   &
+!$acc &             PATHETA, PAMOIST, PSRCM, PFRAC_ICE,              &
 !$acc &             PBETA,  PSQRT_TKE,  PDTH_DZ,  PDR_DZ,  PRED2TH3, &
 !$acc &             PRED2R3,  PRED2THR3,  PBLL_O_E,  PETHETA,        &
 !$acc &             PEMOIST,  PREDTH1,  PREDR1,  PPHI3,  PPSI3,  PD, &
@@ -495,15 +487,10 @@ TYPE(TFIELDDATA) :: TZFIELD
 
 if ( mppdb_initialized ) then
   !check all in arrays
-  call Mppdb_check( pdxx,      "Turb_ver_thermo_flux beg:pdxx"      )
-  call Mppdb_check( pdyy,      "Turb_ver_thermo_flux beg:pdyy"      )
   call Mppdb_check( pdzz,      "Turb_ver_thermo_flux beg:pdzz"      )
-  call Mppdb_check( pdzx,      "Turb_ver_thermo_flux beg:pdzx"      )
-  call Mppdb_check( pdzy,      "Turb_ver_thermo_flux beg:pdzy"      )
   call Mppdb_check( pdircoszw, "Turb_ver_thermo_flux beg:pdircoszw" )
   call Mppdb_check( pzz,       "Turb_ver_thermo_flux beg:pzz"       )
   call Mppdb_check( prhodj,    "Turb_ver_thermo_flux beg:prhodj"    )
-  call Mppdb_check( pthvref,   "Turb_ver_thermo_flux beg:pthvref"   )
   call Mppdb_check( psfthm,    "Turb_ver_thermo_flux beg:psfthm"    )
   call Mppdb_check( psfrm,     "Turb_ver_thermo_flux beg:psfrm"     )
   call Mppdb_check( psfthp,    "Turb_ver_thermo_flux beg:psfthp"    )
@@ -515,7 +502,6 @@ if ( mppdb_initialized ) then
   call Mppdb_check( ptkem,     "Turb_ver_thermo_flux beg:ptkem"     )
   call Mppdb_check( plm,       "Turb_ver_thermo_flux beg:plm"       )
   call Mppdb_check( pleps,     "Turb_ver_thermo_flux beg:pleps"     )
-  call Mppdb_check( plocpexnm, "Turb_ver_thermo_flux beg:plocpexnm" )
   call Mppdb_check( patheta,   "Turb_ver_thermo_flux beg:patheta"   )
   call Mppdb_check( pamoist,   "Turb_ver_thermo_flux beg:pamoist"   )
   call Mppdb_check( psrcm,     "Turb_ver_thermo_flux beg:psrcm"     )