[cig-commits] r8544 - seismo/2D/SPECFEM2D/trunk
walter at geodynamics.org
walter at geodynamics.org
Fri Dec 7 15:55:10 PST 2007
Author: walter
Date: 2007-12-07 15:55:08 -0800 (Fri, 07 Dec 2007)
New Revision: 8544
Modified:
seismo/2D/SPECFEM2D/trunk/checkgrid.F90
seismo/2D/SPECFEM2D/trunk/meshfem2D.F90
seismo/2D/SPECFEM2D/trunk/part_unstruct.F90
Log:
corrected a some warnings with ifort.
Modified: seismo/2D/SPECFEM2D/trunk/checkgrid.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/checkgrid.F90 2007-07-03 00:14:39 UTC (rev 8543)
+++ seismo/2D/SPECFEM2D/trunk/checkgrid.F90 2007-12-07 23:55:08 UTC (rev 8544)
@@ -27,7 +27,10 @@
! color palette
integer, parameter :: NUM_COLORS = 236
double precision, dimension(NUM_COLORS) :: red,green,blue
+
+#ifdef USE_MPI
integer :: icol
+#endif
integer i,j,ispec,material,npoin,nspec,numat,time_function_type
@@ -58,10 +61,13 @@
double precision :: xmax,zmax,height,usoffset,sizex,sizez,courant_stability_number
double precision :: x1,z1,x2,z2,ratio_page,xmin,zmin,lambdaS_local,lambdaP_local
+#ifdef USE_MPI
double precision :: vpmin_glob,vpmax_glob,vsmin_glob,vsmax_glob,densmin_glob,densmax_glob
double precision :: distance_min_glob,distance_max_glob
- double precision :: courant_stability_number_max_glob,lambdaPmin_glob,lambdaPmax_glob,lambdaSmin_glob,lambdaSmax_glob
+ double precision :: courant_stability_max_glob,lambdaPmin_glob,lambdaPmax_glob,lambdaSmin_glob,lambdaSmax_glob
double precision :: xmin_glob, xmax_glob, zmin_glob, zmax_glob
+#endif
+
logical :: any_elastic_glob
double precision, dimension(2,nspec*5) :: coorg_send
double precision, dimension(:,:), allocatable :: coorg_recv
@@ -85,9 +91,23 @@
double precision coorg(NDIM,npgeo)
+
! title of the plot
character(len=60) simulation_title
+#ifndef USE_MPI
+ allocate(coorg_recv(1,1))
+ allocate(RGB_recv(1))
+ allocate(greyscale_recv(1))
+ nspec_recv = 0
+ ier = 0
+ iproc = nproc
+ deallocate(coorg_recv)
+ deallocate(RGB_recv)
+ deallocate(greyscale_recv)
+#endif
+
+
! define percentage of smallest distance between GLL points for NGLLX points
! percentages were computed by calling the GLL points routine for each degree
percent_GLL(2) = 100.d0
@@ -1402,7 +1422,7 @@
call MPI_ALLREDUCE (densmax, densmax_glob, 1, MPI_DOUBLE_PRECISION, MPI_MAX, MPI_COMM_WORLD, ier)
call MPI_ALLREDUCE (distance_min, distance_min_glob, 1, MPI_DOUBLE_PRECISION, MPI_MIN, MPI_COMM_WORLD, ier)
call MPI_ALLREDUCE (distance_max, distance_max_glob, 1, MPI_DOUBLE_PRECISION, MPI_MAX, MPI_COMM_WORLD, ier)
- call MPI_ALLREDUCE (courant_stability_number_max, courant_stability_number_max_glob, 1, MPI_DOUBLE_PRECISION, &
+ call MPI_ALLREDUCE (courant_stability_number_max, courant_stability_max_glob, 1, MPI_DOUBLE_PRECISION, &
MPI_MAX, MPI_COMM_WORLD, ier)
call MPI_ALLREDUCE (lambdaPmin, lambdaPmin_glob, 1, MPI_DOUBLE_PRECISION, MPI_MIN, MPI_COMM_WORLD, ier)
call MPI_ALLREDUCE (lambdaPmax, lambdaPmax_glob, 1, MPI_DOUBLE_PRECISION, MPI_MAX, MPI_COMM_WORLD, ier)
@@ -1417,7 +1437,7 @@
densmax = densmax_glob
distance_min = distance_min_glob
distance_max = distance_max_glob
- courant_stability_number_max = courant_stability_number_max_glob
+ courant_stability_number_max = courant_stability_max_glob
lambdaPmin = lambdaPmin_glob
lambdaPmax = lambdaPmax_glob
lambdaSmin = lambdaSmin_glob
@@ -1812,6 +1832,7 @@
call MPI_SEND (RGB_send, nspec, MPI_INTEGER, 0, 42, MPI_COMM_WORLD, ier)
end if
+
#endif
if ( myrank == 0 ) then
Modified: seismo/2D/SPECFEM2D/trunk/meshfem2D.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/meshfem2D.F90 2007-07-03 00:14:39 UTC (rev 8543)
+++ seismo/2D/SPECFEM2D/trunk/meshfem2D.F90 2007-12-07 23:55:08 UTC (rev 8544)
@@ -74,7 +74,7 @@
integer imaterial_number,inumelem
integer nelemabs,nelem_acoustic_surface,npgeo,nspec
- integer k,icol,ili,istepx,istepz,ix,iz,irec,i,j
+ integer ix,iz,irec,i,j
integer ixdebregion,ixfinregion,izdebregion,izfinregion
integer iregion,imaterial,nbregion,nb_materials
integer NTSTEP_BETWEEN_OUTPUT_INFO,pointsdisp,subsamp,seismotype,imagetype
@@ -83,7 +83,7 @@
integer, dimension(:), allocatable :: nrec
- logical codetop,codebottom,codeleft,coderight,output_postscript_snapshot,output_color_image,plot_lowerleft_corner_only
+ logical output_postscript_snapshot,output_color_image,plot_lowerleft_corner_only
double precision tang1,tangN,vpregion,vsregion,poisson_ratio
double precision cutsnaps,sizemax_arrows,anglerec,xmin,xmax,deltat
@@ -164,7 +164,10 @@
integer, dimension(0:4) :: metis_options
character(len=256) :: prname
+#if defined USE_METIS || defined USE_SCOTCH
integer :: edgecut
+#endif
+
integer :: iproc
@@ -982,7 +985,6 @@
call merge_abs_boundaries(nelemabs, nelemabs_merge, abs_surface, abs_surface_char, abs_surface_merge, &
ibegin_bottom,iend_bottom,ibegin_top,iend_top, &
jbegin_left,jend_left,jbegin_right,jend_right, &
- nodes_coords, &
nedges_coupled, edges_coupled, nb_materials, cs, num_material, &
nelmnts, &
elmnts, ngnod)
@@ -1068,12 +1070,12 @@
end if
call Write_surface_database(15, nelem_acoustic_surface, acoustic_surface, nelem_acoustic_surface_loc, &
- nproc, iproc, glob2loc_elmnts, &
+ iproc, glob2loc_elmnts, &
glob2loc_nodes_nparts, glob2loc_nodes_parts, glob2loc_nodes, part, 1)
call write_fluidsolid_edges_database(15, nedges_coupled, nedges_coupled_loc, &
- edges_coupled, glob2loc_elmnts, nelmnts, part, iproc, 1)
+ edges_coupled, glob2loc_elmnts, part, iproc, 1)
write(15,*) 'nelemabs nelem_acoustic_surface num_fluid_solid_edges'
write(15,*) nelemabs_loc,nelem_acoustic_surface_loc,nedges_coupled_loc
@@ -1120,13 +1122,13 @@
write(15,*) 'List of acoustic free-surface elements:'
call Write_surface_database(15, nelem_acoustic_surface, acoustic_surface, nelem_acoustic_surface_loc, &
- nproc, iproc, glob2loc_elmnts, &
+ iproc, glob2loc_elmnts, &
glob2loc_nodes_nparts, glob2loc_nodes_parts, glob2loc_nodes, part, 2)
write(15,*) 'List of acoustic elastic coupled edges:'
call write_fluidsolid_edges_database(15, nedges_coupled, nedges_coupled_loc, &
- edges_coupled, glob2loc_elmnts, nelmnts, part, iproc, 2)
+ edges_coupled, glob2loc_elmnts, part, iproc, 2)
end do
Modified: seismo/2D/SPECFEM2D/trunk/part_unstruct.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/part_unstruct.F90 2007-07-03 00:14:39 UTC (rev 8543)
+++ seismo/2D/SPECFEM2D/trunk/part_unstruct.F90 2007-12-07 23:55:08 UTC (rev 8544)
@@ -766,13 +766,12 @@
! Write a surface (elements and nodes on the surface) pertaining to iproc partition in the corresponding Database
!--------------------------------------------------
subroutine Write_surface_database(IIN_database, nsurface, surface, &
- nsurface_loc, nparts, iproc, glob2loc_elmnts, &
+ nsurface_loc, iproc, glob2loc_elmnts, &
glob2loc_nodes_nparts, glob2loc_nodes_parts, glob2loc_nodes, part, num_phase)
integer, intent(in) :: IIN_database
integer, intent(in) :: iproc
- integer, intent(in) :: nparts
integer :: nsurface
integer :: nsurface_loc
integer, dimension(:,:), pointer :: surface
@@ -788,11 +787,10 @@
integer :: local_elmnt
integer :: num_phase
- integer :: i, j, k, l
- integer :: num_surface
+ integer :: i, l
+
-
if ( num_phase == 1 ) then
nsurface_loc = 0
@@ -861,7 +859,6 @@
subroutine merge_abs_boundaries(nelemabs, nelemabs_merge, abs_surface, abs_surface_char, abs_surface_merge, &
ibegin_bottom,iend_bottom,ibegin_top,iend_top, &
jbegin_left,jend_left,jbegin_right,jend_right, &
- nodes_coords, &
nedges_coupled, edges_coupled, nb_materials, cs_material, num_material, &
nelmnts, &
elmnts, ngnod)
@@ -879,7 +876,6 @@
integer, intent(in) :: ngnod
integer, dimension(:), pointer :: ibegin_bottom,iend_bottom,ibegin_top,iend_top, &
jbegin_left,jend_left,jbegin_right,jend_right
- double precision, dimension(:,:), pointer :: nodes_coords
integer :: nedges_coupled
integer, dimension(:,:), pointer :: edges_coupled
integer :: nb_materials
@@ -890,15 +886,10 @@
logical, dimension(nb_materials) :: is_acoustic
integer :: num_edge, nedge_bound
- integer :: num_edge_bis
integer :: match
integer :: nb_elmnts_abs
integer :: i
integer :: temp
- integer :: common_node, other_node
- integer :: modified_edge_elmnt
- integer :: modified_edge
- double precision :: vect_product
integer :: iedge, inode1, inode2
@@ -1307,9 +1298,7 @@
logical :: is_repartitioned
- integer :: aaa
-
is_acoustic(:) = .false.
do i = 1, nb_materials
if (cs_material(i) < TINYVAL) then
@@ -1379,7 +1368,7 @@
! pertaining to iproc partition in the corresponding Database
!--------------------------------------------------
subroutine write_fluidsolid_edges_database(IIN_database, nedges_coupled, nedges_coupled_loc, &
- edges_coupled, glob2loc_elmnts, nelmnts,part, iproc, num_phase)
+ edges_coupled, glob2loc_elmnts, part, iproc, num_phase)
implicit none
@@ -1388,7 +1377,6 @@
integer, intent(inout) :: nedges_coupled_loc
integer, dimension(:,:), pointer :: edges_coupled
integer, dimension(:), pointer :: glob2loc_elmnts
- integer, intent(in) :: nelmnts
integer, dimension(:), pointer :: part
integer, intent(in) :: iproc
integer, intent(in) :: num_phase
More information about the cig-commits
mailing list