[cig-commits] r22995 - in seismo/3D/SPECFEM3D_GLOBE/trunk: src/cuda src/meshfem3D src/shared src/specfem3D utils/Visualization/Gnuplot
danielpeter at geodynamics.org
danielpeter at geodynamics.org
Tue Feb 11 00:47:18 PST 2014
Author: danielpeter
Date: 2014-02-11 00:47:17 -0800 (Tue, 11 Feb 2014)
New Revision: 22995
Modified:
seismo/3D/SPECFEM3D_GLOBE/trunk/src/cuda/compute_forces_crust_mantle_cuda.cu
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/initialize_layers.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/gll_library.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/define_derivation_matrices.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/read_mesh_databases_adios.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/utils/Visualization/Gnuplot/draw_regular_2D_GLL_element_gnuplot.f90
Log:
moves middle abscissa check to routine zwgljd()
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/cuda/compute_forces_crust_mantle_cuda.cu
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/cuda/compute_forces_crust_mantle_cuda.cu 2014-01-24 16:03:04 UTC (rev 22994)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/cuda/compute_forces_crust_mantle_cuda.cu 2014-02-11 08:47:17 UTC (rev 22995)
@@ -786,7 +786,7 @@
/* ----------------------------------------------------------------------------------------------- */
-// loads displacement into shared memory for element
+// loads hprime into shared memory for element
__device__ void load_shared_memory_hprime(const int* tx,
realw_const_p d_hprime_xx,
@@ -806,7 +806,7 @@
/* ----------------------------------------------------------------------------------------------- */
-// loads displacement into shared memory for element
+// loads hprimewgll into shared memory for element
__device__ void load_shared_memory_hprimewgll(const int* tx,
realw_const_p d_hprimewgll_xx,
@@ -1192,8 +1192,8 @@
// jacobian
jacobianl = 1.0f / (xixl*(etayl*gammazl-etazl*gammayl)
- - xiyl*(etaxl*gammazl-etazl*gammaxl)
- + xizl*(etaxl*gammayl-etayl*gammaxl));
+ - xiyl*(etaxl*gammazl-etazl*gammaxl)
+ + xizl*(etaxl*gammayl-etayl*gammaxl));
if( GRAVITY ){
// computes non-symmetric terms for gravity
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/initialize_layers.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/initialize_layers.f90 2014-01-24 16:03:04 UTC (rev 22994)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/initialize_layers.f90 2014-02-11 08:47:17 UTC (rev 22995)
@@ -88,11 +88,6 @@
call zwgljd(yigll,wygll,NGLLY,GAUSSALPHA,GAUSSBETA)
call zwgljd(zigll,wzgll,NGLLZ,GAUSSALPHA,GAUSSBETA)
-! if number of points is odd, the middle abscissa is exactly zero
- if(mod(NGLLX,2) /= 0) xigll((NGLLX-1)/2+1) = ZERO
- if(mod(NGLLY,2) /= 0) yigll((NGLLY-1)/2+1) = ZERO
- if(mod(NGLLZ,2) /= 0) zigll((NGLLZ-1)/2+1) = ZERO
-
! get the 3-D shape functions
call get_shape3D(myrank,shape3D,dershape3D,xigll,yigll,zigll)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/gll_library.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/gll_library.f90 2014-01-24 16:03:04 UTC (rev 22994)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/gll_library.f90 2014-02-11 08:47:17 UTC (rev 22995)
@@ -539,9 +539,14 @@
call zwgjd(z(2),w(2),nm1,alpg,betg)
endif
+! start and end point at exactly -1 and 1
z(1) = - one
z(np) = one
+! if number of points is odd, the middle abscissa is exactly zero
+ if(mod(np,2) /= 0) z((np-1)/2+1) = zero
+
+! weights
do i=2,np-1
w(i) = w(i)/(one-z(i)**2)
enddo
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/define_derivation_matrices.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/define_derivation_matrices.f90 2014-01-24 16:03:04 UTC (rev 22994)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/define_derivation_matrices.f90 2014-02-11 08:47:17 UTC (rev 22995)
@@ -62,11 +62,6 @@
call zwgljd(yigll,wygll,NGLLY,GAUSSALPHA,GAUSSBETA)
call zwgljd(zigll,wzgll,NGLLZ,GAUSSALPHA,GAUSSBETA)
-! if number of points is odd, the middle abscissa is exactly ZERO
- if(mod(NGLLX,2) /= 0) xigll((NGLLX-1)/2+1) = ZERO
- if(mod(NGLLY,2) /= 0) yigll((NGLLY-1)/2+1) = ZERO
- if(mod(NGLLZ,2) /= 0) zigll((NGLLZ-1)/2+1) = ZERO
-
! distinguish between single and double precision for reals
if(CUSTOM_REAL == SIZE_REAL) then
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/read_mesh_databases_adios.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/read_mesh_databases_adios.f90 2014-01-24 16:03:04 UTC (rev 22994)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/read_mesh_databases_adios.f90 2014-02-11 08:47:17 UTC (rev 22995)
@@ -87,15 +87,6 @@
call adios_perform_reads(adios_handle, adios_err)
call check_adios_err(myrank,adios_err)
- ! daniel debug
- !call synchronize_all()
- !print*,myrank,'crust mantle'
- !print*,myrank,'nspec2d xmin:',nspec2d_xmin_crust_mantle
- !print*,myrank,'nspec2d xmax:',nspec2d_xmax_crust_mantle
- !print*,myrank,'nspec2d ymin:',nspec2d_ymin_crust_mantle
- !print*,myrank,'nspec2d ymax:',nspec2d_ymax_crust_mantle
- !call synchronize_all()
-
! boundary elements
local_dim = NSPEC2DMAX_XMIN_XMAX_CM
@@ -268,15 +259,6 @@
call adios_perform_reads(adios_handle, adios_err)
call check_adios_err(myrank,adios_err)
- ! daniel debug
- !call synchronize_all()
- !print*,myrank,'outer core'
- !print*,myrank,'nspec2d xmin:',nspec2d_xmin_outer_core
- !print*,myrank,'nspec2d xmax:',nspec2d_xmax_outer_core
- !print*,myrank,'nspec2d ymin:',nspec2d_ymin_outer_core
- !print*,myrank,'nspec2d ymax:',nspec2d_ymax_outer_core
- !call synchronize_all()
-
! boundary elements
local_dim = NSPEC2DMAX_XMIN_XMAX_OC
@@ -452,15 +434,6 @@
call adios_perform_reads(adios_handle, adios_err)
call check_adios_err(myrank,adios_err)
- ! daniel debug
- !call synchronize_all()
- !print*,myrank,'inner core'
- !print*,myrank,'nspec2d xmin:',nspec2d_xmin_inner_core
- !print*,myrank,'nspec2d xmax:',nspec2d_xmax_inner_core
- !print*,myrank,'nspec2d ymin:',nspec2d_ymin_inner_core
- !print*,myrank,'nspec2d ymax:',nspec2d_ymax_inner_core
- !call synchronize_all()
-
! boundary elements
local_dim = NSPEC2DMAX_XMIN_XMAX_IC
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/utils/Visualization/Gnuplot/draw_regular_2D_GLL_element_gnuplot.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/utils/Visualization/Gnuplot/draw_regular_2D_GLL_element_gnuplot.f90 2014-01-24 16:03:04 UTC (rev 22994)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/utils/Visualization/Gnuplot/draw_regular_2D_GLL_element_gnuplot.f90 2014-02-11 08:47:17 UTC (rev 22995)
@@ -634,9 +634,14 @@
call zwgjd(z(2),w(2),nm1,alpg,betg)
endif
+! start and end point at exactly -1 and 1
z(1) = - one
z(np) = one
+! if number of points is odd, the middle abscissa is exactly zero
+ if(mod(np,2) /= 0) z((np-1)/2+1) = zero
+
+! weights
do i=2,np-1
w(i) = w(i)/(one-z(i)**2)
enddo
More information about the CIG-COMMITS
mailing list