[cig-commits] r11834 - seismo/3D/SPECFEM3D_GLOBE/trunk
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Sun Apr 20 05:05:19 PDT 2008
Author: dkomati1
Date: 2008-04-20 05:05:18 -0700 (Sun, 20 Apr 2008)
New Revision: 11834
Modified:
seismo/3D/SPECFEM3D_GLOBE/trunk/combine_paraview_strain_data.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/get_perm_cuthill_mckee.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/sea99_s_model.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/specfem3D.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/write_movie_volume.f90
Log:
- suppressed write statements in get_perm_cuthill_mckee
- changed .ne. to /= everywhere
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/combine_paraview_strain_data.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/combine_paraview_strain_data.f90 2008-04-19 17:29:21 UTC (rev 11833)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/combine_paraview_strain_data.f90 2008-04-20 12:05:18 UTC (rev 11834)
@@ -135,7 +135,7 @@
endif
close(27)
- if( (comp .ne. 'SI1') .and. (comp .ne. 'SI2')) then
+ if( (comp /= 'SI1') .and. (comp /= 'SI2')) then
!comp == 'SEE' .or. comp == 'SNN' .or. comp == 'SZZ' .or. comp == 'SEZ' .or. comp == 'SNZ' .or. comp == 'SNE') then
write(local_data_file,'(a,a,i6.6,a)') 'movie3D_',comp,it,'.bin'
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/get_perm_cuthill_mckee.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/get_perm_cuthill_mckee.f90 2008-04-19 17:29:21 UTC (rev 11833)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/get_perm_cuthill_mckee.f90 2008-04-20 12:05:18 UTC (rev 11834)
@@ -80,7 +80,6 @@
nglob_GLL_full = nglob
!---- call Charbel Farhat's routines
- write(IMAIN,*) 'form_elt_connectivity_foelco'
call form_elt_connectivity_foelco(mn,mp,nspec,global_corner_number,nglob_GLL_full,ibool,nglob_eight_corners_only)
do i=1,nspec
istart = mp(i)
@@ -90,13 +89,11 @@
allocate(np(nglob_eight_corners_only+1))
count_only = .true.
total_size_ne = 1
- write(IMAIN,*) 'form_node_connectivity_fonoco 1'
allocate(ne(total_size_ne))
call form_node_connectivity_fonoco(mn,mp,ne,np,nglob_eight_corners_only,nspec,count_only,total_size_ne)
deallocate(ne)
allocate(ne(total_size_ne))
count_only = .false.
- write(IMAIN,*) 'form_node_connectivity_fonoco 2'
call form_node_connectivity_fonoco(mn,mp,ne,np,nglob_eight_corners_only,nspec,count_only,total_size_ne)
do i=1,nglob_eight_corners_only
istart = np(i)
@@ -105,14 +102,12 @@
count_only = .true.
total_size_adj = 1
- write(IMAIN,*) 'create_adjacency_table_adjncy 1'
allocate(adj(total_size_adj))
call create_adjacency_table_adjncy(mn,mp,ne,np,adj,xadj,maskel,nspec,nglob_eight_corners_only,&
count_only,total_size_ne,total_size_adj,FACE)
deallocate(adj)
allocate(adj(total_size_adj))
count_only = .false.
- write(IMAIN,*) 'create_adjacency_table_adjncy 2'
call create_adjacency_table_adjncy(mn,mp,ne,np,adj,xadj,maskel,nspec,nglob_eight_corners_only,&
count_only,total_size_ne,total_size_adj,FACE)
do i=1,nspec
@@ -124,10 +119,8 @@
deallocate(ne,np)
! call the Cuthill-McKee sorting algorithm
- write(IMAIN,*) 'launch cuthill_mckee'
call cuthill_mckee(adj,xadj,perm,invperm,nspec,total_size_adj,limit,INVERSE)
deallocate(adj)
- write(IMAIN,*) 'permutation achieved'
else
! create identity permutation in order to do nothing
do i=1,nspec
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/sea99_s_model.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/sea99_s_model.f90 2008-04-19 17:29:21 UTC (rev 11833)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/sea99_s_model.f90 2008-04-20 12:05:18 UTC (rev 11834)
@@ -68,10 +68,10 @@
read(1,*) SEA99M_V%alatmin, SEA99M_V%alatmax
read(1,*) SEA99M_V%alonmin, SEA99M_V%alonmax
read(1,*) SEA99M_V%sea99_ddeg,SEA99M_V%sea99_nlat,SEA99M_V%sea99_nlon
- if (SEA99M_V%sea99_nlat .ne. nint((SEA99M_V%alatmax-SEA99M_V%alatmin)/SEA99M_V%sea99_ddeg)+1) then
+ if (SEA99M_V%sea99_nlat /= nint((SEA99M_V%alatmax-SEA99M_V%alatmin)/SEA99M_V%sea99_ddeg)+1) then
stop 'alatmin,alatmax,sea99_nlat'
endif
- if (SEA99M_V%sea99_nlon .ne. nint((SEA99M_V%alonmax-SEA99M_V%alonmin)/SEA99M_V%sea99_ddeg)+1) then
+ if (SEA99M_V%sea99_nlon /= nint((SEA99M_V%alonmax-SEA99M_V%alonmin)/SEA99M_V%sea99_ddeg)+1) then
stop 'alonmin,alonmax,sea99_nlon'
endif
read(1,*)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/specfem3D.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/specfem3D.f90 2008-04-19 17:29:21 UTC (rev 11833)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/specfem3D.f90 2008-04-20 12:05:18 UTC (rev 11834)
@@ -2556,7 +2556,7 @@
if(MOVIE_SURFACE) then
if(MOVIE_COARSE) then !only output corners
nmovie_points = 2 * 2 * NSPEC2D_TOP(IREGION_CRUST_MANTLE)
- if(NGLLX .ne. NGLLY) call MPI_exit(myrank,'MOVIE_COARSE together with MOVIE_SURFACE requires NGLLX=NGLLY')
+ if(NGLLX /= NGLLY) call MPI_exit(myrank,'MOVIE_COARSE together with MOVIE_SURFACE requires NGLLX=NGLLY')
NIT = NGLLX - 1
else
nmovie_points = NGLLX * NGLLY * NSPEC2D_TOP(IREGION_CRUST_MANTLE)
@@ -2580,8 +2580,8 @@
if(MOVIE_VOLUME) then
! the following has to be true for the the array dimensions of eps to match with those of xstore etc..
! note that epsilondev and eps_trace_over_3 don't have the same dimensions.. could cause trouble
- if (NSPEC_CRUST_MANTLE_STR_OR_ATT .ne. NSPEC_CRUST_MANTLE) stop 'NSPEC_CRUST_MANTLE_STRAINS_ATT .ne. NSPEC_CRUST_MANTLE'
- if (NSPEC_CRUST_MANTLE_STRAIN_ONLY .ne. NSPEC_CRUST_MANTLE) stop 'NSPEC_CRUST_MANTLE_STRAIN_ONLY .ne. NSPEC_CRUST_MANTLE'
+ if (NSPEC_CRUST_MANTLE_STR_OR_ATT /= NSPEC_CRUST_MANTLE) stop 'NSPEC_CRUST_MANTLE_STRAINS_ATT /= NSPEC_CRUST_MANTLE'
+ if (NSPEC_CRUST_MANTLE_STRAIN_ONLY /= NSPEC_CRUST_MANTLE) stop 'NSPEC_CRUST_MANTLE_STRAIN_ONLY /= NSPEC_CRUST_MANTLE'
write(prname,'(a,i6.6,a)') trim(LOCAL_PATH)//'/'//'proc',myrank,'_'
call count_points_movie_volume(prname,ibool_crust_mantle, xstore_crust_mantle,ystore_crust_mantle, &
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/write_movie_volume.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/write_movie_volume.f90 2008-04-19 17:29:21 UTC (rev 11833)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/write_movie_volume.f90 2008-04-20 12:05:18 UTC (rev 11834)
@@ -142,7 +142,7 @@
real(kind=CUSTOM_REAL) :: rval,thetaval,phival,xval,yval,zval,st,ct,sp,cp
real(kind=CUSTOM_REAL), dimension(npoints_3dmovie) :: store_val3D_x,store_val3D_y, store_val3D_z
- if(NDIM .ne. 3) stop 'movie volume output requires NDIM = 3'
+ if(NDIM /= 3) stop 'movie volume output requires NDIM = 3'
if(MOVIE_COARSE) then
NIT = NGLLX-1
@@ -291,7 +291,7 @@
allocate(store_val3d_NZ(npoints_3dmovie))
allocate(store_val3d_EZ(npoints_3dmovie))
- if(NDIM .ne. 3) call exit_MPI(myrank, 'write_movie_volume requires NDIM = 3')
+ if(NDIM /= 3) call exit_MPI(myrank, 'write_movie_volume requires NDIM = 3')
if(MOVIE_VOLUME_TYPE == 1) then
movie_prefix='E' ! strain
@@ -399,7 +399,7 @@
character(len=150) outputname
character(len=2) movie_prefix
-if(NDIM .ne. 3) call exit_MPI(myrank,'write_movie_volume requires NDIM = 3')
+if(NDIM /= 3) call exit_MPI(myrank,'write_movie_volume requires NDIM = 3')
allocate(store_val3d_N(npoints_3dmovie))
allocate(store_val3d_E(npoints_3dmovie))
More information about the cig-commits
mailing list