[cig-commits] r19220 - seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Sun Nov 20 17:40:17 PST 2011
Author: dkomati1
Date: 2011-11-20 17:40:16 -0800 (Sun, 20 Nov 2011)
New Revision: 19220
Modified:
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/create_regions_mesh.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_MPI_cutplanes_eta.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_MPI_cutplanes_xi.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/meshfem3D.f90
Log:
fixed a bug in the calculation of NGLOB2DMAX for the header files for the C and StarSs versions of the code
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/create_regions_mesh.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/create_regions_mesh.f90 2011-11-20 00:12:05 UTC (rev 19219)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/create_regions_mesh.f90 2011-11-21 01:40:16 UTC (rev 19220)
@@ -30,7 +30,7 @@
iproc_xi,iproc_eta,ichunk,nspec,nspec_tiso, &
volume_local,area_local_bottom,area_local_top, &
nglob_theor,npointot, &
- NSTEP,DT,NGLOB2DMAX_XMIN_XMAX,NGLOB2DMAX_YMIN_YMAX, &
+ NSTEP,DT, &
NEX_XI,NEX_PER_PROC_XI,NEX_PER_PROC_ETA, &
NSPEC2DMAX_XMIN_XMAX,NSPEC2DMAX_YMIN_YMAX, &
NSPEC2D_BOTTOM,NSPEC2D_TOP, &
@@ -245,8 +245,8 @@
! Adding new variables
integer :: NSTEP
+ integer, save :: npoin2D_xi,npoin2D_eta
double precision :: DT
- integer :: NGLOB2DMAX_XMIN_XMAX, NGLOB2DMAX_YMIN_YMAX
!///////////////////////////////////////////////////////////////////////////////
@@ -719,11 +719,11 @@
! arrays locval(npointot) and ifseg(npointot) used to save memory
call get_MPI_cutplanes_xi(myrank,prname,nspec,iMPIcut_xi,ibool, &
xstore,ystore,zstore,ifseg,npointot, &
- NSPEC2D_ETA_FACE,iregion_code)
+ NSPEC2D_ETA_FACE,iregion_code,npoin2D_xi)
call get_MPI_cutplanes_eta(myrank,prname,nspec,iMPIcut_eta,ibool, &
xstore,ystore,zstore,ifseg,npointot, &
- NSPEC2D_XI_FACE,iregion_code)
+ NSPEC2D_XI_FACE,iregion_code,npoin2D_eta)
call get_MPI_1D_buffers(myrank,prname,nspec,iMPIcut_xi,iMPIcut_eta,ibool,idoubling, &
xstore,ystore,zstore,ifseg,npointot, &
@@ -897,9 +897,9 @@
write(99,*) 'integer, parameter :: NSTEP = 1000 !!!!!!!!!!! ',nstep
write(99,*) 'real(kind=4), parameter :: deltat = ',DT
write(99,*)
- write(99,*) 'integer, parameter :: NGLOB2DMAX_XMIN_XMAX = ',NGLOB2DMAX_XMIN_XMAX
- write(99,*) 'integer, parameter :: NGLOB2DMAX_YMIN_YMAX = ',NGLOB2DMAX_YMIN_YMAX
- write(99,*) 'integer, parameter :: NGLOB2DMAX_ALL = ',max(NGLOB2DMAX_XMIN_XMAX, NGLOB2DMAX_YMIN_YMAX)
+ write(99,*) 'integer, parameter :: NGLOB2DMAX_XMIN_XMAX = ',npoin2D_xi
+ write(99,*) 'integer, parameter :: NGLOB2DMAX_YMIN_YMAX = ',npoin2D_eta
+ write(99,*) 'integer, parameter :: NGLOB2DMAX_ALL = ',max(npoin2D_xi,npoin2D_eta)
write(99,*) 'integer, parameter :: NPROC_XI = ',NPROC_XI
write(99,*) 'integer, parameter :: NPROC_ETA = ',NPROC_ETA
write(99,*)
@@ -933,9 +933,9 @@
write(99,*) '#define NSTEP 1000'
! put an "f" at the end to force single precision
write(99,"('#define deltat ',e18.10,'f')") DT
- write(99,*) '#define NGLOB2DMAX_XMIN_XMAX ',NGLOB2DMAX_XMIN_XMAX
- write(99,*) '#define NGLOB2DMAX_YMIN_YMAX ',NGLOB2DMAX_YMIN_YMAX
- write(99,*) '#define NGLOB2DMAX_ALL ',max(NGLOB2DMAX_XMIN_XMAX, NGLOB2DMAX_YMIN_YMAX)
+ write(99,*) '#define NGLOB2DMAX_XMIN_XMAX ',npoin2D_xi
+ write(99,*) '#define NGLOB2DMAX_YMIN_YMAX ',npoin2D_eta
+ write(99,*) '#define NGLOB2DMAX_ALL ',max(npoin2D_xi,npoin2D_eta)
write(99,*) '#define NPROC_XI ',NPROC_XI
write(99,*) '#define NPROC_ETA ',NPROC_ETA
write(99,*)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_MPI_cutplanes_eta.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_MPI_cutplanes_eta.f90 2011-11-20 00:12:05 UTC (rev 19219)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_MPI_cutplanes_eta.f90 2011-11-21 01:40:16 UTC (rev 19220)
@@ -27,7 +27,7 @@
subroutine get_MPI_cutplanes_eta(myrank,prname,nspec,iMPIcut_eta,ibool, &
xstore,ystore,zstore,mask_ibool,npointot, &
- NSPEC2D_XI_FACE,iregion)
+ NSPEC2D_XI_FACE,iregion,npoin2D_eta)
! this routine detects cut planes along eta
! In principle the left cut plane of the first slice
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_MPI_cutplanes_xi.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_MPI_cutplanes_xi.f90 2011-11-20 00:12:05 UTC (rev 19219)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_MPI_cutplanes_xi.f90 2011-11-21 01:40:16 UTC (rev 19220)
@@ -27,7 +27,7 @@
subroutine get_MPI_cutplanes_xi(myrank,prname,nspec,iMPIcut_xi,ibool, &
xstore,ystore,zstore,mask_ibool,npointot, &
- NSPEC2D_ETA_FACE,iregion)
+ NSPEC2D_ETA_FACE,iregion,npoin2D_xi)
! this routine detects cut planes along xi
! In principle the left cut plane of the first slice
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/meshfem3D.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/meshfem3D.f90 2011-11-20 00:12:05 UTC (rev 19219)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/meshfem3D.f90 2011-11-21 01:40:16 UTC (rev 19220)
@@ -663,7 +663,7 @@
iproc_xi,iproc_eta,ichunk,NSPEC(iregion_code),nspec_tiso, &
volume_local,area_local_bottom,area_local_top, &
nglob(iregion_code),npointot, &
- NSTEP,DT,NGLOB2DMAX_XMIN_XMAX(iregion_code),NGLOB2DMAX_YMIN_YMAX(iregion_code), &
+ NSTEP,DT, &
NEX_XI,NEX_PER_PROC_XI,NEX_PER_PROC_ETA, &
NSPEC2DMAX_XMIN_XMAX(iregion_code),NSPEC2DMAX_YMIN_YMAX(iregion_code), &
NSPEC2D_BOTTOM(iregion_code),NSPEC2D_TOP(iregion_code), &
More information about the CIG-COMMITS
mailing list