Changeset 3636 for palm/trunk/SOURCE/turbulence_closure_mod.f90

Timestamp:

Dec 19, 2018 1:48:34 PM (5 years ago)

Author:

raasch

Message:

nopointer option removed

File:

• palm/trunk/SOURCE/turbulence_closure_mod.f90 (modified) (14 diffs)

palm/trunk/SOURCE/turbulence_closure_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! nopointer option removed
+! 
+! 3634 2018-12-18 12:31:28Z knoop
 ! OpenACC port for SPEC
 ! 
@@ -177 +180 @@
  
 
-#if defined( __nopointer )
-    USE arrays_3d,                                                             &
-        ONLY:  diss, diss_p, dzu, e, e_p, kh, km,                              &
-               mean_inflow_profiles, prho, pt, tdiss_m, te_m, tend, u, v, vpt, w
-#else
     USE arrays_3d,                                                             &
         ONLY:  diss, diss_1, diss_2, diss_3, diss_p, dzu, e, e_1, e_2, e_3,    &
                e_p, kh, km, mean_inflow_profiles, prho, pt, tdiss_m,           &
                te_m, tend, u, v, vpt, w
-#endif
 
     USE basic_constants_and_equations_mod,                                     &
@@ -911 +908 @@
     ALLOCATE( km(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
 
-#if defined( __nopointer )
-    ALLOCATE( e(nzb:nzt+1,nysg:nyng,nxlg:nxrg)    )
-    ALLOCATE( e_p(nzb:nzt+1,nysg:nyng,nxlg:nxrg)  )
-    ALLOCATE( te_m(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-
-#else
     ALLOCATE( e_1(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
     ALLOCATE( e_2(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
     ALLOCATE( e_3(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-#endif
+
 !
 !-- Allocate arrays required for dissipation. 
@@ -928 +919 @@
     IF ( rans_mode  .OR.  use_sgs_for_particles  .OR.  wang_kernel  .OR.       &
          collision_turbulence  .OR.  nested_run )  THEN
-#if defined( __nopointer )
-       ALLOCATE( diss(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-       IF ( rans_tke_e )  THEN
-          ALLOCATE( diss_p(nzb:nzt+1,nysg:nyng,nxlg:nxrg)  )
-          ALLOCATE( tdiss_m(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-       ENDIF
-#else
+
        ALLOCATE( diss_1(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
        IF ( rans_tke_e  .OR.  nested_run )  THEN
@@ -940 +925 @@
           ALLOCATE( diss_3(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
        ENDIF
-#endif
+
     ENDIF
 
-#if ! defined( __nopointer )
 !
 !-- Initial assignment of pointers
@@ -955 +939 @@
        ENDIF
     ENDIF
-#endif
 
  END SUBROUTINE tcm_init_arrays
@@ -3731 +3714 @@
 #endif
 
-#if defined( __nopointer )
-    REAL(wp), DIMENSION(nzb:nzt+1,nysg:nyng,nxlg:nxrg) ::  var  !< temperature
-#else
+    REAL(wp)     ::  dissipation  !< TKE dissipation
+
     REAL(wp), DIMENSION(:,:,:), POINTER ::  var  !< temperature
-#endif
-    REAL(wp)     ::  dissipation  !< TKE dissipation
 
 
@@ -3930 +3910 @@
     REAL(wp)     ::  var_reference  !< reference temperature
 
-#if defined( __nopointer )
-    REAL(wp), DIMENSION(nzb:nzt+1,nysg:nyng,nxlg:nxrg) ::  var  !< temperature
-#else
+    REAL(wp), DIMENSION(nzb+1:nzt) ::  dissipation  !< dissipation of TKE
+
     REAL(wp), DIMENSION(:,:,:), POINTER ::  var     !< temperature
-#endif
-    REAL(wp), DIMENSION(nzb+1:nzt) ::  dissipation  !< dissipation of TKE
 
 !
@@ -4161 +4138 @@
     REAL(wp)     :: var_reference   !< var at reference height
 
-#if defined( __nopointer )
-    REAL(wp), DIMENSION(nzb:nzt+1,nysg:nyng,nxlg:nxrg) ::  var  !< temperature
-#else
     REAL(wp), DIMENSION(:,:,:), POINTER ::  var  !< temperature
-#endif
+
 
     dvar_dz = atmos_ocean_sign * ( var(k+1,j,i) - var(k-1,j,i) ) * dd2zu(k)
@@ -4218 +4192 @@
     REAL(wp)     :: var_reference   !< var at reference height
 
-#if defined( __nopointer )
-    REAL(wp), DIMENSION(nzb:nzt+1,nysg:nyng,nxlg:nxrg) ::  var  !< temperature
-#else
     REAL(wp), DIMENSION(:,:,:), POINTER ::  var  !< temperature
-#endif
+
 
     dvar_dz = atmos_ocean_sign * ( var(k+1,j,i) - var(k-1,j,i) ) * dd2zu(k)
@@ -4282 +4253 @@
     REAL(wp) ::  var_reference  !< reference temperature
 
-#if defined( __nopointer )
-    REAL(wp), DIMENSION(nzb:nzt+1,nysg:nyng,nxlg:nxrg) ::  var  !< temperature
-#else
     REAL(wp), DIMENSION(:,:,:), POINTER ::  var  !< temperature
-#endif
+
 
 !
@@ -4488 +4456 @@
 #endif
 
-#if defined( __nopointer )
-    REAL(wp), DIMENSION(nzb:nzt+1,nysg:nyng,nxlg:nxrg) ::  var  !< temperature
-#else
     REAL(wp), DIMENSION(:,:,:), POINTER ::  var  !< temperature
-#endif
+
 
 !
@@ -4942 +4907 @@
 
 
-#if defined( __nopointer )
-    INTEGER(iwp) ::  i      !< loop index x direction
-    INTEGER(iwp) ::  j      !< loop index y direction
-    INTEGER(iwp) ::  k      !< loop index z direction
-#endif
     INTEGER, INTENT(IN) ::  mod_count  !< flag defining where pointers point to
 
-#if defined( __nopointer )
-
-    IF ( .NOT. constant_diffusion )  THEN
-       DO  i = nxlg, nxrg
-          DO  j = nysg, nyng
-             DO  k = nzb, nzt+1
-                e(k,j,i) = e_p(k,j,i)
-             ENDDO
-          ENDDO
-       ENDDO
-    ENDIF
-
-    IF ( rans_tke_e )  THEN
-       DO  i = nxlg, nxrg
-          DO  j = nysg, nyng
-             DO  k = nzb, nzt+1
-                diss(k,j,i) = diss_p(k,j,i)
-             ENDDO
-          ENDDO
-       ENDDO
-    ENDIF
-
-#else
-    
+
     SELECT CASE ( mod_count )
 
@@ -4996 +4933 @@
 
     END SELECT
-#endif
 
  END SUBROUTINE tcm_swap_timelevel