mp_count_nodes compilation and call preprocessed out for old versions of gfortran (v < 4.8)

git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@13900 c92efa57-630b-4861-b058-cf58834340f0

Modules/environment.f90

@@ -222,8 +222,10 @@ CONTAINS
          &I5," processors")' ) nproc 
 #endif
     !
+#if (__GNUC__>4) || ((__GNUC__==4) && (__GNUC_MINOR__>=8))
     WRITE( stdout, '(/5X,"MPI processes distributed on ",&
          &I5," nodes")' ) nnode
+#endif
     IF ( nimage > 1 ) WRITE( stdout, &
          '(5X,"path-images division:  nimage    = ",I7)' ) nimage
     IF ( npool > 1 ) WRITE( stdout, &

Modules/mp_world.f90

@@ -9,7 +9,10 @@
 MODULE mp_world
   !----------------------------------------------------------------------------
   !
-  USE mp, ONLY : mp_barrier, mp_start, mp_end, mp_stop, mp_count_nodes
+  USE mp, ONLY : mp_barrier, mp_start, mp_end, mp_stop 
+#if (__GNUC__>4) || ((__GNUC__==4) && (__GNUC_MINOR__>=8))
+  USE mp, ONLY : mp_count_nodes
+#endif
   USE io_global, ONLY : meta_ionode_id, meta_ionode
   !
   USE parallel_include
@@ -70,7 +73,9 @@ CONTAINS
 #endif
     !
     CALL mp_start( nproc, mpime, world_comm )
+#if (__GNUC__>4) || ((__GNUC__==4) && (__GNUC_MINOR__>=8))
     CALL mp_count_nodes ( nnode, world_comm )
+#endif
     !
     ! ... meta_ionode is true if this processor is the root processor
     ! ... of the world group - "ionode_world" would be a better name

UtilXlib/mp.f90

@@ -23,7 +23,10 @@
         mp_root_sum, mp_comm_free, mp_comm_create, mp_comm_group, &
         mp_group_create, mp_comm_split, mp_set_displs, &
         mp_circular_shift_left, &
-        mp_get_comm_null, mp_get_comm_self, mp_count_nodes
+        mp_get_comm_null, mp_get_comm_self 
+#if (__GNUC__>4) || ((__GNUC__==4) && (__GNUC_MINOR__>=8))
+      PUBLIC :: mp_count_nodes
+#endif
 
 !
       INTERFACE mp_bcast
@@ -2234,6 +2237,8 @@ SUBROUTINE mp_circular_shift_left_c2d( buf, itag, gid )
    RETURN
 END SUBROUTINE mp_circular_shift_left_c2d
 !
+
+#if (__GNUC__>4) || ((__GNUC__==4) && (__GNUC_MINOR__>=8))
 !------------------------------------------------------------------------------!
 !..mp_count_nodes
 SUBROUTINE mp_count_nodes(num_nodes, group)
@@ -2317,9 +2322,11 @@ SUBROUTINE mp_count_nodes(num_nodes, group)
   !
   num_nodes = SUM(node_counter)
   DEALLOCATE(current_name,all_node_names,node_counter)
+!
 #endif
   RETURN
 END SUBROUTINE mp_count_nodes
+#endif 
 !
 FUNCTION mp_get_comm_null( )
   IMPLICIT NONE