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

Timestamp:

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

Author:

raasch

Message:

nopointer option removed

File:

• palm/trunk/SOURCE/swap_timelevel.f90 (modified) (7 diffs)

palm/trunk/SOURCE/swap_timelevel.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! nopointer option removed
+! 
+! 3589 2018-11-30 15:09:51Z suehring
 ! Move the control parameter "salsa" from salsa_mod to control_parameters 
 ! (M. Kurppa)
@@ -142 +145 @@
  
 
-#if defined( __nopointer )
-    USE arrays_3d,                                                             &
-        ONLY:  nc, nc_p, nr, nr_p, pt, pt_p, q, q_p, qc, qc_p, qr, qr_p, s,    &
-               s_p, sa, sa_p, u, u_p, v, v_p, w, w_p
-#else
     USE arrays_3d,                                                             &
         ONLY:  nc, nc_1, nc_2, nc_p, nr, nr_1, nr_2, nr_p, pt, pt_1, pt_2,     &
@@ -152 +150 @@
                qr_p, s, s_1, s_2, s_p, sa, sa_1, sa_2, sa_p, u, u_1, u_2, u_p, &
                v, v_1, v_2, v_p, w, w_1, w_2, w_p
-#endif
 
     USE bulk_cloud_model_mod,                                                  &
@@ -170 +167 @@
     USE gust_mod,                                                              &
         ONLY: gust_module_enabled, gust_swap_timelevel
-
-#if defined( __nopointer )
-    USE indices,                                                               &
-        ONLY:  nxlg, nxrg, nyng, nysg, nzb, nzt
-#endif
 
     USE land_surface_model_mod,                                                &
@@ -197 +189 @@
     IMPLICIT NONE
 
-#if defined( __nopointer )
-    INTEGER ::  i, j, k     !> loop indices
-#endif
     INTEGER ::  swap_level  !> swap_level for steering the pmc data transfer
 
@@ -208 +197 @@
 !
 !-- Swap of variables
-#if defined( __nopointer )
-    CALL cpu_log( log_point(28), 'swap_timelevel (nop)', 'start' )
-
-    DO  i = nxlg, nxrg
-       DO  j = nysg, nyng
-          DO  k = nzb, nzt+1
-             u(k,j,i)  = u_p(k,j,i)
-             v(k,j,i)  = v_p(k,j,i)
-             w(k,j,i)  = w_p(k,j,i)
-             pt(k,j,i) = pt_p(k,j,i)
-          ENDDO
-       ENDDO
-    ENDDO
-
-    IF ( humidity )  THEN
-       q = q_p
-    ENDIF
-
-    IF ( passive_scalar )  s = s_p             
-
-!
-!-- Swapping the timelevel of other modules
-    IF ( humidity  .AND.  bulk_cloud_model )  CALL bcm_swap_timelevel( 0 )
-    IF ( gust_module_enabled )                CALL gust_swap_timelevel( 0 )
-    IF ( land_surface )                       CALL lsm_swap_timelevel( 0 )
-    IF ( ocean_mode )                         CALL ocean_swap_timelevel( 0 )
-    CALL tcm_swap_timelevel( 0 )
-    IF ( urban_surface )                      CALL usm_swap_timelevel( 0 )
-
-    CALL cpu_log( log_point(28), 'swap_timelevel (nop)', 'stop' )
-#else
     CALL cpu_log( log_point(28), 'swap_timelevel', 'start' )
 
@@ -312 +270 @@
 
     CALL cpu_log( log_point(28), 'swap_timelevel', 'stop' )
-#endif
 
  END SUBROUTINE swap_timelevel