[cig-commits] r22665 - in seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src: meshfem3D shared specfem3D

dkomati1 at geodynamics.org dkomati1 at geodynamics.org
Wed Jul 24 10:11:04 PDT 2013 

Author: dkomati1
Date: 2013-07-24 10:11:03 -0700 (Wed, 24 Jul 2013)
New Revision: 22665

Modified:
   seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/assemble_MPI_central_cube_mesh.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/assemble_MPI_scalar_mesh.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/create_central_cube_buffers.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_atten3D_QRFSI12.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_ppm.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_sea99_s.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/setup_color_perm.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/write_VTK_file.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/prepare_timerun.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/read_attenuation_adios.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/read_mesh_databases_adios.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/read_topography_bathymetry.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/setup_sources_receivers.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/write_seismograms.f90
Log:
replaced all include 'mpif.h' with use mpi


Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/assemble_MPI_central_cube_mesh.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/assemble_MPI_central_cube_mesh.f90	2013-07-24 17:05:49 UTC (rev 22664)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/assemble_MPI_central_cube_mesh.f90	2013-07-24 17:11:03 UTC (rev 22665)
@@ -37,10 +37,10 @@
 
   ! this version of the routine is based on blocking MPI calls
 
+  use mpi
+
   implicit none
 
-  ! standard include of the MPI library
-  include 'mpif.h'
   include 'constants.h'
 
   ! for matching with central cube in inner core

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/assemble_MPI_scalar_mesh.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/assemble_MPI_scalar_mesh.f90	2013-07-24 17:05:49 UTC (rev 22664)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/assemble_MPI_scalar_mesh.f90	2013-07-24 17:11:03 UTC (rev 22665)
@@ -44,11 +44,10 @@
 
 ! this version of the routine is based on blocking MPI calls
 
+  use mpi
+
   implicit none
 
-! standard include of the MPI library
-  include 'mpif.h'
-
   include "constants.h"
   include "precision.h"
 

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/create_central_cube_buffers.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/create_central_cube_buffers.f90	2013-07-24 17:05:49 UTC (rev 22664)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/create_central_cube_buffers.f90	2013-07-24 17:11:03 UTC (rev 22665)
@@ -44,11 +44,10 @@
                    receiver_cube_from_slices,sender_from_slices_to_cube,ibool_central_cube, &
                    buffer_slices,buffer_slices2,buffer_all_cube_from_slices)
 
+  use mpi
+
   implicit none
 
-  ! standard include of the MPI library
-  include 'mpif.h'
-
   include "constants.h"
 
   integer, intent(in) :: myrank,iproc_xi,iproc_eta,ichunk, &

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_atten3D_QRFSI12.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_atten3D_QRFSI12.f90	2013-07-24 17:05:49 UTC (rev 22664)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_atten3D_QRFSI12.f90	2013-07-24 17:11:03 UTC (rev 22665)
@@ -68,13 +68,12 @@
 
 ! standard routine to setup model
 
+  use mpi
   use model_atten3D_QRFSI12_par
 
   implicit none
 
   include "constants.h"
-  ! standard include of the MPI library
-  include 'mpif.h'
 
   integer :: myrank
 

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_ppm.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_ppm.f90	2013-07-24 17:05:49 UTC (rev 22664)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_ppm.f90	2013-07-24 17:11:03 UTC (rev 22665)
@@ -511,12 +511,12 @@
 
 ! smooth model parameters
 
+  use mpi
   use model_ppm_par,only: &
     PPM_maxlat,PPM_maxlon,PPM_minlat,PPM_minlon,PPM_maxdepth,PPM_mindepth
 
   implicit none
 
-  include 'mpif.h'
   include "constants.h"
   include "precision.h"
 

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_sea99_s.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_sea99_s.f90	2013-07-24 17:05:49 UTC (rev 22664)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_sea99_s.f90	2013-07-24 17:11:03 UTC (rev 22665)
@@ -63,12 +63,12 @@
 
 ! standard routine to setup model
 
+  use mpi
   use model_sea99_s_par
 
   implicit none
 
   include "constants.h"
-  include 'mpif.h'
 
   integer :: myrank
 

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/setup_color_perm.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/setup_color_perm.f90	2013-07-24 17:05:49 UTC (rev 22664)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/setup_color_perm.f90	2013-07-24 17:11:03 UTC (rev 22665)
@@ -1012,9 +1012,6 @@
 !  use meshfem3D_par,only: NSTEP,DT,NPROC_XI,NPROC_ETA
 !  implicit none
 !
-!  ! standard include of the MPI library
-!  include 'mpif.h'
-!
 !  integer :: myrank
 !  integer :: iregion_code
 !

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/write_VTK_file.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/write_VTK_file.f90	2013-07-24 17:05:49 UTC (rev 22664)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/write_VTK_file.f90	2013-07-24 17:11:03 UTC (rev 22665)
@@ -421,11 +421,12 @@
 
 ! outputs single file for all processes
 
+  use mpi
+
   implicit none
 
   include "constants.h"
 
-  include 'mpif.h'
   include "precision.h"
 
   integer :: myrank,NPROCTOT

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/prepare_timerun.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/prepare_timerun.f90	2013-07-24 17:05:49 UTC (rev 22664)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/prepare_timerun.f90	2013-07-24 17:11:03 UTC (rev 22665)
@@ -1442,13 +1442,14 @@
 
   subroutine prepare_timerun_GPU()
 
+  use mpi
   use specfem_par
   use specfem_par_crustmantle
   use specfem_par_innercore
   use specfem_par_outercore
   use specfem_par_movie
+
   implicit none
-  include 'mpif.h'
 
   ! local parameters
   integer :: ier

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/read_attenuation_adios.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/read_attenuation_adios.f90	2013-07-24 17:05:49 UTC (rev 22664)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/read_attenuation_adios.f90	2013-07-24 17:11:03 UTC (rev 22665)
@@ -32,13 +32,13 @@
 subroutine read_attenuation_adios(myrank, prname, &
    factor_common, scale_factor, tau_s, vx, vy, vz, vnspec, T_c_source)
 
+  use mpi
   use adios_read_mod
   use specfem_par,only: ATTENUATION_VAL
 
   implicit none
 
   include 'constants.h'
-  include 'mpif.h'
 
   integer :: myrank
 

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/read_mesh_databases_adios.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/read_mesh_databases_adios.f90	2013-07-24 17:05:49 UTC (rev 22664)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/read_mesh_databases_adios.f90	2013-07-24 17:11:03 UTC (rev 22665)
@@ -34,6 +34,7 @@
 
 ! to couple mantle with outer core
 
+  use mpi
   use specfem_par
   use specfem_par_crustmantle
   use specfem_par_innercore
@@ -41,8 +42,6 @@
 
   implicit none
 
-  include 'mpif.h'
-
   ! local parameters
   integer :: njunk1,njunk2,njunk3
   integer :: sizeprocs, comm, ierr
@@ -642,6 +641,7 @@
 
 subroutine read_mesh_databases_addressing_adios()
 
+  use mpi
   use specfem_par
   use specfem_par_crustmantle
   use specfem_par_innercore
@@ -649,8 +649,6 @@
 
   implicit none
 
-  include 'mpif.h'
-
   ! local parameters
   integer, dimension(NCHUNKS_VAL,0:NPROC_XI_VAL-1,0:NPROC_ETA_VAL-1) :: addressing
   integer, dimension(0:NPROCTOT_VAL-1) :: ichunk_slice,iproc_xi_slice,iproc_eta_slice

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/read_topography_bathymetry.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/read_topography_bathymetry.f90	2013-07-24 17:05:49 UTC (rev 22664)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/read_topography_bathymetry.f90	2013-07-24 17:11:03 UTC (rev 22665)
@@ -27,14 +27,14 @@
 
   subroutine read_topography_bathymetry()
 
+  use mpi
   use specfem_par
   use specfem_par_crustmantle
   use specfem_par_innercore
   use specfem_par_outercore
+
   implicit none
 
-  include 'mpif.h'
-
   ! local parameters
   integer :: ier
   ! timing

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/setup_sources_receivers.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/setup_sources_receivers.f90	2013-07-24 17:05:49 UTC (rev 22664)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/setup_sources_receivers.f90	2013-07-24 17:11:03 UTC (rev 22665)
@@ -293,12 +293,12 @@
 
   subroutine setup_receivers()
 
+  use mpi
   use specfem_par
   use specfem_par_crustmantle
+
   implicit none
 
-  include 'mpif.h'
-
   ! local parameters
   double precision :: junk
   integer :: irec,isource,nrec_tot_found

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/write_seismograms.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/write_seismograms.f90	2013-07-24 17:05:49 UTC (rev 22664)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/write_seismograms.f90	2013-07-24 17:11:03 UTC (rev 22665)
@@ -123,6 +123,7 @@
 ! write seismograms to files
   subroutine write_seismograms_to_file()
 
+  use mpi
   use constants_solver
   use specfem_par,only: &
           NPROCTOT_VAL,myrank,nrec,nrec_local, &
@@ -137,8 +138,6 @@
 
   implicit none
 
-  ! standard include of the MPI library
-  include 'mpif.h'
   include "precision.h"
 
   ! local parameters

More information about the CIG-COMMITS mailing list