Changeset 809 for palm/trunk/SOURCE/poisfft_hybrid.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/poisfft_hybrid.f90 (modified) (6 diffs)

palm/trunk/SOURCE/poisfft_hybrid.f90

@@ -5 +5 @@
 ! Current revisions: 
 ! ----------------- 
-!
+! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives
 !
 ! Former revisions: 
@@ -92 +92 @@
 
 
-#if .NOT. defined ( __check )
+#if ! defined ( __check )
     PUBLIC poisfft_hybrid, poisfft_hybrid_ini
 
@@ -172 +172 @@
        nwords = ( nxr_p-nxl_p+1 ) * nz * ( nyn_p-nys_p+1 )
 
-#if defined( __KKMP ) .AND. .NOT. defined ( __check )
+#if defined( __KKMP ) && ! defined ( __check )
        CALL LOCAL_GETENV( 'OMP_NUM_THREADS', 15, cdummy, idummy )
        READ ( cdummy, '(I8)' )  n_omp_threads
@@ -228 +228 @@
        IF ( tasks_per_logical_node >= 2 )  THEN
 
-#if defined( __parallel ) .AND. .NOT. defined ( __check )
+#if defined( __parallel ) && ! defined ( __check )
           nodes   = ( numprocs + tasks_per_logical_node - 1 ) / &
                     tasks_per_logical_node
@@ -250 +250 @@
 !          write(0,*) 'who am i',myid,me,me_node,me_task,nodes,&
 !                     tasks_per_logical_node
-#elif .NOT. defined( __parallel ) 
+#elif ! defined( __parallel ) 
           message_string = 'parallel environment (MPI) required'
           CALL message( 'poisfft_hybrid_ini', 'PA0282', 1, 2, 0, 6, 0 )
@@ -258 +258 @@
     END SUBROUTINE poisfft_hybrid_ini
 
-#if .NOT. defined ( __check )
+#if ! defined ( __check )
     SUBROUTINE poisfft_hybrid( ar )