[cig-commits] r20769 - in seismo/2D/SPECFEM2D/trunk/src: meshfem2D specfem2D
xie.zhinan at geodynamics.org
xie.zhinan at geodynamics.org
Mon Sep 24 01:39:53 PDT 2012
Author: xie.zhinan
Date: 2012-09-24 01:39:52 -0700 (Mon, 24 Sep 2012)
New Revision: 20769
Modified:
seismo/2D/SPECFEM2D/trunk/src/meshfem2D/save_databases.f90
seismo/2D/SPECFEM2D/trunk/src/specfem2D/pml_init.F90
seismo/2D/SPECFEM2D/trunk/src/specfem2D/read_databases.f90
seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90
Log:
add few comment and remove now useless variable CPML_element_file in specfem2D
Modified: seismo/2D/SPECFEM2D/trunk/src/meshfem2D/save_databases.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/meshfem2D/save_databases.f90 2012-09-23 16:09:49 UTC (rev 20768)
+++ seismo/2D/SPECFEM2D/trunk/src/meshfem2D/save_databases.f90 2012-09-24 08:39:52 UTC (rev 20769)
@@ -101,7 +101,6 @@
! call write_partition_database(15, iproc, nspec, num_material, ngnod, 1)
call write_partition_database(15, iproc, nspec, num_material, region_pml_external_mesh, ngnod, 1)
-
write(15,*) 'npgeo nproc'
write(15,*) npgeo,nproc
@@ -123,12 +122,6 @@
write(15,*) 'read_external_mesh'
write(15,*) read_external_mesh
- if(read_external_mesh) then
- write(15,*) 'CPML_element_file'
-! write(15,"(a256)") trim(CPML_element_file)
- write(15,*) trim(CPML_element_file)
- endif
-
write(15,*) 'NELEM_PML_THICKNESS'
write(15,*) NELEM_PML_THICKNESS
Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/pml_init.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/pml_init.F90 2012-09-23 16:09:49 UTC (rev 20768)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/pml_init.F90 2012-09-24 08:39:52 UTC (rev 20769)
@@ -170,7 +170,6 @@
endif
-!!!!!!when read_external_mesh read the element in PML
if(read_external_mesh)then
is_PML(:) = .false.
which_PML_elem(:,:) = .false.
@@ -188,46 +187,55 @@
do ispec=1,nspec
if(is_PML(ispec))then
if(region_CPML(ispec)==1)then
+!element is in the left cpml layer
which_PML_elem(ILEFT,ispec) = .true.
which_PML_elem(IRIGHT,ispec) = .false.
which_PML_elem(ITOP,ispec) = .false.
which_PML_elem(IBOTTOM,ispec) = .false.
else if(region_CPML(ispec)==2)then
+!element is in the right cpml layer
which_PML_elem(ILEFT,ispec) = .false.
which_PML_elem(IRIGHT,ispec) = .true.
which_PML_elem(ITOP,ispec) = .false.
which_PML_elem(IBOTTOM,ispec) = .false.
else if(region_CPML(ispec)==4)then
+!element is in the top cpml layer
which_PML_elem(ILEFT,ispec) = .false.
which_PML_elem(IRIGHT,ispec) = .false.
which_PML_elem(ITOP,ispec) = .true.
which_PML_elem(IBOTTOM,ispec) = .false.
else if(region_CPML(ispec)==5)then
+!element is in the left-top cpml corner
which_PML_elem(ILEFT,ispec) = .true.
which_PML_elem(IRIGHT,ispec) = .false.
which_PML_elem(ITOP,ispec) = .true.
which_PML_elem(IBOTTOM,ispec) = .false.
else if(region_CPML(ispec)==6)then
+!element is in the right-top cpml corner
which_PML_elem(ILEFT,ispec) = .false.
which_PML_elem(IRIGHT,ispec) = .true.
which_PML_elem(ITOP,ispec) = .true.
which_PML_elem(IBOTTOM,ispec) = .false.
else if(region_CPML(ispec)==8)then
+!element is in the bottom cpml layer
which_PML_elem(ILEFT,ispec) = .false.
which_PML_elem(IRIGHT,ispec) = .false.
which_PML_elem(ITOP,ispec) = .false.
which_PML_elem(IBOTTOM,ispec) = .true.
else if(region_CPML(ispec)==9)then
+!element is in the left-bottom cpml corner
which_PML_elem(ILEFT,ispec) = .true.
which_PML_elem(IRIGHT,ispec) = .false.
which_PML_elem(ITOP,ispec) = .false.
which_PML_elem(IBOTTOM,ispec) = .true.
else if(region_CPML(ispec)==10)then
+!element is in the right-bottom cpml corner
which_PML_elem(ILEFT,ispec) = .false.
which_PML_elem(IRIGHT,ispec) = .true.
which_PML_elem(ITOP,ispec) = .false.
which_PML_elem(IBOTTOM,ispec) = .true.
else
+!element is not in cpml domain
which_PML_elem(ILEFT,ispec) = .false.
which_PML_elem(IRIGHT,ispec) = .false.
which_PML_elem(ITOP,ispec) = .false.
@@ -239,7 +247,6 @@
write(IOUT,*) "number of PML spectral elements :", nspec_PML
endif
-!!!!!!when read_external_mesh read the element in PML
end subroutine pml_init
Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/read_databases.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/read_databases.f90 2012-09-23 16:09:49 UTC (rev 20768)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/read_databases.f90 2012-09-24 08:39:52 UTC (rev 20769)
@@ -59,7 +59,7 @@
factor_subsample_image,USE_SNAPSHOT_NUMBER_IN_FILENAME,DRAW_WATER_IN_BLUE,US_LETTER, &
POWER_DISPLAY_COLOR,PERFORM_CUTHILL_MCKEE,SU_FORMAT,USER_T0,time_stepping_scheme,&
ADD_SPRING_TO_STACEY,ADD_PERIODIC_CONDITIONS,PERIODIC_horiz_dist,PERIODIC_DETECT_TOL,&
- read_external_mesh,CPML_element_file)
+ read_external_mesh)
! starts reading in parameters from input Database file
@@ -131,9 +131,8 @@
!! DK DK grid point detection tolerance for periodic conditions
double precision :: PERIODIC_DETECT_TOL
-!! DK DK for CPML_element_file
- logical :: read_external_mesh
- character(len=256) :: CPML_element_file
+!!! DK DK for CPML_element_file
+ logical :: read_external_mesh
! local parameters
integer :: ier
@@ -191,13 +190,7 @@
read(IIN,"(a80)") datlin
read(IIN,*) read_external_mesh
- if(read_external_mesh)then
read(IIN,"(a80)") datlin
-! read(IIN,"(a256)") CPML_element_file
- read(IIN,*) CPML_element_file
- endif
-
- read(IIN,"(a80)") datlin
read(IIN,*) NELEM_PML_THICKNESS
read(IIN,"(a80)") datlin
Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90 2012-09-23 16:09:49 UTC (rev 20768)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90 2012-09-24 08:39:52 UTC (rev 20769)
@@ -566,7 +566,6 @@
!! DK DK for CPML_element_file
logical :: read_external_mesh
- character(len=256) :: CPML_element_file
double precision :: cutsnaps,sizemax_arrows,anglerec,xirec,gammarec
@@ -1052,7 +1051,7 @@
factor_subsample_image,USE_SNAPSHOT_NUMBER_IN_FILENAME,DRAW_WATER_IN_BLUE,US_LETTER, &
POWER_DISPLAY_COLOR,PERFORM_CUTHILL_MCKEE,SU_FORMAT,USER_T0, time_stepping_scheme, &
ADD_SPRING_TO_STACEY,ADD_PERIODIC_CONDITIONS,PERIODIC_horiz_dist,PERIODIC_DETECT_TOL,&
- read_external_mesh,CPML_element_file)
+ read_external_mesh)
if(nproc_read_from_database < 1) stop 'should have nproc_read_from_database >= 1'
if(SIMULATION_TYPE == 2 .and.(time_stepping_scheme == 2 .or. time_stepping_scheme == 3)) &
stop 'RK and LDDRK time scheme not supported for adjoint inversion'
@@ -1093,7 +1092,7 @@
factor_subsample_image,USE_SNAPSHOT_NUMBER_IN_FILENAME,DRAW_WATER_IN_BLUE,US_LETTER, &
POWER_DISPLAY_COLOR,PERFORM_CUTHILL_MCKEE,SU_FORMAT,USER_T0, time_stepping_scheme, &
ADD_SPRING_TO_STACEY,ADD_PERIODIC_CONDITIONS,PERIODIC_horiz_dist,PERIODIC_DETECT_TOL,&
- read_external_mesh,CPML_element_file)
+ read_external_mesh)
!
!--- source information
More information about the CIG-COMMITS
mailing list