[cig-commits] [commit] devel: updated and cleaned some comments (8219b7f)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Thu Feb 27 17:30:15 PST 2014


Repository : ssh://geoshell/specfem2d

On branch  : devel
Link       : https://github.com/geodynamics/specfem2d/compare/f553d8dce847cd390cc0e7ebd9d59704cbbf06ab...be22c3f923b287ad57a9aa61d9bb5a928fec6528

>---------------------------------------------------------------

commit 8219b7f58c43b2ce21aa923b9c5bfb0f9accad46
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date:   Fri Feb 28 02:29:28 2014 +0100

    updated and cleaned some comments


>---------------------------------------------------------------

8219b7f58c43b2ce21aa923b9c5bfb0f9accad46
 src/meshfem2D/part_unstruct.F90      |  3 ---
 src/specfem2D/get_MPI.F90            |  7 -------
 src/specfem2D/invert_mass_matrix.F90 | 24 +++++++-----------------
 src/specfem2D/specfem2D.F90          |  2 ++
 4 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/src/meshfem2D/part_unstruct.F90 b/src/meshfem2D/part_unstruct.F90
index f3a94cb..0089fca 100644
--- a/src/meshfem2D/part_unstruct.F90
+++ b/src/meshfem2D/part_unstruct.F90
@@ -2054,9 +2054,6 @@ end  subroutine rotate_mesh_for_plane_wave
     if(is_periodic(el)) part(el) = ifirst_partition_found
   enddo
 
-! yyyyyyyyyyyyyyyyyyyyy
-!             part(edges_elporo_coupled(1,num_edge)) = part(edges_elporo_coupled(2,num_edge))
-
   end subroutine periodic_edges_repartitioning
 
 
diff --git a/src/specfem2D/get_MPI.F90 b/src/specfem2D/get_MPI.F90
index 63ca1de..33848d6 100644
--- a/src/specfem2D/get_MPI.F90
+++ b/src/specfem2D/get_MPI.F90
@@ -311,13 +311,6 @@
 
   if( myrank == 0 ) then
     write(IOUT,*) '       assembly acoustic MPI interface points:',num_points2
-
-    ! they don't need to fit, somehow..
-    !if( num_points2 /= num_points1 ) then
-    !  print*,'error acoustic assembly:' !,myrank
-    !  print*,'  total = ',num_points1,' not equal to assembled ',num_points2
-    !  call exit_MPI('error acoustic MPI assembly')
-    !endif
   endif
 
   end subroutine get_MPI
diff --git a/src/specfem2D/invert_mass_matrix.F90 b/src/specfem2D/invert_mass_matrix.F90
index f5edbc5..213b717 100644
--- a/src/specfem2D/invert_mass_matrix.F90
+++ b/src/specfem2D/invert_mass_matrix.F90
@@ -67,37 +67,30 @@
   implicit none
   include 'constants.h'
 
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   logical :: anyabs
   integer :: nelemabs,ibegin,iend,ispecabs,jbegin,jend
-!  integer :: ispec,i,j,k,iglob,ispecabs,ibegin,iend,irec,irec_local
   integer, dimension(nelemabs) :: numabs,ibegin_edge1,iend_edge1,ibegin_edge3,iend_edge3, &
                                   ibegin_edge4,iend_edge4,ibegin_edge2,iend_edge2
   double precision :: deltat
   logical, dimension(4,nelemabs)  :: codeabs
 
-!!local parameter
+  ! local parameter
   ! material properties of the elastic medium
   real(kind=CUSTOM_REAL) :: mul_unrelaxed_elastic,lambdal_unrelaxed_elastic,cpl,csl
   integer count_left,count_right,count_bottom
   real(kind=CUSTOM_REAL) :: nx,nz,vx,vy,vz,vn,rho_vp,rho_vs,tx,ty,tz,&
                             weight,xxi,zxi,xgamma,zgamma,jacobian1D
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-  logical any_elastic,any_acoustic,any_poroelastic
+  logical :: any_elastic,any_acoustic,any_poroelastic
 
   ! inverse mass matrices
   integer :: nglob_elastic
-  real(kind=CUSTOM_REAL), dimension(nglob_elastic) :: rmass_inverse_elastic_one,&
-                                                      rmass_inverse_elastic_three
+  real(kind=CUSTOM_REAL), dimension(nglob_elastic) :: rmass_inverse_elastic_one,rmass_inverse_elastic_three
 
   integer :: nglob_acoustic
   real(kind=CUSTOM_REAL), dimension(nglob_acoustic) :: rmass_inverse_acoustic
 
   integer :: nglob_poroelastic
-  real(kind=CUSTOM_REAL), dimension(nglob_poroelastic) :: &
-    rmass_s_inverse_poroelastic,rmass_w_inverse_poroelastic
+  real(kind=CUSTOM_REAL), dimension(nglob_poroelastic) :: rmass_s_inverse_poroelastic,rmass_w_inverse_poroelastic
 
   integer :: nspec
   integer, dimension(NGLLX,NGLLZ,nspec) :: ibool
@@ -122,11 +115,9 @@
   double precision :: rhol,kappal,mul_relaxed,lambdal_relaxed
   double precision :: rhol_s,rhol_f,rhol_bar,phil,tortl
 
-!!!!!!!!!!!!! DK DK added this
   integer :: nspec_PML,ispec_PML
   integer, dimension(nspec) :: spec_to_PML
-  real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLZ,nspec_PML) :: &
-                  K_x_store,K_z_store,d_x_store,d_z_store
+  real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLZ,nspec_PML) :: K_x_store,K_z_store,d_x_store,d_z_store
   logical, dimension(nspec) :: is_PML
   logical :: PML_BOUNDARY_CONDITIONS,this_element_has_PML
   integer, dimension(nspec) :: region_CPML
@@ -662,11 +653,10 @@
   real(kind=CUSTOM_REAL), dimension(nglob_acoustic) :: rmass_inverse_acoustic
 
   integer :: nglob_poroelastic
-  real(kind=CUSTOM_REAL), dimension(nglob_poroelastic) :: &
-    rmass_s_inverse_poroelastic,rmass_w_inverse_poroelastic
-
+  real(kind=CUSTOM_REAL), dimension(nglob_poroelastic) :: rmass_s_inverse_poroelastic,rmass_w_inverse_poroelastic
 
 ! fill mass matrix with fictitious non-zero values to make sure it can be inverted globally
+! (this can happen when some degrees of freedom have been removed from some of the global arrays)
   if(any_elastic) &
     where(rmass_inverse_elastic_one <= 0._CUSTOM_REAL) rmass_inverse_elastic_one = 1._CUSTOM_REAL
   if(any_elastic) &
diff --git a/src/specfem2D/specfem2D.F90 b/src/specfem2D/specfem2D.F90
index fa441cc..e064a6a 100644
--- a/src/specfem2D/specfem2D.F90
+++ b/src/specfem2D/specfem2D.F90
@@ -2033,6 +2033,8 @@
         enddo
       enddo
 
+!     NGLOB = NGLOB - counter !! DK DK added this yyyyyyyyyyyyyyyyyyy DK DK to fix postscript
+
 #ifdef USE_MPI
   call MPI_BARRIER(MPI_COMM_WORLD,ier)
 #endif



More information about the CIG-COMMITS mailing list