[cig-commits] r19296 - in seismo/3D/SPECFEM3D/trunk/src: decompose_mesh_SCOTCH generate_databases shared specfem3D
cmorency at geodynamics.org
cmorency at geodynamics.org
Thu Dec 15 14:08:12 PST 2011
Author: cmorency
Date: 2011-12-15 14:08:11 -0800 (Thu, 15 Dec 2011)
New Revision: 19296
Modified:
seismo/3D/SPECFEM3D/trunk/src/decompose_mesh_SCOTCH/decompose_mesh_SCOTCH.f90
seismo/3D/SPECFEM3D/trunk/src/decompose_mesh_SCOTCH/part_decompose_mesh_SCOTCH.f90
seismo/3D/SPECFEM3D/trunk/src/generate_databases/get_coupling_surfaces.f90
seismo/3D/SPECFEM3D/trunk/src/shared/check_mesh_resolution.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_coupling_elastic_po.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_coupling_poroelastic_el.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_elastic.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_poroelastic.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_solid.f90
Log:
Corrected some warnings during compilation.
Modified: seismo/3D/SPECFEM3D/trunk/src/decompose_mesh_SCOTCH/decompose_mesh_SCOTCH.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/decompose_mesh_SCOTCH/decompose_mesh_SCOTCH.f90 2011-12-14 01:15:05 UTC (rev 19295)
+++ seismo/3D/SPECFEM3D/trunk/src/decompose_mesh_SCOTCH/decompose_mesh_SCOTCH.f90 2011-12-15 22:08:11 UTC (rev 19296)
@@ -793,7 +793,7 @@
! re-partitioning puts poroelastic-elastic coupled elements into same partition
! integer :: nfaces_coupled
! integer, dimension(:,:), pointer :: faces_coupled
- call poroelastic_elastic_repartitioning (nspec, nnodes, elmnts, &
+ call poro_elastic_repartitioning (nspec, nnodes, elmnts, &
count_def_mat, mat(1,:) , mat_prop, &
sup_neighbour, nsize, &
nparts, part)
Modified: seismo/3D/SPECFEM3D/trunk/src/decompose_mesh_SCOTCH/part_decompose_mesh_SCOTCH.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/decompose_mesh_SCOTCH/part_decompose_mesh_SCOTCH.f90 2011-12-14 01:15:05 UTC (rev 19295)
+++ seismo/3D/SPECFEM3D/trunk/src/decompose_mesh_SCOTCH/part_decompose_mesh_SCOTCH.f90 2011-12-15 22:08:11 UTC (rev 19296)
@@ -1375,7 +1375,7 @@
! Repartitioning : two coupled poroelastic/elastic elements are transfered to the same partition
!--------------------------------------------------
- subroutine poroelastic_elastic_repartitioning (nelmnts, nnodes, elmnts, &
+ subroutine poro_elastic_repartitioning (nelmnts, nnodes, elmnts, &
nb_materials, num_material, mat_prop, &
sup_neighbour, nsize, &
nproc, part)
@@ -1486,7 +1486,7 @@
endif
enddo
- end subroutine poroelastic_elastic_repartitioning
+ end subroutine poro_elastic_repartitioning
!--------------------------------------------------
! Repartitioning : two coupled moho surface elements are transfered to the same partition
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/get_coupling_surfaces.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/get_coupling_surfaces.f90 2011-12-14 01:15:05 UTC (rev 19295)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/get_coupling_surfaces.f90 2011-12-15 22:08:11 UTC (rev 19296)
@@ -416,9 +416,9 @@
integer,dimension(:,:,:),allocatable :: tmp_ijk
integer,dimension(:),allocatable :: tmp_ispec
- integer,dimension(NGNOD2D) :: iglob_corners_ref !,iglob_corners
+ integer,dimension(NGNOD2D) :: iglob_corners_ref
integer :: ispec,i,j,k,igll,ier,iglob
- integer :: inum,iface_ref,icorner,iglob_midpoint ! iface,ispec_neighbor
+ integer :: inum,iface_ref,icorner
integer :: count_poroelastic,count_acoustic
! mpi interface communication
@@ -680,7 +680,7 @@
integer,dimension(NGNOD2D) :: iglob_corners_ref,iglob_corners_ref_el
integer :: ispec,i,j,k,igll,ier,iglob,ispec_el,ispec_ref_el
- integer :: inum,iface_ref,iface_ref_el,iface_el,icorner,iglob_midpoint ! iface,ispec_neighbor
+ integer :: inum,iface_ref,iface_ref_el,iface_el,icorner
integer :: count_poroelastic,count_elastic
! mpi interface communication
Modified: seismo/3D/SPECFEM3D/trunk/src/shared/check_mesh_resolution.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/shared/check_mesh_resolution.f90 2011-12-14 01:15:05 UTC (rev 19295)
+++ seismo/3D/SPECFEM3D/trunk/src/shared/check_mesh_resolution.f90 2011-12-15 22:08:11 UTC (rev 19296)
@@ -400,7 +400,7 @@
! determines minimum/maximum velocities within this element
call get_vpvs_minmax_poro(vpmin,vpmax,vp2min,vp2max,vsmin,vsmax,ispec,has_vs_zero, &
- has_vp2_zero,NSPEC_AB,kappastore,mustore, &
+ has_vp2_zero,NSPEC_AB,&
phistore,tortstore,rhoarraystore,rho_vpI,rho_vpII,rho_vsI)
! min/max for whole cpu partition
@@ -697,7 +697,7 @@
subroutine get_vpvs_minmax_poro(vpmin,vpmax,vp2min,vp2max,vsmin,vsmax,ispec,has_vs_zero, &
- has_vp2_zero,NSPEC_AB,kappastore,mustore, &
+ has_vp2_zero,NSPEC_AB, &
phistore,tortstore,rhoarraystore,rho_vpI,rho_vpII,rho_vsI)
! calculates the min/max size of the specified element (ispec) for poroelastic domains
@@ -714,8 +714,6 @@
logical :: has_vp2_zero
integer :: NSPEC_AB
- real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_AB) :: &
- kappastore,mustore
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_AB) :: rho_vpI,rho_vpII,rho_vsI
real(kind=CUSTOM_REAL), dimension(2,NGLLX,NGLLY,NGLLZ,NSPEC_AB) :: rhoarraystore
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_AB) :: phistore,tortstore
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_coupling_elastic_po.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_coupling_elastic_po.f90 2011-12-14 01:15:05 UTC (rev 19295)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_coupling_elastic_po.f90 2011-12-15 22:08:11 UTC (rev 19296)
@@ -26,10 +26,10 @@
! for elastic solver
subroutine compute_coupling_elastic_po(NSPEC_AB,NGLOB_AB,ibool,&
- displs_poroelastic,accels_poroelastic,displw_poroelastic,&
+ displs_poroelastic,displw_poroelastic,&
xix,xiy,xiz,etax,etay,etaz,gammax,gammay,gammaz, &
hprime_xx,hprime_yy,hprime_zz,&
- kappaarraystore,rhoarraystore,mustore,etastore,permstore, &
+ kappaarraystore,rhoarraystore,mustore, &
phistore,tortstore,jacobian,&
displ,accel,kappastore, &
ANISOTROPY,NSPEC_ANISO, &
@@ -53,7 +53,7 @@
integer :: NSPEC_AB,NGLOB_AB
! displacements, etc
- real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB_AB) :: displs_poroelastic,accels_poroelastic,&
+ real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB_AB) :: displs_poroelastic,&
displw_poroelastic
real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB_AB) :: displ,accel
@@ -76,10 +76,9 @@
! properties
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_AB) :: &
- etastore,phistore,tortstore,jacobian
+ phistore,tortstore,jacobian
real(kind=CUSTOM_REAL), dimension(2,NGLLX,NGLLY,NGLLZ,NSPEC_AB) :: rhoarraystore
real(kind=CUSTOM_REAL), dimension(3,NGLLX,NGLLY,NGLLZ,NSPEC_AB) :: kappaarraystore
- real(kind=CUSTOM_REAL), dimension(6,NGLLX,NGLLY,NGLLZ,NSPEC_AB) :: permstore
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_AB) :: &
kappastore,mustore
@@ -102,13 +101,13 @@
logical :: phase_is_inner
! local parameters
- real(kind=CUSTOM_REAL) :: sigmap,sigma_xx,sigma_yy,sigma_zz,sigma_xy,sigma_xz,sigma_yz
+ real(kind=CUSTOM_REAL) :: sigma_xx,sigma_yy,sigma_zz,sigma_xy,sigma_xz,sigma_yz
real(kind=CUSTOM_REAL) :: rhol_s,rhol_f,phil,tortl,rhol_bar
real(kind=CUSTOM_REAL) :: nx,ny,nz,jacobianw
real(kind=CUSTOM_REAL) lambdal,mul,lambdalplus2mul
real(kind=CUSTOM_REAL) kappal
real(kind=CUSTOM_REAL) :: kappal_s
- real(kind=CUSTOM_REAL) :: etal_f,kappal_f
+ real(kind=CUSTOM_REAL) :: kappal_f
real(kind=CUSTOM_REAL) :: mul_fr,kappal_fr
real(kind=CUSTOM_REAL) :: D_biot,H_biot,C_biot,M_biot
real(kind=CUSTOM_REAL) :: mul_G,lambdal_G,lambdalplus2mul_G
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_coupling_poroelastic_el.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_coupling_poroelastic_el.f90 2011-12-14 01:15:05 UTC (rev 19295)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_coupling_poroelastic_el.f90 2011-12-15 22:08:11 UTC (rev 19296)
@@ -29,9 +29,9 @@
displs_poroelastic,accels_poroelastic,displw_poroelastic,&
xix,xiy,xiz,etax,etay,etaz,gammax,gammay,gammaz, &
hprime_xx,hprime_yy,hprime_zz,&
- kappaarraystore,rhoarraystore,mustore,etastore,permstore, &
+ kappaarraystore,rhoarraystore,mustore, &
phistore,tortstore,jacobian,&
- displ,accel,kappastore, &
+ displ,kappastore, &
ANISOTROPY,NSPEC_ANISO, &
c11store,c12store,c13store,c14store,c15store,c16store,&
c22store,c23store,c24store,c25store,c26store,c33store,&
@@ -55,7 +55,7 @@
! displacements, etc
real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB_AB) :: displs_poroelastic,accels_poroelastic,&
displw_poroelastic
- real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB_AB) :: displ,accel
+ real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB_AB) :: displ
! global indexing
integer, dimension(NGLLX,NGLLY,NGLLZ,NSPEC_AB) :: ibool
@@ -76,10 +76,9 @@
! properties
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_AB) :: &
- etastore,phistore,tortstore,jacobian
+ phistore,tortstore,jacobian
real(kind=CUSTOM_REAL), dimension(2,NGLLX,NGLLY,NGLLZ,NSPEC_AB) :: rhoarraystore
real(kind=CUSTOM_REAL), dimension(3,NGLLX,NGLLY,NGLLZ,NSPEC_AB) :: kappaarraystore
- real(kind=CUSTOM_REAL), dimension(6,NGLLX,NGLLY,NGLLZ,NSPEC_AB) :: permstore
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_AB) :: &
kappastore,mustore
@@ -108,7 +107,7 @@
real(kind=CUSTOM_REAL) lambdal,mul,lambdalplus2mul
real(kind=CUSTOM_REAL) kappal
real(kind=CUSTOM_REAL) :: kappal_s
- real(kind=CUSTOM_REAL) :: etal_f,kappal_f
+ real(kind=CUSTOM_REAL) :: kappal_f
real(kind=CUSTOM_REAL) :: mul_fr,kappal_fr
real(kind=CUSTOM_REAL) :: D_biot,H_biot,C_biot,M_biot
real(kind=CUSTOM_REAL) :: mul_G,lambdal_G,lambdalplus2mul_G
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_elastic.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_elastic.f90 2011-12-14 01:15:05 UTC (rev 19295)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_elastic.f90 2011-12-15 22:08:11 UTC (rev 19296)
@@ -170,10 +170,10 @@
!print *,'entering poro counpling'
if( POROELASTIC_SIMULATION ) &
call compute_coupling_elastic_po(NSPEC_AB,NGLOB_AB,ibool,&
- displs_poroelastic,accels_poroelastic,displw_poroelastic,&
+ displs_poroelastic,displw_poroelastic,&
xix,xiy,xiz,etax,etay,etaz,gammax,gammay,gammaz, &
hprime_xx,hprime_yy,hprime_zz,&
- kappaarraystore,rhoarraystore,mustore,etastore,permstore, &
+ kappaarraystore,rhoarraystore,mustore, &
phistore,tortstore,jacobian,&
displ,accel,kappastore, &
ANISOTROPY,NSPEC_ANISO, &
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_poroelastic.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_poroelastic.f90 2011-12-14 01:15:05 UTC (rev 19295)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_poroelastic.f90 2011-12-15 22:08:11 UTC (rev 19296)
@@ -54,7 +54,7 @@
call compute_forces_solid( iphase, &
NSPEC_AB,NGLOB_AB,displs_poroelastic,accels_poroelastic,&
- velocs_poroelastic,displw_poroelastic,velocw_poroelastic,&
+ displw_poroelastic,velocw_poroelastic,&
xix,xiy,xiz,etax,etay,etaz,gammax,gammay,gammaz, &
hprime_xx,hprime_yy,hprime_zz,&
hprimewgll_xx,hprimewgll_yy,hprimewgll_zz,&
@@ -102,7 +102,7 @@
! adjoint simulations
!if( SIMULATION_TYPE == 3 ) &
! 'adjoint acoustic-poroelastic simulation not implemented yet'
-! call compute_coupling_elastic_ac(NSPEC_ADJOINT,NGLOB_ADJOINT, &
+! call ccmpute_coupling_elastic_ac(NSPEC_ADJOINT,NGLOB_ADJOINT, &
! ibool,b_accel,b_potential_dot_dot_acoustic, &
! num_coupling_ac_el_faces, &
! coupling_ac_el_ispec,coupling_ac_el_ijk, &
@@ -118,9 +118,9 @@
displs_poroelastic,accels_poroelastic,displw_poroelastic,&
xix,xiy,xiz,etax,etay,etaz,gammax,gammay,gammaz, &
hprime_xx,hprime_yy,hprime_zz,&
- kappaarraystore,rhoarraystore,mustore,etastore,permstore, &
+ kappaarraystore,rhoarraystore,mustore, &
phistore,tortstore,jacobian,&
- displ,accel,kappastore, &
+ displ,kappastore, &
ANISOTROPY,NSPEC_ANISO, &
c11store,c12store,c13store,c14store,c15store,c16store,&
c22store,c23store,c24store,c25store,c26store,c33store,&
@@ -283,7 +283,7 @@
accel,veloc,&
accels_poroelastic,velocs_poroelastic,&
accelw_poroelastic,velocw_poroelastic,&
- rmass,rmass_solid_poroelastic,rmass_fluid_poroelastic,&
+ rmass,rmass_solid_poroelastic,&
SIMULATION_TYPE,NGLOB_ADJOINT,NSPEC_ADJOINT,&
num_coupling_el_po_faces,&
coupling_el_po_ispec,coupling_el_po_ijk,&
@@ -300,7 +300,7 @@
accel,veloc,&
accels_poroelastic,velocs_poroelastic,&
accelw_poroelastic,velocw_poroelastic,&
- rmass,rmass_solid_poroelastic,rmass_fluid_poroelastic,&
+ rmass,rmass_solid_poroelastic,&
SIMULATION_TYPE,NGLOB_ADJOINT,NSPEC_ADJOINT,&
num_coupling_el_po_faces,&
coupling_el_po_ispec,coupling_el_po_ijk,&
@@ -318,7 +318,7 @@
real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB_AB),intent(inout) :: velocs_poroelastic,accels_poroelastic
real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB_AB),intent(inout) :: velocw_poroelastic,accelw_poroelastic
- real(kind=CUSTOM_REAL), dimension(NGLOB_AB),intent(in) :: rmass,rmass_solid_poroelastic,rmass_fluid_poroelastic
+ real(kind=CUSTOM_REAL), dimension(NGLOB_AB),intent(in) :: rmass,rmass_solid_poroelastic
! global indexing
integer, dimension(NGLLX,NGLLY,NGLLZ,NSPEC_AB),intent(in) :: ibool
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_solid.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_solid.f90 2011-12-14 01:15:05 UTC (rev 19295)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_solid.f90 2011-12-15 22:08:11 UTC (rev 19296)
@@ -25,7 +25,7 @@
subroutine compute_forces_solid( iphase, &
NSPEC_AB,NGLOB_AB,displs_poroelastic,accels_poroelastic,&
- velocs_poroelastic,displw_poroelastic,velocw_poroelastic,&
+ displw_poroelastic,velocw_poroelastic,&
xix,xiy,xiz,etax,etay,etaz,gammax,gammay,gammaz, &
hprime_xx,hprime_yy,hprime_zz,&
hprimewgll_xx,hprimewgll_yy,hprimewgll_zz,&
@@ -47,8 +47,7 @@
integer :: NSPEC_AB,NGLOB_AB
! displacement and acceleration
- real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB_AB) :: displs_poroelastic,accels_poroelastic,&
- velocs_poroelastic
+ real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB_AB) :: displs_poroelastic,accels_poroelastic
real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB_AB) :: displw_poroelastic,velocw_poroelastic
! arrays with mesh parameters per slice
More information about the CIG-COMMITS
mailing list