[cig-commits] r21850 - in seismo/3D/SPECFEM3D/trunk: . src/meshfem3D
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Fri Apr 12 16:54:20 PDT 2013
Author: dkomati1
Date: 2013-04-12 16:54:19 -0700 (Fri, 12 Apr 2013)
New Revision: 21850
Modified:
seismo/3D/SPECFEM3D/trunk/configure
seismo/3D/SPECFEM3D/trunk/configure.ac
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/check_mesh_quality.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/compute_parameters.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/create_regions_mesh.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/create_visual_files.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/define_subregions_heuristic.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/define_superbrick.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/get_MPI_cutplanes_eta.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/get_MPI_cutplanes_xi.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/get_flags_boundaries.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/get_global.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/meshfem3D.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/save_databases.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/store_boundaries.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/store_coords.f90
Log:
renamed constants.h to constants_meshfem3D.h in the mesher to avoid having two include files with the same name, which resulted in the code refusing to compile on some IBM Blue Gene systems
Modified: seismo/3D/SPECFEM3D/trunk/configure
===================================================================
--- seismo/3D/SPECFEM3D/trunk/configure 2013-04-12 23:41:08 UTC (rev 21849)
+++ seismo/3D/SPECFEM3D/trunk/configure 2013-04-12 23:54:19 UTC (rev 21850)
@@ -7991,7 +7991,7 @@
# Checks for library functions.
-ac_config_files="$ac_config_files Makefile src/meshfem3D/Makefile src/meshfem3D/constants.h src/meshfem3D/precision.h src/decompose_mesh/Makefile src/specfem3D/Makefile src/generate_databases/Makefile src/shared/constants.h src/shared/precision.h src/decompose_mesh/scotch/src/Makefile.inc src/check_mesh_quality_CUBIT_Abaqus/Makefile"
+ac_config_files="$ac_config_files Makefile src/meshfem3D/Makefile src/meshfem3D/precision.h src/decompose_mesh/Makefile src/specfem3D/Makefile src/generate_databases/Makefile src/shared/constants.h src/shared/precision.h src/decompose_mesh/scotch/src/Makefile.inc src/check_mesh_quality_CUBIT_Abaqus/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -8624,7 +8624,6 @@
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/meshfem3D/Makefile") CONFIG_FILES="$CONFIG_FILES src/meshfem3D/Makefile" ;;
- "src/meshfem3D/constants.h") CONFIG_FILES="$CONFIG_FILES src/meshfem3D/constants.h" ;;
"src/meshfem3D/precision.h") CONFIG_FILES="$CONFIG_FILES src/meshfem3D/precision.h" ;;
"src/decompose_mesh/Makefile") CONFIG_FILES="$CONFIG_FILES src/decompose_mesh/Makefile" ;;
"src/specfem3D/Makefile") CONFIG_FILES="$CONFIG_FILES src/specfem3D/Makefile" ;;
Modified: seismo/3D/SPECFEM3D/trunk/configure.ac
===================================================================
--- seismo/3D/SPECFEM3D/trunk/configure.ac 2013-04-12 23:41:08 UTC (rev 21849)
+++ seismo/3D/SPECFEM3D/trunk/configure.ac 2013-04-12 23:54:19 UTC (rev 21850)
@@ -448,7 +448,6 @@
AC_CONFIG_FILES([
Makefile
src/meshfem3D/Makefile
- src/meshfem3D/constants.h
src/meshfem3D/precision.h
src/decompose_mesh/Makefile
src/specfem3D/Makefile
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/check_mesh_quality.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/check_mesh_quality.f90 2013-04-12 23:41:08 UTC (rev 21849)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/check_mesh_quality.f90 2013-04-12 23:54:19 UTC (rev 21850)
@@ -423,6 +423,7 @@
implicit none
include "constants.h"
+ include "constants_meshfem3D.h"
integer :: NSPEC,NGLOB
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/compute_parameters.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/compute_parameters.f90 2013-04-12 23:41:08 UTC (rev 21849)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/compute_parameters.f90 2013-04-12 23:54:19 UTC (rev 21850)
@@ -35,6 +35,7 @@
implicit none
include "constants.h"
+ include "constants_meshfem3D.h"
! parameters read from parameter file
integer NEX_XI,NEX_ETA,NPROC_XI,NPROC_ETA
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/create_regions_mesh.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/create_regions_mesh.f90 2013-04-12 23:41:08 UTC (rev 21849)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/create_regions_mesh.f90 2013-04-12 23:54:19 UTC (rev 21850)
@@ -43,6 +43,7 @@
implicit none
include "constants.h"
+ include "constants_meshfem3D.h"
! number of spectral elements in each block
integer nspec
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/create_visual_files.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/create_visual_files.f90 2013-04-12 23:41:08 UTC (rev 21849)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/create_visual_files.f90 2013-04-12 23:54:19 UTC (rev 21850)
@@ -26,12 +26,12 @@
subroutine create_visual_files(CREATE_ABAQUS_FILES,CREATE_DX_FILES,CREATE_VTK_FILES,&
- nspec,nglob,&
- prname,nodes_coords,ibool,true_material_num)
+ nspec,nglob,prname,nodes_coords,ibool,true_material_num)
implicit none
include "constants.h"
+ include "constants_meshfem3D.h"
! Mesh files for visualization
logical CREATE_ABAQUS_FILES,CREATE_DX_FILES,CREATE_VTK_FILES
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/define_subregions_heuristic.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/define_subregions_heuristic.f90 2013-04-12 23:41:08 UTC (rev 21849)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/define_subregions_heuristic.f90 2013-04-12 23:54:19 UTC (rev 21850)
@@ -35,6 +35,7 @@
implicit none
include "constants.h"
+ include "constants_meshfem3D.h"
integer myrank
integer ix1,ix2,dix,iy1,iy2,diy,ir1,ir2,dir
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/define_superbrick.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/define_superbrick.f90 2013-04-12 23:41:08 UTC (rev 21849)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/define_superbrick.f90 2013-04-12 23:54:19 UTC (rev 21850)
@@ -32,6 +32,7 @@
implicit none
include "constants.h"
+ include "constants_meshfem3D.h"
integer, dimension(NGNOD_EIGHT_CORNERS,NSPEC_DOUBLING_SUPERBRICK) :: ibool_superbrick
double precision, dimension(NGLOB_DOUBLING_SUPERBRICK) :: x_superbrick,y_superbrick,z_superbrick
@@ -660,6 +661,7 @@
implicit none
include "constants.h"
+ include "constants_meshfem3D.h"
integer, dimension(NGNOD_EIGHT_CORNERS,NSPEC_DOUBLING_SUPERBRICK) :: ibool_superbrick
double precision, dimension(NGLOB_DOUBLING_SUPERBRICK) :: x_superbrick,y_superbrick,z_superbrick
@@ -1206,6 +1208,7 @@
implicit none
include "constants.h"
+ include "constants_meshfem3D.h"
integer, dimension(NGNOD_EIGHT_CORNERS,NSPEC_DOUBLING_SUPERBRICK) :: ibool_superbrick
double precision, dimension(NGLOB_DOUBLING_SUPERBRICK) :: x_superbrick,y_superbrick,z_superbrick
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/get_MPI_cutplanes_eta.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/get_MPI_cutplanes_eta.f90 2013-04-12 23:41:08 UTC (rev 21849)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/get_MPI_cutplanes_eta.f90 2013-04-12 23:54:19 UTC (rev 21850)
@@ -36,6 +36,7 @@
implicit none
include "constants.h"
+ include "constants_meshfem3D.h"
integer nspec,myrank
integer NSPEC2D_A_XI,NSPEC2D_B_XI
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/get_MPI_cutplanes_xi.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/get_MPI_cutplanes_xi.f90 2013-04-12 23:41:08 UTC (rev 21849)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/get_MPI_cutplanes_xi.f90 2013-04-12 23:54:19 UTC (rev 21850)
@@ -36,6 +36,7 @@
implicit none
include "constants.h"
+ include "constants_meshfem3D.h"
integer nspec,myrank
integer NSPEC2D_A_ETA,NSPEC2D_B_ETA
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/get_flags_boundaries.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/get_flags_boundaries.f90 2013-04-12 23:41:08 UTC (rev 21849)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/get_flags_boundaries.f90 2013-04-12 23:54:19 UTC (rev 21850)
@@ -32,6 +32,7 @@
implicit none
include "constants.h"
+ include "constants_meshfem3D.h"
integer nspec
integer ispec,idoubling
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/get_global.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/get_global.f90 2013-04-12 23:41:08 UTC (rev 21849)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/get_global.f90 2013-04-12 23:54:19 UTC (rev 21850)
@@ -36,6 +36,7 @@
implicit none
include "constants.h"
+ include "constants_meshfem3D.h"
integer npointot
integer nspec,nglob
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/meshfem3D.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/meshfem3D.f90 2013-04-12 23:41:08 UTC (rev 21849)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/meshfem3D.f90 2013-04-12 23:54:19 UTC (rev 21850)
@@ -31,8 +31,11 @@
use readParFile
use createRegMesh
+
implicit none
+
include "constants.h"
+ include "constants_meshfem3D.h"
!=============================================================================!
! !
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/save_databases.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/save_databases.f90 2013-04-12 23:41:08 UTC (rev 21849)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/save_databases.f90 2013-04-12 23:54:19 UTC (rev 21850)
@@ -36,6 +36,7 @@
implicit none
include "constants.h"
+ include "constants_meshfem3D.h"
! number of spectral elements in each block
integer nspec
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/store_boundaries.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/store_boundaries.f90 2013-04-12 23:41:08 UTC (rev 21849)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/store_boundaries.f90 2013-04-12 23:54:19 UTC (rev 21850)
@@ -33,6 +33,7 @@
implicit none
include "constants.h"
+ include "constants_meshfem3D.h"
integer nspec,myrank
integer NSPEC2D_BOTTOM,NSPEC2D_TOP,NSPEC2DMAX_XMIN_XMAX,NSPEC2DMAX_YMIN_YMAX
@@ -138,6 +139,7 @@
implicit none
include "constants.h"
+ include "constants_meshfem3D.h"
integer nspec,myrank
integer NSPEC2D_BOTTOM,NSPEC2D_TOP,NSPEC2DMAX_XMIN_XMAX,NSPEC2DMAX_YMIN_YMAX
@@ -367,6 +369,7 @@
implicit none
include "constants.h"
+ include "constants_meshfem3D.h"
! generic routine that accepts any polynomial degree in each direction
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/store_coords.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/store_coords.f90 2013-04-12 23:41:08 UTC (rev 21849)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/store_coords.f90 2013-04-12 23:54:19 UTC (rev 21850)
@@ -29,6 +29,7 @@
implicit none
include "constants.h"
+ include "constants_meshfem3D.h"
integer ispec,nspec
More information about the CIG-COMMITS
mailing list