[cig-commits] [commit] devel: cosmetic changes (1d38110)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Apr 29 18:08:19 PDT 2014
Repository : ssh://geoshell/specfem3d_globe
On branch : devel
Link : https://github.com/geodynamics/specfem3d_globe/compare/bd213f2df89745397090a39fef05f3632538204d...b6ad89bf88f662036e9f8bd6a0120e3187c8fee2
>---------------------------------------------------------------
commit 1d3811005c88fdb1400b18a2445dff97a458d35b
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date: Wed Apr 30 03:05:56 2014 +0200
cosmetic changes
>---------------------------------------------------------------
1d3811005c88fdb1400b18a2445dff97a458d35b
src/meshfem3D/create_chunk_buffers.f90 | 8 +++---
src/meshfem3D/create_regions_mesh.F90 | 40 +++++++++++++--------------
src/meshfem3D/get_absorb_adios.F90 | 4 +--
src/shared/define_all_layers.f90 | 25 ++++++++---------
src/specfem3D/compute_stacey_crust_mantle.f90 | 6 ++--
src/specfem3D/multiply_arrays_source.f90 | 2 +-
src/specfem3D/prepare_timerun.f90 | 2 +-
src/specfem3D/read_arrays_solver_adios.F90 | 2 +-
src/specfem3D/read_mesh_databases.F90 | 2 +-
src/specfem3D/read_mesh_databases_adios.f90 | 2 +-
10 files changed, 46 insertions(+), 47 deletions(-)
diff --git a/src/meshfem3D/create_chunk_buffers.f90 b/src/meshfem3D/create_chunk_buffers.f90
index ac87d56..4c77183 100644
--- a/src/meshfem3D/create_chunk_buffers.f90
+++ b/src/meshfem3D/create_chunk_buffers.f90
@@ -854,10 +854,10 @@
itypecorner(2,ichunk) = IUPPERUPPER
itypecorner(3,ichunk) = IUPPERLOWER
-!! DK DK UGLY in the future, should also assemble second corner when NCHUNKS = 2
-!! DK DK UGLY for now we only assemble one corner for simplicity
-!! DK DK UGLY formally this is incorrect and should be changed in the future
-!! DK DK UGLY in practice this trick works fine
+!! DK DK in the future, should also assemble second corner when NCHUNKS = 2
+!! DK DK for now we only assemble one corner for simplicity
+!! DK DK formally this is incorrect and should be changed in the future
+!! DK DK in practice this trick works fine
! this only if more than 3 chunks
if(NCHUNKS > 3) then
diff --git a/src/meshfem3D/create_regions_mesh.F90 b/src/meshfem3D/create_regions_mesh.F90
index bc805c2..4fd3ba6 100644
--- a/src/meshfem3D/create_regions_mesh.F90
+++ b/src/meshfem3D/create_regions_mesh.F90
@@ -349,7 +349,7 @@
if(ier /= 0) stop 'error in allocate 22'
! creating mass matrices in this slice (will be fully assembled in the solver)
- ! note: for stacey boundaries, needs indexing nimin,.. filled in in first pass
+ ! note: for Stacey boundaries, needs indexing nimin,.. filled in in first pass
call create_mass_matrices(nspec,nglob,idoubling,ibool, &
iregion_code,xstore,ystore,zstore, &
NSPEC2D_TOP,NSPEC2D_BOTTOM)
@@ -360,25 +360,25 @@
! save the binary files
call synchronize_all()
!! DK DK for Roland_Sylvain
- if(.not. ROLAND_SYLVAIN) then
- if( myrank == 0) then
- write(IMAIN,*)
- write(IMAIN,*) ' ...saving binary files'
- call flush_IMAIN()
- endif
- ! saves mesh and model parameters
- if( ADIOS_ENABLED .and. ADIOS_FOR_ARRAYS_SOLVER ) then
- if( myrank == 0) write(IMAIN,*) ' in ADIOS file format'
- call save_arrays_solver_adios(myrank,nspec,nglob,idoubling,ibool, &
- iregion_code,xstore,ystore,zstore, &
- NSPEC2DMAX_XMIN_XMAX, NSPEC2DMAX_YMIN_YMAX, &
- NSPEC2D_TOP,NSPEC2D_BOTTOM)
- else
- call save_arrays_solver(myrank,nspec,nglob,idoubling,ibool, &
- iregion_code,xstore,ystore,zstore, &
- NSPEC2D_TOP,NSPEC2D_BOTTOM)
+ if(.not. ROLAND_SYLVAIN) then
+ if( myrank == 0) then
+ write(IMAIN,*)
+ write(IMAIN,*) ' ...saving binary files'
+ call flush_IMAIN()
+ endif
+ ! saves mesh and model parameters
+ if( ADIOS_ENABLED .and. ADIOS_FOR_ARRAYS_SOLVER ) then
+ if( myrank == 0) write(IMAIN,*) ' in ADIOS file format'
+ call save_arrays_solver_adios(myrank,nspec,nglob,idoubling,ibool, &
+ iregion_code,xstore,ystore,zstore, &
+ NSPEC2DMAX_XMIN_XMAX, NSPEC2DMAX_YMIN_YMAX, &
+ NSPEC2D_TOP,NSPEC2D_BOTTOM)
+ else
+ call save_arrays_solver(myrank,nspec,nglob,idoubling,ibool, &
+ iregion_code,xstore,ystore,zstore, &
+ NSPEC2D_TOP,NSPEC2D_BOTTOM)
+ endif
endif
- endif
! frees memory
deallocate(rmassx,rmassy,rmassz)
@@ -665,7 +665,7 @@
endif
! initializes boundary indices only during first pass, we need then the stored index values
- ! for creating mass matrices for stacey in second pass
+ ! for creating mass matrices for Stacey in second pass
nimin(:,:) = 0; nimax(:,:) = 0
njmin(:,:) = 0; njmax(:,:) = 0
nkmin_xi(:,:) = 0; nkmin_eta(:,:) = 0
diff --git a/src/meshfem3D/get_absorb_adios.F90 b/src/meshfem3D/get_absorb_adios.F90
index 71a6de1..bb39a3d 100644
--- a/src/meshfem3D/get_absorb_adios.F90
+++ b/src/meshfem3D/get_absorb_adios.F90
@@ -27,14 +27,14 @@
!-------------------------------------------------------------------------------
!> \file get_absorb_adios.f90
-!! \brief Function to write stacey boundary condition to disk with ADIOS.
+!! \brief Function to write Stacey boundary condition to disk with ADIOS.
!! \author MPBL
!-------------------------------------------------------------------------------
#include "config.fh"
!===============================================================================
-!> \brief Write stacey boundary conditions to a single file using ADIOS
+!> \brief Write Stacey boundary conditions to a single file using ADIOS
!!
!! \param myrank The MPI rank of the current process
!! \param iregion The region the absorbing conditon is written for. Check
diff --git a/src/shared/define_all_layers.f90 b/src/shared/define_all_layers.f90
index 82a3453..e8582b5 100644
--- a/src/shared/define_all_layers.f90
+++ b/src/shared/define_all_layers.f90
@@ -25,7 +25,6 @@
!
!=====================================================================
-
subroutine define_all_layers(NER_CRUST,NER_80_MOHO,NER_220_80,&
NER_400_220,NER_600_400,NER_670_600,NER_771_670, &
NER_TOPDDOUBLEPRIME_771,NER_CMB_TOPDDOUBLEPRIME,NER_OUTER_CORE, &
@@ -312,12 +311,12 @@
! the first region is the crust at the surface of the Earth
! the last region is in the inner core near the center of the Earth
- !!!!!!!!!!! DK DK UGLY: beware, is there a bug when 3D crust crosses anisotropy in the mantle?
- !!!!!!!!!!! DK DK UGLY: i.e. if there is no thick crust there, some elements above the Moho
- !!!!!!!!!!! DK DK UGLY: should be anisotropic but anisotropy is currently only
- !!!!!!!!!!! DK DK UGLY: stored between d220 and MOHO to save memory? Clarify this one day.
- !!!!!!!!!!! DK DK UGLY: The Moho stretching and squishing that Jeroen added to V4.0
- !!!!!!!!!!! DK DK UGLY: should partly deal with this problem.
+ !!!!!!!!!!! DK DK: beware, is there a bug when 3D crust crosses anisotropy in the mantle?
+ !!!!!!!!!!! DK DK: i.e. if there is no thick crust there, some elements above the Moho
+ !!!!!!!!!!! DK DK: should be anisotropic but anisotropy is currently only
+ !!!!!!!!!!! DK DK: stored between d220 and MOHO to save memory? Clarify this one day.
+ !!!!!!!!!!! DK DK: The Moho stretching and squishing that Jeroen added to V4.0
+ !!!!!!!!!!! DK DK: should partly deal with this problem.
r_top(1) = R_EARTH
r_bottom(1) = RMOHO_FICTITIOUS_IN_MESHER
@@ -719,12 +718,12 @@
! the first region is the crust at the surface of the Earth
! the last region is in the inner core near the center of the Earth
- !!!!!!!!!!! DK DK UGLY: beware, is there a bug when 3D crust crosses anisotropy in the mantle?
- !!!!!!!!!!! DK DK UGLY: i.e. if there is no thick crust there, some elements above the Moho
- !!!!!!!!!!! DK DK UGLY: should be anisotropic but anisotropy is currently only
- !!!!!!!!!!! DK DK UGLY: stored between d220 and MOHO to save memory? Clarify this one day.
- !!!!!!!!!!! DK DK UGLY: The Moho stretching and squishing that Jeroen added to V4.0
- !!!!!!!!!!! DK DK UGLY: should partly deal with this problem.
+ !!!!!!!!!!! DK DK: beware, is there a bug when 3D crust crosses anisotropy in the mantle?
+ !!!!!!!!!!! DK DK: i.e. if there is no thick crust there, some elements above the Moho
+ !!!!!!!!!!! DK DK: should be anisotropic but anisotropy is currently only
+ !!!!!!!!!!! DK DK: stored between d220 and MOHO to save memory? Clarify this one day.
+ !!!!!!!!!!! DK DK: The Moho stretching and squishing that Jeroen added to V4.0
+ !!!!!!!!!!! DK DK: should partly deal with this problem.
r_top(1) = R_EARTH
r_bottom(1) = RMOHO_FICTITIOUS_IN_MESHER
diff --git a/src/specfem3D/compute_stacey_crust_mantle.f90 b/src/specfem3D/compute_stacey_crust_mantle.f90
index 64fc20a..5bff15c 100644
--- a/src/specfem3D/compute_stacey_crust_mantle.f90
+++ b/src/specfem3D/compute_stacey_crust_mantle.f90
@@ -27,7 +27,7 @@
subroutine compute_stacey_crust_mantle_forward()
-! stacey conditions for forward or adjoint wavefields (SIMULATION_TYPE == 1 or 2)
+! Stacey conditions for forward or adjoint wavefields (SIMULATION_TYPE == 1 or 2)
use constants_solver
@@ -326,7 +326,7 @@
subroutine compute_stacey_crust_mantle_backward()
-! stacey for backward/reconstructed wavefield
+! Stacey for backward/reconstructed wavefield
use constants_solver
@@ -518,7 +518,7 @@
subroutine compute_stacey_crust_mantle_backward_undoatt()
-! stacey conditions for backward/reconstructed wavefields in UNDO_ATTENUATION case
+! Stacey conditions for backward/reconstructed wavefields in UNDO_ATTENUATION case
use constants_solver
diff --git a/src/specfem3D/multiply_arrays_source.f90 b/src/specfem3D/multiply_arrays_source.f90
index 5706dba..14b76b3 100644
--- a/src/specfem3D/multiply_arrays_source.f90
+++ b/src/specfem3D/multiply_arrays_source.f90
@@ -112,7 +112,7 @@
! local parameters
integer :: i
- ! note: mass matrices for fluid region has no stacey or rotation correction
+ ! note: mass matrices for fluid region has no Stacey or rotation correction
! it is also the same for forward and backward/reconstructed wavefields
do i=1,NGLOB
diff --git a/src/specfem3D/prepare_timerun.f90 b/src/specfem3D/prepare_timerun.f90
index 8b24e42..0230905 100644
--- a/src/specfem3D/prepare_timerun.f90
+++ b/src/specfem3D/prepare_timerun.f90
@@ -76,7 +76,7 @@
! this makes indexing and timing easier to match with adjoint wavefields indexing.
call read_forward_arrays_startrun()
- ! prepares stacey boundary arrays for re-construction of wavefields
+ ! prepares Stacey boundary arrays for re-construction of wavefields
if( ABSORBING_CONDITIONS ) call prepare_timerun_stacey()
! prepares noise simulations
diff --git a/src/specfem3D/read_arrays_solver_adios.F90 b/src/specfem3D/read_arrays_solver_adios.F90
index 09114dd..26b1e54 100644
--- a/src/specfem3D/read_arrays_solver_adios.F90
+++ b/src/specfem3D/read_arrays_solver_adios.F90
@@ -357,7 +357,7 @@ subroutine read_arrays_solver_adios(iregion_code,myrank, &
! mass matrices
!
- ! in the case of stacey boundary conditions, add C*deltat/2 contribution to
+ ! in the case of Stacey boundary conditions, add C*deltat/2 contribution to
! the mass matrix on Stacey edges for the crust_mantle and outer_core regions
! but not for the inner_core region thus the mass matrix must be replaced by
! three mass matrices including the "C" damping matrix
diff --git a/src/specfem3D/read_mesh_databases.F90 b/src/specfem3D/read_mesh_databases.F90
index fb334fd..845c4e5 100644
--- a/src/specfem3D/read_mesh_databases.F90
+++ b/src/specfem3D/read_mesh_databases.F90
@@ -117,7 +117,7 @@
! reads "stacey.bin" files
if( SYNC_READING ) call synchronize_all()
if( myrank == 0 ) then
- write(IMAIN,*) ' reading in stacey databases...'
+ write(IMAIN,*) ' reading in Stacey databases...'
call flush_IMAIN()
endif
call read_mesh_databases_stacey()
diff --git a/src/specfem3D/read_mesh_databases_adios.f90 b/src/specfem3D/read_mesh_databases_adios.f90
index 508aa05..c92f130 100644
--- a/src/specfem3D/read_mesh_databases_adios.f90
+++ b/src/specfem3D/read_mesh_databases_adios.f90
@@ -710,7 +710,7 @@ subroutine read_mesh_databases_addressing_adios()
endif
! determine chunk number and local slice coordinates using addressing
- ! (needed for stacey conditions)
+ ! (needed for Stacey conditions)
ichunk = ichunk_slice(myrank)
end subroutine read_mesh_databases_addressing_adios
More information about the CIG-COMMITS
mailing list