Changeset 809 for palm/trunk/SOURCE/init_pegrid.f90

Timestamp:

Jan 30, 2012 1:32:58 PM (12 years ago)

Author:

maronga

Message:

Bugfix: cpp directives .NOT., .AND. replaced by !,&&. Minor bugfixes in mrungui

File:

• palm/trunk/SOURCE/init_pegrid.f90 (modified) (9 diffs)

palm/trunk/SOURCE/init_pegrid.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
+! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives
 !
 ! ATTENTION: nnz_x undefined problem still has to be solved!!!!!!!!
@@ -218 +219 @@
 
 
-#if .NOT. defined( __check)
+#if ! defined( __check)
 !
 !-- Create the virtual processor grid
@@ -531 +532 @@
 
 
-#if .NOT. defined( __check)
+#if ! defined( __check)
 !
 !-- Collect index bounds from other PEs (to be written to restart file later)
@@ -598 +599 @@
 #endif
 
-#if defined( __parallel ) .AND. .NOT. defined( __check)
+#if defined( __parallel ) && ! defined( __check)
 #if defined( __mpi2 )
 !
@@ -942 +943 @@
 
           IF ( i == mg_switch_to_pe0_level )  THEN
-#if defined( __parallel ) .AND. .NOT. defined( __check )
+#if defined( __parallel ) && ! defined( __check )
 !
 !--          Save the grid size of the subdomain at the switch level, because
@@ -975 +976 @@
                               ( nzt_l - nzb + 2 )
 
-#elif .NOT. defined ( __parallel )
+#elif ! defined ( __parallel )
              message_string = 'multigrid gather/scatter impossible ' // &
                           'in non parallel mode'
@@ -1017 +1018 @@
     grid_level = 0
 
-#if defined( __parallel ) .AND. .NOT. defined ( __check )
+#if defined( __parallel ) && ! defined ( __check )
 !
 !-- Gridpoint number for the exchange of ghost points (y-line for 2D-arrays)
@@ -1100 +1101 @@
 #endif
 
-#if defined( __parallel ) .AND. .NOT. defined ( __check )
+#if defined( __parallel ) && ! defined ( __check )
 !
 !-- Setting of flags for inflow/outflow conditions in case of non-cyclic
@@ -1160 +1161 @@
                         comm1dx, ierr )
 
-#elif .NOT. defined ( __parallel )
+#elif ! defined ( __parallel )
     IF ( bc_lr == 'dirichlet/radiation' )  THEN
        inflow_l  = .TRUE.