[cig-commits] [commit] devel: fixed some typos (c3c2646)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Feb 20 16:32:44 PST 2014
Repository : ssh://geoshell/specfem2d
On branch : devel
Link : https://github.com/geodynamics/specfem2d/compare/83fd4ee0b5eeb281a9ba8c1db334154664836f6c...6022c48f227ac18dcf89a9ea9800196d5ef08951
>---------------------------------------------------------------
commit c3c26465a128f0902bb0739596dea5d202db7c6f
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date: Fri Feb 21 01:29:01 2014 +0100
fixed some typos
>---------------------------------------------------------------
c3c26465a128f0902bb0739596dea5d202db7c6f
DATA/Par_file | 2 +-
src/meshfem2D/meshfem2D.F90 | 12 ++++++------
src/meshfem2D/part_unstruct.F90 | 15 ++++++---------
src/specfem2D/specfem2D.F90 | 6 +-----
4 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/DATA/Par_file b/DATA/Par_file
index 62fc2fc..2188636 100644
--- a/DATA/Par_file
+++ b/DATA/Par_file
@@ -137,7 +137,7 @@ ADD_SPRING_TO_STACEY = .false.
ADD_PERIODIC_CONDITIONS = .false.
# horizontal periodicity distance for periodic conditions
-PERIODIC_HORIZ_DIST = 4000.d0 # 0.3597d0
+PERIODIC_HORIZ_DIST = 0.3597d0
#-----------------------------------------------------------------------------
# PARAMETERS FOR EXTERNAL MESHING
diff --git a/src/meshfem2D/meshfem2D.F90 b/src/meshfem2D/meshfem2D.F90
index 856169a..d658171 100644
--- a/src/meshfem2D/meshfem2D.F90
+++ b/src/meshfem2D/meshfem2D.F90
@@ -908,21 +908,21 @@ program meshfem2D
! beware of fluid solid edges : coupled elements are transferred to the same partition
if ( ngnod == 9 ) then
- call acoustic_elastic_repartitioning (elmnts_bis, nb_materials, phi, num_material, nproc)
+ call acoustic_elastic_repartitioning(elmnts_bis, nb_materials, phi, num_material, nproc)
else
- call acoustic_elastic_repartitioning (elmnts, nb_materials, phi, num_material, nproc)
+ call acoustic_elastic_repartitioning(elmnts, nb_materials, phi, num_material, nproc)
endif
! beware of fluid porous edges : coupled elements are transferred to the same partition
if ( ngnod == 9 ) then
- call acoustic_poro_repartitioning (elmnts_bis, nb_materials, phi, num_material, nproc)
+ call acoustic_poro_repartitioning(elmnts_bis, nb_materials, phi, num_material, nproc)
else
- call acoustic_poro_repartitioning (elmnts, nb_materials, phi, num_material, nproc)
+ call acoustic_poro_repartitioning(elmnts, nb_materials, phi, num_material, nproc)
endif
! beware of porous solid edges : coupled elements are transferred to the same partition
if ( ngnod == 9 ) then
- call poro_elastic_repartitioning (elmnts_bis, nb_materials, phi, num_material, nproc)
+ call poro_elastic_repartitioning(elmnts_bis, nb_materials, phi, num_material, nproc)
else
- call poro_elastic_repartitioning (elmnts, nb_materials, phi, num_material, nproc)
+ call poro_elastic_repartitioning(elmnts, nb_materials, phi, num_material, nproc)
endif
! local number of each element for each partition
diff --git a/src/meshfem2D/part_unstruct.F90 b/src/meshfem2D/part_unstruct.F90
index a77e73f..986fede 100644
--- a/src/meshfem2D/part_unstruct.F90
+++ b/src/meshfem2D/part_unstruct.F90
@@ -1684,11 +1684,10 @@ end subroutine rotate_mesh_for_plane_wave
!--------------------------------------------------
- ! Repartitioning : two coupled acoustic/elastic elements are transfered to the same partition
+ ! repartitioning: coupled acoustic/elastic elements are transferred to the same partition
!--------------------------------------------------
- subroutine acoustic_elastic_repartitioning (elmnts_l, nb_materials, &
- phi_material, num_material, nproc)
+ subroutine acoustic_elastic_repartitioning(elmnts_l, nb_materials, phi_material, num_material, nproc)
implicit none
include "constants.h"
@@ -1777,11 +1776,10 @@ end subroutine rotate_mesh_for_plane_wave
!--------------------------------------------------
- ! Repartitioning : two coupled acoustic/poroelastic elements are transfered to the same partition
+ ! repartitioning: coupled acoustic/poroelastic elements are transferred to the same partition
!--------------------------------------------------
- subroutine acoustic_poro_repartitioning (elmnts_l, nb_materials, &
- phi_material, num_material, nproc)
+ subroutine acoustic_poro_repartitioning(elmnts_l, nb_materials, phi_material, num_material, nproc)
implicit none
include "constants.h"
@@ -1871,11 +1869,10 @@ end subroutine rotate_mesh_for_plane_wave
!--------------------------------------------------
- ! Repartitioning : two coupled poroelastic/elastic elements are transfered to the same partition
+ ! repartitioning: coupled poroelastic/elastic elements are transferred to the same partition
!--------------------------------------------------
- subroutine poro_elastic_repartitioning (elmnts_l, nb_materials, &
- phi_material, num_material, nproc)
+ subroutine poro_elastic_repartitioning(elmnts_l, nb_materials, phi_material, num_material, nproc)
implicit none
include "constants.h"
diff --git a/src/specfem2D/specfem2D.F90 b/src/specfem2D/specfem2D.F90
index f423225..ce68c89 100644
--- a/src/specfem2D/specfem2D.F90
+++ b/src/specfem2D/specfem2D.F90
@@ -1886,10 +1886,6 @@
write(IOUT,*)
endif
-#ifdef USE_MPI
- stop 'periodic conditions currently implemented for a serial simulation only'
-#endif
-
! allocate an array to make sure that an acoustic free surface is not enforced on periodic edges
allocate(this_ibool_is_a_periodic_edge(NGLOB))
allocate(copy_this_ibool_is_a_periodic(NGLOB))
@@ -2048,7 +2044,7 @@
enddo
enddo
enddo
- endif
+ endif ! of if(ADD_PERIODIC_CONDITIONS)
!---- compute shape functions and their derivatives for regular interpolated display grid
do j = 1,pointsdisp
More information about the CIG-COMMITS
mailing list