[cig-commits] r8450 - seismo/2D/SPECFEM2D/trunk
walter at geodynamics.org
walter at geodynamics.org
Fri Dec 7 15:47:01 PST 2007
Author: walter
Date: 2007-12-07 15:47:00 -0800 (Fri, 07 Dec 2007)
New Revision: 8450
Modified:
seismo/2D/SPECFEM2D/trunk/Makefile
seismo/2D/SPECFEM2D/trunk/cree_image_PNM.f90
seismo/2D/SPECFEM2D/trunk/plotpost.f90
seismo/2D/SPECFEM2D/trunk/specfem2D.f90
seismo/2D/SPECFEM2D/trunk/write_seismograms.f90
Log:
added OUTPUT_FILES to output of 2D code, and improved Makefile to compile solver
with optimization but mesher without
Modified: seismo/2D/SPECFEM2D/trunk/Makefile
===================================================================
--- seismo/2D/SPECFEM2D/trunk/Makefile 2005-01-24 10:01:21 UTC (rev 8449)
+++ seismo/2D/SPECFEM2D/trunk/Makefile 2007-12-07 23:47:00 UTC (rev 8450)
@@ -9,23 +9,26 @@
# Portland Linux
#F90 = pgf90
-#FLAGS=-fast -Mnobounds -Minline -Mneginfo -Mdclchk
+#FLAGS_CHECK=-O0 -Mbounds -Mneginfo -Mdclchk
+#FLAGS_NOCHECK=-fast -Mnobounds -Minline -Mneginfo -Mdclchk
# Intel Linux
F90 = ifort
-#FLAGS=-O0 -implicitnone -warn stderrors -warn truncated_source -warn argument_checking -warn unused -warn declarations -std95 -check bounds
-FLAGS=-O3 -implicitnone -warn stderrors -warn truncated_source -warn argument_checking -warn unused -warn declarations -std95 -check nobounds
+FLAGS_CHECK=-O0 -implicitnone -warn stderrors -warn truncated_source -warn argument_checking -warn unused -warn declarations -std95 -check bounds
+FLAGS_NOCHECK=-O3 -implicitnone -warn stderrors -warn truncated_source -warn argument_checking -warn unused -warn declarations -std95 -check nobounds
+#FLAGS_NOCHECK = $(FLAGS_CHECK)
#
# g95 (free f95 compiler from http://www.g95.org, still under development, but works)
#
#F90 = g95
-#FLAGS = -O
+#FLAGS_CHECK = -O
+#FLAGS_NOCHECK = $(FLAGS_CHECK)
# Dec Alpha
#F90 = f90
-#FLAGS=-O0 -warn truncated_source -warn argument_checking -warn unused -warn declarations -std95 -check nounderflow -check bounds -C
-##FLAGS=-fast -warn truncated_source -warn argument_checking -warn unused -warn declarations -std95 -check nounderflow -check nobounds
+#FLAGS_CHECK=-O0 -warn truncated_source -warn argument_checking -warn unused -warn declarations -std95 -check nounderflow -check bounds -C
+#FLAGS_NOCHECK=-fast -warn truncated_source -warn argument_checking -warn unused -warn declarations -std95 -check nounderflow -check nobounds
LINK = $(F90)
@@ -46,83 +49,85 @@
/bin/rm -f xmeshfem2D xmeshfem2D.trace xspecfem2D xspecfem2D.trace $O/*.o *.o $O/*.il *.mod core *.gnu *.ps Ux*.bin Uz*.bin image*.pnm xconvolve_source_timefunction *receiver_line_* plotgnu source.txt *.sem*
meshfem2D: $(OBJS_MESHFEM2D)
- $(LINK) $(FLAGS) -o xmeshfem2D $(OBJS_MESHFEM2D)
+ $(LINK) $(FLAGS_CHECK) -o xmeshfem2D $(OBJS_MESHFEM2D)
+### use optimized compilation option for solver only
specfem2D: $(OBJS_SPECFEM2D)
- $(LINK) $(FLAGS) -o xspecfem2D $(OBJS_SPECFEM2D)
+ $(LINK) $(FLAGS_NOCHECK) -o xspecfem2D $(OBJS_SPECFEM2D)
convolve_source_timefunction: $O/convolve_source_timefunction.o
- ${F90} $(FLAGS) -o xconvolve_source_timefunction $O/convolve_source_timefunction.o
+ ${F90} $(FLAGS_CHECK) -o xconvolve_source_timefunction $O/convolve_source_timefunction.o
$O/checkgrid.o: checkgrid.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/checkgrid.o checkgrid.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/checkgrid.o checkgrid.f90
$O/meshfem2D.o: meshfem2D.f90
- ${F90} $(FLAGS) -c -o $O/meshfem2D.o meshfem2D.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/meshfem2D.o meshfem2D.f90
$O/createnum_fast.o: createnum_fast.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/createnum_fast.o createnum_fast.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/createnum_fast.o createnum_fast.f90
$O/createnum_slow.o: createnum_slow.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/createnum_slow.o createnum_slow.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/createnum_slow.o createnum_slow.f90
$O/convolve_source_timefunction.o: convolve_source_timefunction.f90
- ${F90} $(FLAGS) -c -o $O/convolve_source_timefunction.o convolve_source_timefunction.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/convolve_source_timefunction.o convolve_source_timefunction.f90
$O/datim.o: datim.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/datim.o datim.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/datim.o datim.f90
$O/defarrays.o: defarrays.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/defarrays.o defarrays.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/defarrays.o defarrays.f90
$O/lagrange_poly.o: lagrange_poly.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/lagrange_poly.o lagrange_poly.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/lagrange_poly.o lagrange_poly.f90
$O/gmat01.o: gmat01.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/gmat01.o gmat01.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/gmat01.o gmat01.f90
$O/gll_library.o: gll_library.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/gll_library.o gll_library.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/gll_library.o gll_library.f90
$O/define_derivative_matrices.o: define_derivative_matrices.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/define_derivative_matrices.o define_derivative_matrices.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/define_derivative_matrices.o define_derivative_matrices.f90
$O/plotgll.o: plotgll.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/plotgll.o plotgll.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/plotgll.o plotgll.f90
$O/plotpost.o: plotpost.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/plotpost.o plotpost.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/plotpost.o plotpost.f90
$O/locate_receivers.o: locate_receivers.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/locate_receivers.o locate_receivers.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/locate_receivers.o locate_receivers.f90
$O/recompute_jacobian.o: recompute_jacobian.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/recompute_jacobian.o recompute_jacobian.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/recompute_jacobian.o recompute_jacobian.f90
$O/locate_source_force.o: locate_source_force.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/locate_source_force.o locate_source_force.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/locate_source_force.o locate_source_force.f90
$O/locate_source_moment_tensor.o: locate_source_moment_tensor.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/locate_source_moment_tensor.o locate_source_moment_tensor.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/locate_source_moment_tensor.o locate_source_moment_tensor.f90
$O/define_shape_functions.o: define_shape_functions.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/define_shape_functions.o define_shape_functions.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/define_shape_functions.o define_shape_functions.f90
+### use optimized compilation option for solver only
$O/specfem2D.o: specfem2D.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/specfem2D.o specfem2D.f90
+ ${F90} $(FLAGS_NOCHECK) -c -o $O/specfem2D.o specfem2D.f90
$O/compute_gradient_attenuation.o: compute_gradient_attenuation.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/compute_gradient_attenuation.o compute_gradient_attenuation.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/compute_gradient_attenuation.o compute_gradient_attenuation.f90
$O/compute_gradient_fluid.o: compute_gradient_fluid.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/compute_gradient_fluid.o compute_gradient_fluid.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/compute_gradient_fluid.o compute_gradient_fluid.f90
$O/compute_arrays_source.o: compute_arrays_source.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/compute_arrays_source.o compute_arrays_source.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/compute_arrays_source.o compute_arrays_source.f90
$O/cree_image_PNM.o: cree_image_PNM.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/cree_image_PNM.o cree_image_PNM.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/cree_image_PNM.o cree_image_PNM.f90
$O/write_seismograms.o: write_seismograms.f90 constants.h
- ${F90} $(FLAGS) -c -o $O/write_seismograms.o write_seismograms.f90
+ ${F90} $(FLAGS_CHECK) -c -o $O/write_seismograms.o write_seismograms.f90
Modified: seismo/2D/SPECFEM2D/trunk/cree_image_PNM.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/cree_image_PNM.f90 2005-01-24 10:01:21 UTC (rev 8449)
+++ seismo/2D/SPECFEM2D/trunk/cree_image_PNM.f90 2007-12-07 23:47:00 UTC (rev 8450)
@@ -41,7 +41,7 @@
! ouverture du fichier image
write(nom_fichier,222) it
- 222 format('image',i5.5,'.pnm')
+ 222 format('OUTPUT_FILES/image',i5.5,'.pnm')
! ouvrir le fichier
open(unit=27, file=nom_fichier, status='unknown')
Modified: seismo/2D/SPECFEM2D/trunk/plotpost.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/plotpost.f90 2005-01-24 10:01:21 UTC (rev 8449)
+++ seismo/2D/SPECFEM2D/trunk/plotpost.f90 2007-12-07 23:47:00 UTC (rev 8450)
@@ -194,7 +194,7 @@
!
write(name,222) it
open(unit=24,file=name,status='unknown')
- 222 format('vect',i5.5,'.ps')
+ 222 format('OUTPUT_FILES/vect',i5.5,'.ps')
!
!---- ecriture de l'entete du fichier PostScript
Modified: seismo/2D/SPECFEM2D/trunk/specfem2D.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/specfem2D.f90 2005-01-24 10:01:21 UTC (rev 8449)
+++ seismo/2D/SPECFEM2D/trunk/specfem2D.f90 2007-12-07 23:47:00 UTC (rev 8450)
@@ -566,7 +566,7 @@
print *
print *,'Saving the grid in a text file...'
print *
- open(unit=55,file='gridpoints.txt',status='unknown')
+ open(unit=55,file='OUTPUT_FILES/gridpoints.txt',status='unknown')
write(55,*) npoin
do n = 1,npoin
write(55,*) n,(coord(i,n), i=1,NDIM)
@@ -624,7 +624,7 @@
print *
print *,'Reading velocity and density model from external file...'
print *
- open(unit=55,file='extmodel.txt',status='unknown')
+ open(unit=55,file='OUTPUT_FILES/extmodel.txt',status='unknown')
read(55,*) nbpoin
if(nbpoin /= npoin) stop 'Wrong number of points in input file'
do n = 1,npoin
@@ -815,7 +815,7 @@
print *
print *,'Reading initial fields from external file...'
print *
- open(unit=55,file='wavefields.txt',status='unknown')
+ open(unit=55,file='OUTPUT_FILES/wavefields.txt',status='unknown')
read(55,*) nbpoin
if(nbpoin /= npoin) stop 'Wrong number of points in input file'
allocate(displread(NDIM))
@@ -877,7 +877,7 @@
print *
print *,'Saving the source time function in a text file...'
print *
- open(unit=55,file='source.txt',status='unknown')
+ open(unit=55,file='OUTPUT_FILES/source.txt',status='unknown')
! boucle principale d'evolution en temps
do it = 1,NSTEP
Modified: seismo/2D/SPECFEM2D/trunk/write_seismograms.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/write_seismograms.f90 2005-01-24 10:01:21 UTC (rev 8449)
+++ seismo/2D/SPECFEM2D/trunk/write_seismograms.f90 2007-12-07 23:47:00 UTC (rev 8450)
@@ -73,7 +73,7 @@
if(length_network_name < 1 .or. length_network_name > MAX_LENGTH_NETWORK_NAME) stop 'wrong length of network name'
- write(sisname,"(a,'.',a,'.',a3,'.sem',a1)") station_name(irec)(1:length_station_name),&
+ write(sisname,"('OUTPUT_FILES/',a,'.',a,'.',a3,'.sem',a1)") station_name(irec)(1:length_station_name),&
network_name(irec)(1:length_network_name),chn,component
! save seismograms in text format with no subsampling.
@@ -104,14 +104,14 @@
! write seismograms in single precision binary format
! X component
- open(unit=11,file='Ux_file.bin',status='unknown',access='direct',recl=NSTEP*4)
+ open(unit=11,file='OUTPUT_FILES/Ux_file.bin',status='unknown',access='direct',recl=NSTEP*4)
do irec=1,nrec
write(11,rec=irec) (sngl(sisux(isample,irec)),isample=1,NSTEP)
enddo
close(11)
! Z component
- open(unit=11,file='Uz_file.bin',status='unknown',access='direct',recl=NSTEP*4)
+ open(unit=11,file='OUTPUT_FILES/Uz_file.bin',status='unknown',access='direct',recl=NSTEP*4)
do irec=1,nrec
write(11,rec=irec) (sngl(sisuz(isample,irec)),isample=1,NSTEP)
enddo
@@ -120,7 +120,7 @@
!----
! ligne de recepteurs pour Xsu
- open(unit=11,file='receiver_line_Xsu_XWindow',status='unknown')
+ open(unit=11,file='OUTPUT_FILES/receiver_line_Xsu_XWindow',status='unknown')
! subtract t0 from seismograms to get correct zero time
write(11,110) FACTORXSU,NSTEP,deltat,-t0,nrec
@@ -141,7 +141,7 @@
close(11)
! script de visualisation
- open(unit=11,file='show_receiver_line_Xsu',status='unknown')
+ open(unit=11,file='OUTPUT_FILES/show_receiver_line_Xsu',status='unknown')
write(11,100)
write(11,*)
write(11,*) '/bin/rm -f tempfile receiver_line_Xsu_postscript'
More information about the cig-commits
mailing list