[cig-commits] [commit] QA: uses top_srcdir instead of top_builddir for bundled scotch directory; cleans up code a bit (fd9094b)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Feb 4 06:57:35 PST 2014
Repository : ssh://geoshell/specfem3d
On branch : QA
Link : https://github.com/geodynamics/specfem3d/compare/56deeb214ac966cde7e955473d9e61288b16d98f...e38ba401e045bc221ec1099e88d3aa31e7b4773c
>---------------------------------------------------------------
commit fd9094b163ed701d92ad57a0345a52ad2b9c8347
Author: daniel peter <peterda at ethz.ch>
Date: Mon Feb 3 11:51:19 2014 +0100
uses top_srcdir instead of top_builddir for bundled scotch directory; cleans up code a bit
>---------------------------------------------------------------
fd9094b163ed701d92ad57a0345a52ad2b9c8347
Makefile.in | 11 +++--
.../create_movie_shakemap_AVS_DX_GMT.f90 | 2 +-
src/cuda/initialize_cuda.cu | 0
src/cuda/rules.mk | 28 ------------
src/cuda/specfem3D_gpu_cuda_method_stubs.c | 0
.../save_arrays_solver_adios.F90 | 4 --
src/generate_databases/save_moho_adios.F90 | 3 --
src/meshfem3D/save_databases_adios.F90 | 3 --
src/shared/adios_helpers.f90 | 12 +++--
src/shared/adios_helpers_definitions.f90 | 12 +++--
src/shared/adios_helpers_writers.f90 | 12 +++--
src/shared/adios_manager.F90 | 26 +++++++++++
src/shared/adios_manager_stubs.f90 | 26 +++++++++++
src/shared/write_c_binary.c | 51 +++++++++++-----------
src/specfem3D/compute_stacey_viscoelastic.f90 | 12 ++---
src/specfem3D/save_forward_arrays_adios.F90 | 3 --
src/specfem3D/save_kernels_adios.F90 | 3 --
17 files changed, 104 insertions(+), 104 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 5fa4584..56f4e12 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,11 +81,10 @@ MPI_INCLUDES = @MPI_INCLUDES@
SCOTCH_BUNDLED = @USE_BUNDLED_SCOTCH@
-
ifeq (${SCOTCH_BUNDLED},1)
-SCOTCH_DIR = @top_builddir@/src/decompose_mesh/@SCOTCH_DIR@
-SCOTCH_INCDIR = @top_builddir@/src/decompose_mesh/@SCOTCH_INCLUDEDIR@
-SCOTCH_LIBDIR = @top_builddir@/src/decompose_mesh/@SCOTCH_LIBDIR@
+SCOTCH_DIR = @top_srcdir@/src/decompose_mesh/@SCOTCH_DIR@
+SCOTCH_INCDIR = @top_srcdir@/src/decompose_mesh/@SCOTCH_INCLUDEDIR@
+SCOTCH_LIBDIR = @top_srcdir@/src/decompose_mesh/@SCOTCH_LIBDIR@
else
SCOTCH_DIR = @SCOTCH_DIR@
SCOTCH_INCDIR = @SCOTCH_INCLUDEDIR@
@@ -266,12 +265,12 @@ clean:
-rm -f $(foreach dir, $(SUBDIRS), $($(dir)_OBJECTS) $($(dir)_MODULES) $($(dir)_TARGETS)) $O/*
endif
-realclean:
+realclean: clean
ifeq (${SCOTCH_BUNDLED},1)
@echo "cleaning bundled Scotch in directory: ${SCOTCH_DIR}/src"
$(MAKE) -C ${SCOTCH_DIR}/src realclean
endif
- rm -rf bin/* lib/* obj/*.o obj/*/*.o src/meshfem3D/*.mod src/decompose_mesh/*.mod src/generate_databases/*.mod src/specfem3D/*.mod
+ rm -rf $E/* $O/* $L/*
help:
@echo "usage: make [executable]"
diff --git a/src/auxiliaries/create_movie_shakemap_AVS_DX_GMT.f90 b/src/auxiliaries/create_movie_shakemap_AVS_DX_GMT.f90
index 399339f..b0f922b 100644
--- a/src/auxiliaries/create_movie_shakemap_AVS_DX_GMT.f90
+++ b/src/auxiliaries/create_movie_shakemap_AVS_DX_GMT.f90
@@ -149,7 +149,7 @@
print*,'please run xgenerate_databases or xspecfem3D first to create this file, exiting now...'
stop 'error opening moviedata header file'
endif
- ! skips first 5 lines
+ ! skips first few lines
do i=1,6
read(IIN,'(a256)') line
enddo
diff --git a/src/cuda/rules.mk b/src/cuda/rules.mk
index ddb4079..a050730 100644
--- a/src/cuda/rules.mk
+++ b/src/cuda/rules.mk
@@ -24,34 +24,6 @@
#
#=====================================================================
-
-#=====================================================================
-#
-# S p e c f e m 3 D G l o b e V e r s i o n 6 . 0
-# --------------------------------------------------
-#
-# Main authors: Dimitri Komatitsch and Jeroen Tromp
-# Princeton University, USA
-# and University of Pau / CNRS / INRIA, France
-# (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
-# August 2013
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-#=====================================================================
-
## compilation directories
S := ${S_TOP}/src/cuda
$(cuda_OBJECTS): S = ${S_TOP}/src/cuda
diff --git a/src/generate_databases/save_arrays_solver_adios.F90 b/src/generate_databases/save_arrays_solver_adios.F90
index fbc2153..8ae7686 100644
--- a/src/generate_databases/save_arrays_solver_adios.F90
+++ b/src/generate_databases/save_arrays_solver_adios.F90
@@ -196,13 +196,9 @@ subroutine save_arrays_solver_ext_mesh_adios(nspec, nglob, &
max_global_values(39) = nspec_ab
max_global_values(40) = nspec_aniso
- !call MPI_Allreduce(MPI_IN_PLACE, max_global_values, num_vars, &
- ! MPI_INTEGER, MPI_MAX, MPI_COMM_WORLD, ier)
- !if( ier /= 0 ) call exit_MPI(myrank,'Allreduce to get max values failed.')
! calling wrapper instead to compile without mpi
call max_allreduce_i(max_global_values,num_vars)
-
nglob_wmax = max_global_values(1)
nspec_wmax = max_global_values(2)
max_nibool_interfaces_ext_mesh_wmax = max_global_values(3)
diff --git a/src/generate_databases/save_moho_adios.F90 b/src/generate_databases/save_moho_adios.F90
index 96677cb..6bf3f40 100644
--- a/src/generate_databases/save_moho_adios.F90
+++ b/src/generate_databases/save_moho_adios.F90
@@ -83,9 +83,6 @@ subroutine crm_save_moho_adios()
max_global_values(1) = nspec_ab
max_global_values(2) = nspec2d_moho
- !call MPI_Allreduce(MPI_IN_PLACE, max_global_values, num_vars, &
- ! MPI_INTEGER, MPI_MAX, MPI_COMM_WORLD, ier)
- !if( ier /= 0 ) call exit_MPI(myrank,'Allreduce to get max values failed.')
! calling wrapper instead to compile without mpi
call max_allreduce_i(max_global_values,num_vars)
diff --git a/src/meshfem3D/save_databases_adios.F90 b/src/meshfem3D/save_databases_adios.F90
index 59ab325..22ffea9 100644
--- a/src/meshfem3D/save_databases_adios.F90
+++ b/src/meshfem3D/save_databases_adios.F90
@@ -488,9 +488,6 @@ subroutine save_databases_adios(LOCAL_PATH, myrank, sizeprocs, &
max_global_values(10) = nb_interfaces
max_global_values(11) = nspec_interfaces_max
- !call MPI_Allreduce(MPI_IN_PLACE, max_global_values, num_vars, &
- ! MPI_INTEGER, MPI_MAX, MPI_COMM_WORLD, ier)
- !if( ier /= 0 ) call exit_MPI(myrank,'Allreduce to get max values failed.')
call max_allreduce_i(max_global_values,num_vars)
nglob_wmax = max_global_values(1)
diff --git a/src/shared/adios_helpers.f90 b/src/shared/adios_helpers.f90
index bd12b6b..b4bb5d4 100644
--- a/src/shared/adios_helpers.f90
+++ b/src/shared/adios_helpers.f90
@@ -1,13 +1,12 @@
!=====================================================================
!
-! S p e c f e m 3 D G l o b e V e r s i o n 5 . 1
-! --------------------------------------------------
+! S p e c f e m 3 D V e r s i o n 2 . 1
+! ---------------------------------------
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
-! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
-! April 2011
+! Princeton University, USA and CNRS / INRIA / University of Pau
+! (c) Princeton University / California Institute of Technology and CNRS / INRIA / University of Pau
+! July 2012
!
! This program is free software; you can redistribute it and/or modify
! it under the terms of the GNU General Public License as published by
@@ -25,7 +24,6 @@
!
!=====================================================================
-
!===============================================================================
!> Helpers to set up adios features.
!! * Error checking
diff --git a/src/shared/adios_helpers_definitions.f90 b/src/shared/adios_helpers_definitions.f90
index 5009113..97e9628 100644
--- a/src/shared/adios_helpers_definitions.f90
+++ b/src/shared/adios_helpers_definitions.f90
@@ -1,13 +1,12 @@
!=====================================================================
!
-! S p e c f e m 3 D G l o b e V e r s i o n 5 . 1
-! --------------------------------------------------
+! S p e c f e m 3 D V e r s i o n 2 . 1
+! ---------------------------------------
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
-! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
-! April 2011
+! Princeton University, USA and CNRS / INRIA / University of Pau
+! (c) Princeton University / California Institute of Technology and CNRS / INRIA / University of Pau
+! July 2012
!
! This program is free software; you can redistribute it and/or modify
! it under the terms of the GNU General Public License as published by
@@ -25,7 +24,6 @@
!
!=====================================================================
-
!===============================================================================
!> Helpers to set up adios features.
!! * Scalar definition
diff --git a/src/shared/adios_helpers_writers.f90 b/src/shared/adios_helpers_writers.f90
index a16788a..848b219 100644
--- a/src/shared/adios_helpers_writers.f90
+++ b/src/shared/adios_helpers_writers.f90
@@ -1,13 +1,12 @@
!=====================================================================
!
-! S p e c f e m 3 D G l o b e V e r s i o n 5 . 1
-! --------------------------------------------------
+! S p e c f e m 3 D V e r s i o n 2 . 1
+! ---------------------------------------
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
-! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
-! April 2011
+! Princeton University, USA and CNRS / INRIA / University of Pau
+! (c) Princeton University / California Institute of Technology and CNRS / INRIA / University of Pau
+! July 2012
!
! This program is free software; you can redistribute it and/or modify
! it under the terms of the GNU General Public License as published by
@@ -25,7 +24,6 @@
!
!=====================================================================
-
!===============================================================================
!> Helpers to set up adios features.
!! * Scalar definition
diff --git a/src/shared/adios_manager.F90 b/src/shared/adios_manager.F90
index 7d9b799..9f3f040 100644
--- a/src/shared/adios_manager.F90
+++ b/src/shared/adios_manager.F90
@@ -1,3 +1,29 @@
+!=====================================================================
+!
+! S p e c f e m 3 D V e r s i o n 2 . 1
+! ---------------------------------------
+!
+! Main authors: Dimitri Komatitsch and Jeroen Tromp
+! Princeton University, USA and CNRS / INRIA / University of Pau
+! (c) Princeton University / California Institute of Technology and CNRS / INRIA / University of Pau
+! July 2012
+!
+! This program is free software; you can redistribute it and/or modify
+! it under the terms of the GNU General Public License as published by
+! the Free Software Foundation; either version 2 of the License, or
+! (at your option) any later version.
+!
+! This program is distributed in the hope that it will be useful,
+! but WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+! GNU General Public License for more details.
+!
+! You should have received a copy of the GNU General Public License along
+! with this program; if not, write to the Free Software Foundation, Inc.,
+! 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+!
+!=====================================================================
+
!==============================================================================
!> Tools to setup and cleanup ADIOS
!------------------------------------------------------------------------------
diff --git a/src/shared/adios_manager_stubs.f90 b/src/shared/adios_manager_stubs.f90
index f7799b0..7f52dd1 100644
--- a/src/shared/adios_manager_stubs.f90
+++ b/src/shared/adios_manager_stubs.f90
@@ -1,3 +1,29 @@
+!=====================================================================
+!
+! S p e c f e m 3 D V e r s i o n 2 . 1
+! ---------------------------------------
+!
+! Main authors: Dimitri Komatitsch and Jeroen Tromp
+! Princeton University, USA and CNRS / INRIA / University of Pau
+! (c) Princeton University / California Institute of Technology and CNRS / INRIA / University of Pau
+! July 2012
+!
+! This program is free software; you can redistribute it and/or modify
+! it under the terms of the GNU General Public License as published by
+! the Free Software Foundation; either version 2 of the License, or
+! (at your option) any later version.
+!
+! This program is distributed in the hope that it will be useful,
+! but WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+! GNU General Public License for more details.
+!
+! You should have received a copy of the GNU General Public License along
+! with this program; if not, write to the Free Software Foundation, Inc.,
+! 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+!
+!=====================================================================
+
!==============================================================================
!> Tools to setup and cleanup ADIOS
!------------------------------------------------------------------------------
diff --git a/src/shared/write_c_binary.c b/src/shared/write_c_binary.c
index dfdd383..9f28707 100644
--- a/src/shared/write_c_binary.c
+++ b/src/shared/write_c_binary.c
@@ -1,30 +1,29 @@
/*
- !=====================================================================
- !
- ! S p e c f e m 3 D G l o b e V e r s i o n 5 . 1
- ! --------------------------------------------------
- !
- ! Main authors: Dimitri Komatitsch and Jeroen Tromp
- ! Princeton University, USA
- ! and CNRS / INRIA / University of Pau, France
- ! (c) Princeton University and CNRS / INRIA / University of Pau
- ! April 2011
- !
- ! This program is free software; you can redistribute it and/or modify
- ! it under the terms of the GNU General Public License as published by
- ! the Free Software Foundation; either version 2 of the License, or
- ! (at your option) any later version.
- !
- ! This program is distributed in the hope that it will be useful,
- ! but WITHOUT ANY WARRANTY; without even the implied warranty of
- ! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- ! GNU General Public License for more details.
- !
- ! You should have received a copy of the GNU General Public License along
- ! with this program; if not, write to the Free Software Foundation, Inc.,
- ! 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- !
- !=====================================================================
+!=====================================================================
+!
+! S p e c f e m 3 D V e r s i o n 2 . 1
+! ---------------------------------------
+!
+! Main authors: Dimitri Komatitsch and Jeroen Tromp
+! Princeton University, USA and CNRS / INRIA / University of Pau
+! (c) Princeton University / California Institute of Technology and CNRS / INRIA / University of Pau
+! July 2012
+!
+! This program is free software; you can redistribute it and/or modify
+! it under the terms of the GNU General Public License as published by
+! the Free Software Foundation; either version 2 of the License, or
+! (at your option) any later version.
+!
+! This program is distributed in the hope that it will be useful,
+! but WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+! GNU General Public License for more details.
+!
+! You should have received a copy of the GNU General Public License along
+! with this program; if not, write to the Free Software Foundation, Inc.,
+! 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+!
+!=====================================================================
*/
// for large files
diff --git a/src/specfem3D/compute_stacey_viscoelastic.f90 b/src/specfem3D/compute_stacey_viscoelastic.f90
index 2462383..94c9148 100644
--- a/src/specfem3D/compute_stacey_viscoelastic.f90
+++ b/src/specfem3D/compute_stacey_viscoelastic.f90
@@ -304,14 +304,14 @@
do j=1,NGLLY !! DK DK why use 5 and not NGLLY here? (I assume 5 means 5 GLL points here?)
do i=1,NGLLX !! DK DK why use 5 and not NGLLX here? (I assume 5 means 5 GLL points here?)
!! VM VM Correction 5->NGLLX or NGLLY
- igll = igll + 1
- read(IIN_veloc_dsm) dsm_boundary_tmp(:,:,i,j)
- Veloc_dsm_boundary(:,:,igll,iface) = dsm_boundary_tmp(:,:,i,j)
- read(IIN_tract_dsm) dsm_boundary_tmp(:,:,i,j)
- Tract_dsm_boundary(:,:,igll,iface) = dsm_boundary_tmp(:,:,i,j)
+ igll = igll + 1
+ read(IIN_veloc_dsm) dsm_boundary_tmp(:,:,i,j)
+ Veloc_dsm_boundary(:,:,igll,iface) = dsm_boundary_tmp(:,:,i,j)
+ read(IIN_tract_dsm) dsm_boundary_tmp(:,:,i,j)
+ Tract_dsm_boundary(:,:,igll,iface) = dsm_boundary_tmp(:,:,i,j)
+ enddo
enddo
enddo
- enddo
end subroutine read_dsm_file
diff --git a/src/specfem3D/save_forward_arrays_adios.F90 b/src/specfem3D/save_forward_arrays_adios.F90
index 257893c..c7bd8a4 100644
--- a/src/specfem3D/save_forward_arrays_adios.F90
+++ b/src/specfem3D/save_forward_arrays_adios.F90
@@ -82,9 +82,6 @@ subroutine save_forward_arrays_adios()
max_global_values(4) = NSPEC_ATTENUATION_AB_kappa
max_global_values(5) = N_SLS
- !call MPI_Allreduce(MPI_IN_PLACE, max_global_values, num_vars, &
- ! MPI_INTEGER, MPI_MAX, MPI_COMM_WORLD, ier)
- !if( ier /= 0 ) call exit_MPI(myrank,'Allreduce to get max values failed.')
call max_allreduce_i(max_global_values,num_vars)
nglob_wmax = max_global_values(1)
diff --git a/src/specfem3D/save_kernels_adios.F90 b/src/specfem3D/save_kernels_adios.F90
index d4c0444..cf7fe6f 100644
--- a/src/specfem3D/save_kernels_adios.F90
+++ b/src/specfem3D/save_kernels_adios.F90
@@ -90,9 +90,6 @@ subroutine define_kernel_adios_variables(handle, SAVE_WEIGHTS)
max_global_values(1) = NSPEC_AB
- !call MPI_Allreduce(MPI_IN_PLACE, max_global_values, num_vars, &
- ! MPI_INTEGER, MPI_MAX, MPI_COMM_WORLD, ier)
- !if( ier /= 0 ) call exit_MPI(myrank,'Allreduce to get max values failed.')
call max_allreduce_i(max_global_values,num_vars)
nspec_wmax = max_global_values(1)
More information about the CIG-COMMITS
mailing list