[cig-commits] [commit] devel: improved replace_use_mpi_with_include_mpif_dot_h.pl and improved "use mpi" usage to make it work (5820374)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Apr 9 17:10:59 PDT 2014
Repository : ssh://geoshell/specfem2d
On branch : devel
Link : https://github.com/geodynamics/specfem2d/compare/80fabb71a99eadbaada38a043c9510f318d83015...42bc2daf590963e0a1d4986066aa7187c0afddc9
>---------------------------------------------------------------
commit 5820374ea53158a87be06cd5965be061dca70c42
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date: Thu Apr 10 02:06:50 2014 +0200
improved replace_use_mpi_with_include_mpif_dot_h.pl and improved "use mpi" usage to make it work
>---------------------------------------------------------------
5820374ea53158a87be06cd5965be061dca70c42
replace_use_mpi_with_include_mpif_dot_h.pl | 8 ++++++--
src/specfem2D/assemble_MPI.F90 | 8 ++++----
src/specfem2D/check_stability.F90 | 2 +-
src/specfem2D/checkgrid.F90 | 2 +-
src/specfem2D/exit_mpi.F90 | 3 +--
src/specfem2D/get_MPI.F90 | 2 +-
src/specfem2D/initialize_simulation.F90 | 2 +-
src/specfem2D/locate_receivers.F90 | 2 +-
src/specfem2D/locate_source_force.F90 | 2 +-
src/specfem2D/locate_source_moment_tensor.F90 | 2 +-
src/specfem2D/plotpost.F90 | 2 +-
src/specfem2D/pml_init.F90 | 2 +-
src/specfem2D/prepare_color_image.F90 | 4 ++--
src/specfem2D/prepare_initialfield.F90 | 2 +-
src/specfem2D/read_databases.F90 | 2 +-
src/specfem2D/specfem2D.F90 | 2 +-
src/specfem2D/write_seismograms.F90 | 2 +-
17 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/replace_use_mpi_with_include_mpif_dot_h.pl b/replace_use_mpi_with_include_mpif_dot_h.pl
index 8f7236c..97f1dcc 100755
--- a/replace_use_mpi_with_include_mpif_dot_h.pl
+++ b/replace_use_mpi_with_include_mpif_dot_h.pl
@@ -61,8 +61,12 @@
# read the whole input file
$whole_file = <FILE_INPUT>;
-# make the replacement
- $whole_file =~ s/\n\s*use mpi\s*\n*\s*implicit none\s*\n/\n\n implicit none\n\n include 'mpif.h'\n\n/og;
+# make the replacement (we look for "use mpi", "use:: mpi", "use :: mpi" etc.; we also handle the case of a #endif for the preprocessor between the two lines)
+ $whole_file =~ s/\n\s*use\s*mpi\s*\n*\s*implicit\s*none\s*\n/\n\n implicit none\n\n include 'mpif.h'\n\n/og;
+ $whole_file =~ s/\n\s*use\s*::\s*mpi\s*\n*\s*implicit\s*none\s*\n/\n\n implicit none\n\n include 'mpif.h'\n\n/og;
+
+ $whole_file =~ s/\n\s*use\s*mpi\s*\n*\s*#endif\s*\n*\s*implicit\s*none\s*\n/\n\n#endif\n\n implicit none\n\n include 'mpif.h'\n\n/og;
+ $whole_file =~ s/\n\s*use\s*::\s*mpi\s*\n*\s*#endif\s*\n*\s*implicit\s*none\s*\n/\n\n#endif\n\n implicit none\n\n include 'mpif.h'\n\n/og;
print FILEF90 "$whole_file";
diff --git a/src/specfem2D/assemble_MPI.F90 b/src/specfem2D/assemble_MPI.F90
index f1c1901..19eeecd 100644
--- a/src/specfem2D/assemble_MPI.F90
+++ b/src/specfem2D/assemble_MPI.F90
@@ -65,7 +65,7 @@
nibool_interfaces_acoustic,nibool_interfaces_elastic, &
nibool_interfaces_poroelastic,my_neighbours)
- use :: mpi
+ use mpi
implicit none
@@ -229,7 +229,7 @@
buffer_recv_faces_vector_ac, &
my_neighbours )
- use :: mpi
+ use mpi
implicit none
@@ -358,7 +358,7 @@
buffer_recv_faces_vector_el, &
my_neighbours)
- use :: mpi
+ use mpi
implicit none
@@ -464,7 +464,7 @@
buffer_recv_faces_vector_pos,buffer_recv_faces_vector_pow, &
my_neighbours)
- use :: mpi
+ use mpi
implicit none
diff --git a/src/specfem2D/check_stability.F90 b/src/specfem2D/check_stability.F90
index 14feca3..b71c67b 100644
--- a/src/specfem2D/check_stability.F90
+++ b/src/specfem2D/check_stability.F90
@@ -54,7 +54,7 @@
! checks simulation stability and outputs timerun infos
#ifdef USE_MPI
- use :: mpi
+ use mpi
#endif
implicit none
include "constants.h"
diff --git a/src/specfem2D/checkgrid.F90 b/src/specfem2D/checkgrid.F90
index 3e20eb9..f6b02c5 100644
--- a/src/specfem2D/checkgrid.F90
+++ b/src/specfem2D/checkgrid.F90
@@ -55,7 +55,7 @@
! check the mesh, stability and number of points per wavelength
#ifdef USE_MPI
- use :: mpi
+ use mpi
#endif
implicit none
diff --git a/src/specfem2D/exit_mpi.F90 b/src/specfem2D/exit_mpi.F90
index bb0c5fa..4ae437b 100644
--- a/src/specfem2D/exit_mpi.F90
+++ b/src/specfem2D/exit_mpi.F90
@@ -47,8 +47,7 @@
subroutine exit_MPI(error_msg)
#ifdef USE_MPI
- ! standard include of the MPI library
- use :: mpi
+ use mpi
#endif
implicit none
diff --git a/src/specfem2D/get_MPI.F90 b/src/specfem2D/get_MPI.F90
index 0c65a19..4dd9888 100644
--- a/src/specfem2D/get_MPI.F90
+++ b/src/specfem2D/get_MPI.F90
@@ -59,7 +59,7 @@
! sets up the MPI interface for communication between partitions
- use :: mpi
+ use mpi
implicit none
diff --git a/src/specfem2D/initialize_simulation.F90 b/src/specfem2D/initialize_simulation.F90
index 78bcd17..2f93674 100644
--- a/src/specfem2D/initialize_simulation.F90
+++ b/src/specfem2D/initialize_simulation.F90
@@ -47,7 +47,7 @@
subroutine initialize_simulation(nproc,myrank,ninterface_acoustic,ninterface_elastic,ninterface_poroelastic)
#ifdef USE_MPI
- use :: mpi
+ use mpi
#endif
implicit none
include "constants.h"
diff --git a/src/specfem2D/locate_receivers.F90 b/src/specfem2D/locate_receivers.F90
index 31e046e..da54cc8 100644
--- a/src/specfem2D/locate_receivers.F90
+++ b/src/specfem2D/locate_receivers.F90
@@ -55,7 +55,7 @@
x_final_receiver, z_final_receiver)
#ifdef USE_MPI
- use :: mpi
+ use mpi
#endif
implicit none
diff --git a/src/specfem2D/locate_source_force.F90 b/src/specfem2D/locate_source_force.F90
index bca2e6c..c94e43a 100644
--- a/src/specfem2D/locate_source_force.F90
+++ b/src/specfem2D/locate_source_force.F90
@@ -51,7 +51,7 @@
xi_source,gamma_source,coorg,knods,ngnod,npgeo,iglob_source)
#ifdef USE_MPI
- use :: mpi
+ use mpi
#endif
implicit none
diff --git a/src/specfem2D/locate_source_moment_tensor.F90 b/src/specfem2D/locate_source_moment_tensor.F90
index b392ed6..2ae0e9c 100644
--- a/src/specfem2D/locate_source_moment_tensor.F90
+++ b/src/specfem2D/locate_source_moment_tensor.F90
@@ -52,7 +52,7 @@
xi_source,gamma_source,coorg,knods,ngnod,npgeo)
#ifdef USE_MPI
- use :: mpi
+ use mpi
#endif
implicit none
diff --git a/src/specfem2D/plotpost.F90 b/src/specfem2D/plotpost.F90
index 50cbd0c..dff4dfd 100644
--- a/src/specfem2D/plotpost.F90
+++ b/src/specfem2D/plotpost.F90
@@ -82,7 +82,7 @@
!
#ifdef USE_MPI
- use :: mpi
+ use mpi
#endif
implicit none
diff --git a/src/specfem2D/pml_init.F90 b/src/specfem2D/pml_init.F90
index c69e4fb..cf2bb70 100644
--- a/src/specfem2D/pml_init.F90
+++ b/src/specfem2D/pml_init.F90
@@ -46,7 +46,7 @@
PML_interior_interface,nglob_interface,mask_ibool,read_external_mesh)
#ifdef USE_MPI
- use :: mpi
+ use mpi
#endif
implicit none
diff --git a/src/specfem2D/prepare_color_image.F90 b/src/specfem2D/prepare_color_image.F90
index be1f697..9956678 100644
--- a/src/specfem2D/prepare_color_image.F90
+++ b/src/specfem2D/prepare_color_image.F90
@@ -50,7 +50,7 @@
coord,nglob,npgeo,factor_subsample_image)
#ifdef USE_MPI
- use :: mpi
+ use mpi
#endif
implicit none
include "constants.h"
@@ -304,7 +304,7 @@
! stores P-velocity model in image_color_vp_display
#ifdef USE_MPI
- use :: mpi
+ use mpi
#endif
implicit none
include "constants.h"
diff --git a/src/specfem2D/prepare_initialfield.F90 b/src/specfem2D/prepare_initialfield.F90
index 2589a12..08ed324 100644
--- a/src/specfem2D/prepare_initialfield.F90
+++ b/src/specfem2D/prepare_initialfield.F90
@@ -52,7 +52,7 @@
accel_elastic,veloc_elastic,displ_elastic)
#ifdef USE_MPI
- use :: mpi
+ use mpi
#endif
implicit none
include "constants.h"
diff --git a/src/specfem2D/read_databases.F90 b/src/specfem2D/read_databases.F90
index 5e6cc5b..b2bc816 100644
--- a/src/specfem2D/read_databases.F90
+++ b/src/specfem2D/read_databases.F90
@@ -673,7 +673,7 @@
! reads in absorbing edges
#ifdef USE_MPI
- use :: mpi
+ use mpi
#endif
implicit none
diff --git a/src/specfem2D/specfem2D.F90 b/src/specfem2D/specfem2D.F90
index 41c9891..62556e4 100644
--- a/src/specfem2D/specfem2D.F90
+++ b/src/specfem2D/specfem2D.F90
@@ -357,7 +357,7 @@
! therefore not be consistent with the basis functions.
#ifdef USE_MPI
- use :: mpi
+ use mpi
#endif
implicit none
diff --git a/src/specfem2D/write_seismograms.F90 b/src/specfem2D/write_seismograms.F90
index 5e540d5..5908229 100644
--- a/src/specfem2D/write_seismograms.F90
+++ b/src/specfem2D/write_seismograms.F90
@@ -51,7 +51,7 @@
save_binary_seismograms_single,save_binary_seismograms_double,subsamp_seismos)
#ifdef USE_MPI
- use :: mpi
+ use mpi
#endif
implicit none
More information about the CIG-COMMITS
mailing list