[cig-commits] [commit] devel: fixed two warnings from gfortran (f0c3e2a)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Mon Apr 21 15:27:57 PDT 2014


Repository : ssh://geoshell/specfem3d_globe

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d_globe/compare/99700306e82487055892c4310a277c51b519801e...4e0c67ef3f0fa1f78e1f18298c8dc45e67b7a3e4

>---------------------------------------------------------------

commit f0c3e2aecbf61edd01d7736b2eba1bee5cf9118f
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date:   Tue Apr 22 00:27:01 2014 +0200

    fixed two warnings from gfortran


>---------------------------------------------------------------

f0c3e2aecbf61edd01d7736b2eba1bee5cf9118f
 src/auxiliaries/combine_vol_data.F90 | 20 +++++++++++++++-----
 src/meshfem3D/model_s362ani.f90      |  7 +++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/auxiliaries/combine_vol_data.F90 b/src/auxiliaries/combine_vol_data.F90
index 3d84713..5026f48 100644
--- a/src/auxiliaries/combine_vol_data.F90
+++ b/src/auxiliaries/combine_vol_data.F90
@@ -35,7 +35,9 @@ program combine_vol_data_vtk
 #ifdef ADIOS_INPUT
   use adios_read_mod
   use combine_vol_data_adios_mod
-  use mpi
+!!!!!!!! DK DK removed because this breaks the build system
+!!!!!!!! DK DK use calls to routines in src/shared/parallel.f90 instead
+!!!!!!!! DK DK   use mpi
 #endif
 
   implicit none
@@ -109,12 +111,16 @@ program combine_vol_data_vtk
 
   ! starts here---------------------------------------------------------------
 #ifdef ADIOS_INPUT
-  call MPI_Init(ierr)
-  call MPI_Comm_size(MPI_COMM_WORLD, sizeprocs, ierr)
+!!!!!!!! DK DK removed because this breaks the build system
+!!!!!!!! DK DK use calls to routines in src/shared/parallel.f90 instead
+!!!!!!!! DK DK added this
+  stop 'DK DK added this because this part of the code breaks the build system'
+!!!!!!!! DK DK removed because this breaks the build system  call MPI_Init(ierr)
+!!!!!!!! DK DK removed because this breaks the build system  call MPI_Comm_size(MPI_COMM_WORLD, sizeprocs, ierr)
   print  *, sizeprocs, "procs"
   if (sizeprocs /= 1) then
     print *, "sequential program. Only mpirun -np 1 ..."
-    call MPI_Abort(MPI_COMM_WORLD, mpier, ierr)
+!!!!!!!! DK DK removed because this breaks the build system    call MPI_Abort(MPI_COMM_WORLD, mpier, ierr)
   endif
 #endif
 
@@ -672,7 +678,11 @@ print *, irs, ire
 
 #ifdef ADIOS_INPUT
   call clean_adios(value_handle, mesh_handle)
-  call MPI_Finalize(ierr)
+!!!!!!!! DK DK removed because this breaks the build system
+!!!!!!!! DK DK use calls to routines in src/shared/parallel.f90 instead
+!!!!!!!! DK DK added this
+  stop 'DK DK added this because this part of the code breaks the build system'
+!!!!!!!! DK DK removed because this breaks the build system  call MPI_Finalize(ierr)
 #endif
 
 
diff --git a/src/meshfem3D/model_s362ani.f90 b/src/meshfem3D/model_s362ani.f90
index 673d954..06d000b 100644
--- a/src/meshfem3D/model_s362ani.f90
+++ b/src/meshfem3D/model_s362ani.f90
@@ -1754,16 +1754,15 @@
 
   implicit none
 
+  integer :: i,M,MP1,k,l,LP1
+  real(kind=4) :: THETA,DSFL3,COSEC,SFL3
+
   real(kind=4) :: X(M+1),XP(M+1),XCOSEC(M+1)
 
   double precision :: SMALL,sumval,COMPAR,CT,ST,FCT,COT,X1,X2,X3,F1,F2,XM,TH
 
   double precision, parameter :: FPI = 12.56637062D0
 
-  integer :: i,M,MP1,k,l,LP1
-
-  real(kind=4) :: THETA,DSFL3,COSEC,SFL3
-
 !!!!!! illegal statement, removed by Dimitri Komatitsch   DFLOAT(I)=FLOAT(I)
 
   sumval=0.D0



More information about the CIG-COMMITS mailing list