[cig-commits] r16033 - in seismo/3D/SPECFEM3D_SESAME/trunk: . DATA
danielpeter at geodynamics.org
danielpeter at geodynamics.org
Tue Nov 24 14:44:32 PST 2009
Author: danielpeter
Date: 2009-11-24 14:44:31 -0800 (Tue, 24 Nov 2009)
New Revision: 16033
Modified:
seismo/3D/SPECFEM3D_SESAME/trunk/DATA/CMTSOLUTION.layered_halfspace
seismo/3D/SPECFEM3D_SESAME/trunk/DATA/Par_file.layered_halfspace
seismo/3D/SPECFEM3D_SESAME/trunk/Makefile.in
seismo/3D/SPECFEM3D_SESAME/trunk/compute_forces_with_Deville.f90
seismo/3D/SPECFEM3D_SESAME/trunk/flags.guess
seismo/3D/SPECFEM3D_SESAME/trunk/go_generate_database_pbs.sesame.bash
seismo/3D/SPECFEM3D_SESAME/trunk/go_solver_pbs.sesame.bash
Log:
bug fix to run solver in double precision (compute_forces_with_Deville.f90)
Modified: seismo/3D/SPECFEM3D_SESAME/trunk/DATA/CMTSOLUTION.layered_halfspace
===================================================================
--- seismo/3D/SPECFEM3D_SESAME/trunk/DATA/CMTSOLUTION.layered_halfspace 2009-11-24 18:24:44 UTC (rev 16032)
+++ seismo/3D/SPECFEM3D_SESAME/trunk/DATA/CMTSOLUTION.layered_halfspace 2009-11-24 22:44:31 UTC (rev 16033)
@@ -6,8 +6,8 @@
longitude: 67000.0
depth: -25000.0
Mrr: 1.000000e+23
-Mtt: 0.000000
-Mpp: 0.000000
+Mtt: 1.000000e+23
+Mpp: 1.000000e+23
Mrt: 0.000000
Mrp: 0.000000
Mtp: 0.000000
Modified: seismo/3D/SPECFEM3D_SESAME/trunk/DATA/Par_file.layered_halfspace
===================================================================
--- seismo/3D/SPECFEM3D_SESAME/trunk/DATA/Par_file.layered_halfspace 2009-11-24 18:24:44 UTC (rev 16032)
+++ seismo/3D/SPECFEM3D_SESAME/trunk/DATA/Par_file.layered_halfspace 2009-11-24 22:44:31 UTC (rev 16033)
@@ -38,7 +38,7 @@
SAVE_MESH_FILES = .true.
# path to store the local database file on each node
-LOCAL_PATH = /scratch/lustre/dpeter/SPECFEM3D_SESAME/DATABASES_MPI.FIG8
+LOCAL_PATH = DATABASES_MPI
# interval at which we output time step info and max of norm of displacement
NTSTEP_BETWEEN_OUTPUT_INFO = 500
Modified: seismo/3D/SPECFEM3D_SESAME/trunk/Makefile.in
===================================================================
--- seismo/3D/SPECFEM3D_SESAME/trunk/Makefile.in 2009-11-24 18:24:44 UTC (rev 16032)
+++ seismo/3D/SPECFEM3D_SESAME/trunk/Makefile.in 2009-11-24 22:44:31 UTC (rev 16033)
@@ -170,12 +170,12 @@
# default targets for the pure Fortran version
@COND_PYRE_FALSE at DEFAULT = \
+ at COND_PYRE_FALSE@ generate_databases \
+ at COND_PYRE_FALSE@ specfem3D \
@COND_PYRE_FALSE@ check_buffers_2D \
@COND_PYRE_FALSE@ combine_AVS_DX \
@COND_PYRE_FALSE@ convolve_source_timefunction \
@COND_PYRE_FALSE@ create_movie_shakemap_AVS_DX_GMT \
- at COND_PYRE_FALSE@ generate_databases \
- at COND_PYRE_FALSE@ specfem3D \
@COND_PYRE_FALSE@ $(EMPTY_MACRO)
default: $(DEFAULT)
Modified: seismo/3D/SPECFEM3D_SESAME/trunk/compute_forces_with_Deville.f90
===================================================================
--- seismo/3D/SPECFEM3D_SESAME/trunk/compute_forces_with_Deville.f90 2009-11-24 18:24:44 UTC (rev 16032)
+++ seismo/3D/SPECFEM3D_SESAME/trunk/compute_forces_with_Deville.f90 2009-11-24 22:44:31 UTC (rev 16033)
@@ -105,9 +105,9 @@
tempx1,tempx2,tempx3,tempy1,tempy2,tempy3,tempz1,tempz2,tempz3
! manually inline the calls to the Deville et al. (2002) routines
- real(kind=4), dimension(NGLLX,m2) :: B1_m1_m2_5points,B2_m1_m2_5points,B3_m1_m2_5points
- real(kind=4), dimension(m1,m2) :: C1_m1_m2_5points,C2_m1_m2_5points,C3_m1_m2_5points
- real(kind=4), dimension(m1,m2) :: E1_m1_m2_5points,E2_m1_m2_5points,E3_m1_m2_5points
+ real(kind=CUSTOM_REAL), dimension(NGLLX,m2) :: B1_m1_m2_5points,B2_m1_m2_5points,B3_m1_m2_5points
+ real(kind=CUSTOM_REAL), dimension(m1,m2) :: C1_m1_m2_5points,C2_m1_m2_5points,C3_m1_m2_5points
+ real(kind=CUSTOM_REAL), dimension(m1,m2) :: E1_m1_m2_5points,E2_m1_m2_5points,E3_m1_m2_5points
equivalence(dummyx_loc,B1_m1_m2_5points)
equivalence(dummyy_loc,B2_m1_m2_5points)
@@ -119,9 +119,9 @@
equivalence(newtempy1,E2_m1_m2_5points)
equivalence(newtempz1,E3_m1_m2_5points)
- real(kind=4), dimension(m2,NGLLX) :: A1_mxm_m2_m1_5points,A2_mxm_m2_m1_5points,A3_mxm_m2_m1_5points
- real(kind=4), dimension(m2,m1) :: C1_mxm_m2_m1_5points,C2_mxm_m2_m1_5points,C3_mxm_m2_m1_5points
- real(kind=4), dimension(m2,m1) :: E1_mxm_m2_m1_5points,E2_mxm_m2_m1_5points,E3_mxm_m2_m1_5points
+ real(kind=CUSTOM_REAL), dimension(m2,NGLLX) :: A1_mxm_m2_m1_5points,A2_mxm_m2_m1_5points,A3_mxm_m2_m1_5points
+ real(kind=CUSTOM_REAL), dimension(m2,m1) :: C1_mxm_m2_m1_5points,C2_mxm_m2_m1_5points,C3_mxm_m2_m1_5points
+ real(kind=CUSTOM_REAL), dimension(m2,m1) :: E1_mxm_m2_m1_5points,E2_mxm_m2_m1_5points,E3_mxm_m2_m1_5points
equivalence(dummyx_loc,A1_mxm_m2_m1_5points)
equivalence(dummyy_loc,A2_mxm_m2_m1_5points)
Modified: seismo/3D/SPECFEM3D_SESAME/trunk/flags.guess
===================================================================
--- seismo/3D/SPECFEM3D_SESAME/trunk/flags.guess 2009-11-24 18:24:44 UTC (rev 16032)
+++ seismo/3D/SPECFEM3D_SESAME/trunk/flags.guess 2009-11-24 22:44:31 UTC (rev 16033)
@@ -30,7 +30,7 @@
# ifort v 10.1 with these flags shows best performance
#FLAGS_CHECK="-O2 -ftz -xT -vec-report0 -std95 -implicitnone -check nobounds -assume byterecl -static-intel -warn truncated_source -warn argument_checking -warn unused -warn declarations -warn alignments -warn ignore_loc -warn usage "
- FLAGS_CHECK="-O2 -xT -static-intel -r8 -mcmodel=large -implicitnone -warn truncated_source -warn argument_checking -warn unused -warn declarations -check all -align sequence -assume byterecl -ftrapuv -fpe0 -ftz -traceback"
+ FLAGS_CHECK="-O2 -xT -static-intel -r8 -mcmodel=large -implicitnone -warn truncated_source -warn argument_checking -warn unused -warn declarations -check nobounds -align sequence -assume byterecl -ftrapuv -fpe0 -ftz -traceback"
fi
if test x"$FLAGS_NO_CHECK" = x; then
# standard options (leave option -ftz, which is *critical* for performance)
@@ -40,7 +40,7 @@
# ifort v 10.1 with these flags shows best performance
#FLAGS_NO_CHECK="-O2 -ftz -xT -vec-report0 -std95 -implicitnone -check nobounds -assume byterecl -static-intel -warn truncated_source -warn argument_checking -warn unused -warn declarations -warn alignments -warn ignore_loc -warn usage "
- FLAGS_NO_CHECK="-O2 -xT -static-intel -r8 -mcmodel=large -implicitnone -warn truncated_source -warn argument_checking -warn unused -warn declarations -check all -align sequence -assume byterecl -ftrapuv -fpe0 -ftz -traceback"
+ FLAGS_NO_CHECK="-O2 -xT -static-intel -r8 -mcmodel=large -implicitnone -warn truncated_source -warn argument_checking -warn unused -warn declarations -check nobounds -align sequence -assume byterecl -ftrapuv -fpe0 -ftz -traceback"
fi
;;
gfortran|*/gfortran|f95|*/f95)
Modified: seismo/3D/SPECFEM3D_SESAME/trunk/go_generate_database_pbs.sesame.bash
===================================================================
--- seismo/3D/SPECFEM3D_SESAME/trunk/go_generate_database_pbs.sesame.bash 2009-11-24 18:24:44 UTC (rev 16032)
+++ seismo/3D/SPECFEM3D_SESAME/trunk/go_generate_database_pbs.sesame.bash 2009-11-24 22:44:31 UTC (rev 16033)
@@ -6,13 +6,10 @@
#PBS -j oe
#PBS -o OUTPUT_FILES/job.o
-## 25 CPUs ( 1 + 3*8 ), walltime 10 hours
-##PBS -l nodes=3:ppn=8+1:ppn=1,walltime=10:00:00
-
## 4 CPUs ( 4 ), walltime 1 hour
#PBS -l nodes=1:ppn=4,walltime=1:00:00
-cd /home/cmorency/SPECFEM3D_SESAME/
+cd $PBS_O_WORKDIR
if [ -z $USER ]; then
echo "could not run go_mesher_...bash as no USER env is set"
Modified: seismo/3D/SPECFEM3D_SESAME/trunk/go_solver_pbs.sesame.bash
===================================================================
--- seismo/3D/SPECFEM3D_SESAME/trunk/go_solver_pbs.sesame.bash 2009-11-24 18:24:44 UTC (rev 16032)
+++ seismo/3D/SPECFEM3D_SESAME/trunk/go_solver_pbs.sesame.bash 2009-11-24 22:44:31 UTC (rev 16033)
@@ -6,13 +6,10 @@
#PBS -j oe
#PBS -o OUTPUT_FILES/job.o
-## 25 CPUs ( 1 + 3*8 ), walltime 10 hours
-##PBS -l nodes=3:ppn=8+1:ppn=1,walltime=10:00:00
-
## 4 CPUs ( 4 ), walltime 1 hour
#PBS -l nodes=1:ppn=4,walltime=1:00:00
-cd /home/cmorency/SPECFEM3D_SESAME/
+cd $PBS_O_WORKDIR
if [ -z $USER ]; then
echo "could not run go_solver_...bash as no USER env is set"
More information about the CIG-COMMITS
mailing list