[cig-commits] r18324 - seismo/3D/FAULT_SOURCE/branches/new_fault_db/src
ampuero at geodynamics.org
ampuero at geodynamics.org
Thu May 5 17:48:28 PDT 2011
Author: ampuero
Date: 2011-05-05 17:48:28 -0700 (Thu, 05 May 2011)
New Revision: 18324
Modified:
seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/create_regions_mesh.f90
seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_object.f90
Log:
removed xstore_dummy from fault_object
Modified: seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/create_regions_mesh.f90
===================================================================
--- seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/create_regions_mesh.f90 2011-05-06 00:24:51 UTC (rev 18323)
+++ seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/create_regions_mesh.f90 2011-05-06 00:48:28 UTC (rev 18324)
@@ -53,8 +53,8 @@
! create the different regions of the mesh
use create_regions_mesh_ext_par
- use fault_object, only: fault_read_input, fault_setup, fault_save_arrays, &
- fault_db !, fault_save_arrays_test
+ use fault_object, only: fault_read_input, fault_setup, &
+ fault_save_arrays !, fault_save_arrays_test
implicit none
@@ -157,7 +157,6 @@
! double precision :: lat_corner,long_corner,ratio_xi,ratio_eta
!real(kind=CUSTOM_REAL), dimension(:,:), allocatable :: ibedrock
- ! for dynamic faults
! initializes arrays
call sync_all()
@@ -190,27 +189,15 @@
write(IMAIN,*) ' ...indexing global points'
endif
-! If the mesh contains faults we split the fault nodes
-! and generate the fault database ...
-! The node splitting procedure changes ibool size (nglob)
-! and creates Kelvin_voigt_eta values .(0 : no damping).
-
-
! crm_ext_setup_indexing : computes xstore , ystore , zstore.
call crm_ext_setup_indexing(ibool, &
xstore,ystore,zstore,nspec,nglob,npointot, &
nnodes_ext_mesh,nodes_coords_ext_mesh,myrank)
-!NEW : Here loading fault ispec and fault iface.
+
call fault_read_input()
+ call fault_setup (ibool,xstore,ystore,zstore,nspec,nglob,prname,myrank)
- if (allocated(fault_db)) call fault_setup (ibool,xstore,ystore,zstore,nspec,nglob,prname,myrank)
-! else
-! call crm_ext_setup_indexing(ibool, &
-! xstore,ystore,zstore,nspec,nglob,npointot, &
-! nnodes_ext_mesh,nodes_coords_ext_mesh,myrank)
-! endif
-
! sets up MPI interfaces between partitions
call sync_all()
Modified: seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_object.f90
===================================================================
--- seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_object.f90 2011-05-06 00:24:51 UTC (rev 18323)
+++ seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_object.f90 2011-05-06 00:48:28 UTC (rev 18324)
@@ -69,7 +69,7 @@
iface3_corner_ijk,iface4_corner_ijk, &
iface5_corner_ijk,iface6_corner_ijk /),(/3,4,6/)) ! all faces
- public :: fault_read_input, fault_setup, fault_db, fault_save_arrays_test, fault_save_arrays, fault_db_type
+ public :: fault_read_input, fault_setup, fault_save_arrays_test, fault_save_arrays
contains
@@ -111,8 +111,6 @@
integer, intent(in) :: myrank
character(len=256), intent(in) :: prname ! 'proc***'
- ! (assumes NGLLX=NGLLY=NGLLZ)
- double precision, dimension(NGLLX,NGLLY,NGLLZ,nspec) :: xtemp,ytemp,ztemp
integer, intent(out) :: nglob
integer :: iflt,npointot
@@ -121,19 +119,13 @@
if (.not. allocated(fault_db)) return
-! 1. Generate node indexing (ibool) from original coordinates. Fault nodes are split in CUBIT .
+! 1. Generate node indexing (ibool) from original coordinates. Fault nodes are split in CUBIT.
! 2. Slightly shift the coordinates of nodes on side 1 of the fault
! to do: what happens to nodes at the edges of a fault ??? : still thinking.
npointot = nspec * NGLLX*NGLLY*NGLLZ
-! call crm_ext_setup_indexing_fault(ibool, &
-! xstore,ystore,zstore,nspec,nglob,npointot)
- xtemp = xstore
- ytemp = ystore
- ztemp = zstore
-
fault_exists = .false.
call loading_coords_and_setup(fault_db,nglob,nspec,prname,myrank)
@@ -157,17 +149,6 @@
endif
-! Xstore_dummy is declared in the module create_regions_mesh_par
-! and filled for first time here for processor containing a fault
-! this routine to save Xstore_dummy, with or without fault
-
-! to do : create a subroutine to shift back xtemp,ytemp,ztemp coordinates
-! otherwise the elements of MPI-interfaces will be mix up each other
-! ending up with decouple MPI-interfaces
-
- call setup_xyzstore_dummy(ibool,xstore,ystore,zstore,nspec,nglob)
-
-
if (.not.fault_exists) return
do iflt=1,size(fault_db)
@@ -254,37 +235,7 @@
end subroutine loading_coords_and_setup
-!=============================================================================================================
-! unique global point locations
-subroutine setup_xyzstore_dummy(ibool,xstore,ystore,zstore,nspec,nglob)
- use create_regions_mesh_ext_par, only: xstore_dummy,ystore_dummy,zstore_dummy
-
- integer, intent(in) :: nspec, nglob, ibool(NGLLX,NGLLY,NGLLZ,nspec)
- double precision, dimension(NGLLX,NGLLY,NGLLZ,nspec), intent(in) :: xstore,ystore,zstore
-
- integer :: ier, ispec, i,j,k, iglobnum
-
- allocate(xstore_dummy(nglob), &
- ystore_dummy(nglob), &
- zstore_dummy(nglob),stat=ier)
-
- if(ier /= 0) stop 'error in allocate'
- do ispec = 1, nspec
- do k = 1, NGLLZ
- do j = 1, NGLLY
- do i = 1, NGLLX
- iglobnum = ibool(i,j,k,ispec)
- xstore_dummy(iglobnum) = xstore(i,j,k,ispec)
- ystore_dummy(iglobnum) = ystore(i,j,k,ispec)
- zstore_dummy(iglobnum) = zstore(i,j,k,ispec)
- enddo
- enddo
- enddo
- enddo
-
-end subroutine setup_xyzstore_dummy
-
!=============================================================================================================
subroutine setup_Kelvin_Voigt_eta(fdb)
More information about the CIG-COMMITS
mailing list