[cig-commits] r8428 - seismo/2D/SPECFEM2D/trunk/MAILLE90

walter at geodynamics.org walter at geodynamics.org
Fri Dec 7 15:45:29 PST 2007


Author: walter
Date: 2007-12-07 15:45:28 -0800 (Fri, 07 Dec 2007)
New Revision: 8428

Added:
   seismo/2D/SPECFEM2D/trunk/MAILLE90/Makefile
Removed:
   seismo/2D/SPECFEM2D/trunk/MAILLE90/Par_poisson_minus_one
   seismo/2D/SPECFEM2D/trunk/MAILLE90/Par_rouen_aniso_ok
   seismo/2D/SPECFEM2D/trunk/MAILLE90/Par_rouen_iso_ok
Modified:
   seismo/2D/SPECFEM2D/trunk/MAILLE90/Par
   seismo/2D/SPECFEM2D/trunk/MAILLE90/meshfem2D.f90
Log:
added TURN_ANISOTROPY_ON and TURN_ATTENUATION_ON to Par_file, added Makefile,
changed starting column in Par_file from 15th to 34th


Added: seismo/2D/SPECFEM2D/trunk/MAILLE90/Makefile
===================================================================
--- seismo/2D/SPECFEM2D/trunk/MAILLE90/Makefile	2004-09-11 09:50:32 UTC (rev 8427)
+++ seismo/2D/SPECFEM2D/trunk/MAILLE90/Makefile	2007-12-07 23:45:28 UTC (rev 8428)
@@ -0,0 +1,38 @@
+#
+# Makefile for MESHFEM2D version 5.0
+#
+# Dimitri Komatitsch, Universite de Pau et des Pays de l'Adour, May 2004
+# 
+SHELL=/bin/sh
+
+O = obj
+
+# Portland Linux
+#F90 = pgf90
+#FLAGS=-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 -C
+FLAGS=-fast -implicitnone -warn stderrors -warn truncated_source -warn argument_checking -warn unused -warn declarations -std95 -check nobounds
+
+# 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
+
+LINK = $(F90) 
+EXEC = xmeshfem2D
+OBJS = $O/meshfem2D.o
+
+default: all
+
+clean:
+	/bin/rm -f $(EXEC) $(EXEC).trace $O/*.o *.o $O/*.il *.mod core *.gnu *.ps
+
+all: $(OBJS)
+	$(LINK) $(FLAGS) -o $(EXEC) $(OBJS)
+
+$O/meshfem2D.o: meshfem2D.f90
+	${F90} $(FLAGS) -c -o $O/meshfem2D.o meshfem2D.f90
+    

Modified: seismo/2D/SPECFEM2D/trunk/MAILLE90/Par
===================================================================
--- seismo/2D/SPECFEM2D/trunk/MAILLE90/Par	2004-09-11 09:50:32 UTC (rev 8427)
+++ seismo/2D/SPECFEM2D/trunk/MAILLE90/Par	2007-12-07 23:45:28 UTC (rev 8428)
@@ -1,81 +1,84 @@
 # ----------------------------------------------------------------
 #
 #    This is the parameter file
-#    Put variable names first and actual value after 15th column
+#    Put variable names first and actual value after 34th column
 #
 # ----------------------------------------------------------------
-<-           ->
+<-                              ->
 #
 # File names and path for different outputs
 #
-title         =Test pour INSA Rouen
-topofile      =topo_rouen.dat
-interffile    =none
+title                           = Test pour INSA Rouen
+topofile                        = topo_rouen.dat
+interffile                      = none
 #
 # geometry of the model (origin lower-left corner = 0,0) and mesh description
 #
-xmin          =0.0d0         ! abscissa of left side of the model
-xmax          =4000.d0       ! abscissa of right side of the model
-nx            =80            ! number of elements along X
-nz            =60            ! number of elements along Z
-ngnod         =4             ! nb noeuds de controle pour blocs generes (4 ou 9)
-ratio         =0.967741      ! ratio pour separation en deux zones
-initialfield  =.false.       ! use a plane wave as source or not
-ireadmodel    =.false.       ! use a plane wave as source or not
+xmin                            = 0.0d0          ! abscissa of left side of the model
+xmax                            = 4000.d0        ! abscissa of right side of the model
+nx                              = 80             ! number of elements along X
+nz                              = 60             ! number of elements along Z
+ngnod                           = 4              ! noeuds de controle pour blocs (4 ou 9)
+ratio                           = 0.967741       ! ratio pour separation en deux zones
+initialfield                    = .false.        ! use a plane wave as source or not
+ireadmodel                      = .false.        ! read external earth model or not
+TURN_ANISOTROPY_ON              = .false.        ! turn anisotropy on or off
+TURN_ATTENUATION_ON             = .false.        ! turn attenuation on or off
 #
 # absorbing boundaries parameters
 #
-absorbhaut    =.false.       ! Absorbing boundary active or not
-absorbbas     =.true.
-absorbgauche  =.true.
-absorbdroite  =.true.
+absorbhaut                      = .false.        ! absorbing boundary active or not
+absorbbas                       = .true.
+absorbgauche                    = .true.
+absorbdroite                    = .true.
 #
 # time step parameters
 #
-nt            =1600          ! nb total de pas de temps
-dt            =1.d-3         ! valeur du pas de temps
+nt                              = 1600           ! nb total de pas de temps
+dt                              = 1.d-3          ! valeur du pas de temps
 #
 # source parameters
 #
-isource_surf  =.false.       ! sources dans le volume ou a la surface
-xs            =2000.         ! source location x in meters
-zs            =1500.         ! source location z in meters
-f0            =10.0          ! central source frequency (Hz)
-t0            =0.11          ! time delay of the source in seconds
-source_type   =1             ! source type : force=1 or explosion=2
-angle         =0.            ! angle of the source (for a force only)
-factor        =1.d10         ! amplification factor
+isource_surf                    = .false.        ! sources dans le volume ou a la surface
+xs                              = 2000.          ! source location x in meters
+zs                              = 1500.          ! source location z in meters
+f0                              = 10.0           ! central source frequency (Hz)
+t0                              = 0.11           ! time delay of the source in seconds
+source_type                     = 1              ! source type : force=1 or explosion=2
+angle                           = 0.             ! angle of the source (for a force only)
+factor                          = 1.d10          ! amplification factor
 #
 # receiver line parameters
 #
-ienreg_surf   =.false.       ! enregistrement dans le volume ou a la surface
-isismostype   =2             ! record 1=displacement 2=velocity 3=acceleration
-nrec          =11            ! number of receivers
-xdeb          =0.            ! first receiver x in meters
-zdeb          =2200.         ! first receiver z in meters
-xfin          =4000.         ! last receiver x in meters
-zfin          =2200.         ! last receiver z in meters
-anglerec      =0.d0          ! angle to rotate the components at the receivers
+ienreg_surf                     = .false.        ! enregistrement volume ou surface
+isismostype                     = 2              ! record 1=displ 2=veloc 3=accel
+nrec                            = 11             ! number of receivers
+xdeb                            = 0.             ! first receiver x in meters
+zdeb                            = 2200.          ! first receiver z in meters
+xfin                            = 4000.          ! last receiver x in meters
+zfin                            = 2200.          ! last receiver z in meters
+anglerec                        = 0.d0           ! angle to rotate components at receivers
 #
 # display parameters
 #
-itaff         =100           ! display frequency in time steps
-ivecttype     =2             ! display 1=displacement 2=velocity 3=acceleration
-cutvect       =1.            ! amplitude min affichee en % pour vector plots
-imeshvect     =.true.        ! display mesh on vector plots or not
-imodelvect    =.false.       ! display velocity model on vector plots or not
-iboundvect    =.true.        ! display boundary conditions on vector plots
-interpol      =.true.        ! interpolation of the display or not
-iptsdisp      =6             ! nb of points for interpolation of the display
-isubsamp      =2             ! subsampling of color snapshots
-ignuplot      =.false.       ! generate a GNUPLOT file for the grid
-ioutputgrid   =.false.       ! save the grid in a text file or not
+itaff                           = 100            ! display frequency in time steps
+ivecttype                       = 2              ! display 1=displ 2=veloc 3=accel
+cutvect                         = 1.             ! amplitude min en % pour vector plots
+imeshvect                       = .true.         ! display mesh on vector plots or not
+imodelvect                      = .false.        ! display velocity model on vector plots
+iboundvect                      = .true.         ! display boundary conditions on plots
+interpol                        = .true.         ! interpolation of the display or not
+iptsdisp                        = 6              ! points for interpolation of display
+isubsamp                        = 2              ! subsampling of color snapshots
+ignuplot                        = .false.        ! generate a GNUPLOT file for the grid
+ioutputgrid                     = .false.        ! save the grid in a text file or not
 #
 # velocity and density model (nx,nz)
 #
-nbmodels      =2             ! nb de modeles differents (rho,vp,vs)
+nbmodels                        = 2              ! nb de modeles differents (rho,vp,vs)
 1 0 2200.d0 2500.d0 1443.375d0 0 0
 2 0 2200.d0 2500.d0 1443.375d0 0 0
-nbzone        =2             ! nb of zones and model number for each zone
+nbzone                          = 2              ! nb of zones and model number for each
 1 80 1 60 1
 3 51 3 38 2
+

Deleted: seismo/2D/SPECFEM2D/trunk/MAILLE90/Par_poisson_minus_one
===================================================================
--- seismo/2D/SPECFEM2D/trunk/MAILLE90/Par_poisson_minus_one	2004-09-11 09:50:32 UTC (rev 8427)
+++ seismo/2D/SPECFEM2D/trunk/MAILLE90/Par_poisson_minus_one	2007-12-07 23:45:28 UTC (rev 8428)
@@ -1,79 +0,0 @@
-# ----------------------------------------------------------------
-#
-#    This is the parameter file
-#    Put variable names first and actual value after 15th column
-#
-# ----------------------------------------------------------------
-<-           ->
-#
-# File names and path for different outputs
-#
-title         =Test pour INSA Rouen
-topofile      =topo_rouen.dat
-interffile    =none
-#
-# geometry of the model (origin lower-left corner = 0,0) and mesh description
-#
-xmin          =0.0d0         ! abscissa of left side of the model
-xmax          =4000.d0       ! abscissa of right side of the model
-nx            =80            ! number of elements along X
-nz            =60            ! number of elements along Z
-ngnod         =4             ! nb noeuds de controle pour blocs generes (4 ou 9)
-ratio         =0.967741      ! ratio pour separation en deux zones
-initialfield  =.false.       ! use a plane wave as source or not
-ireadmodel    =.false.       ! use a plane wave as source or not
-#
-# absorbing boundaries parameters
-#
-absorbhaut    =.false.       ! Absorbing boundary active or not
-absorbbas     =.true.
-absorbgauche  =.true.
-absorbdroite  =.true.
-#
-# time step parameters
-#
-nt            =1600          ! nb total de pas de temps
-dt            =1.d-3         ! valeur du pas de temps
-#
-# source parameters
-#
-isource_surf  =.false.       ! sources dans le volume ou a la surface
-xs            =2000.         ! source location x in meters
-zs            =2900.         ! source location z in meters
-f0            =10.0          ! central source frequency (Hz)
-t0            =0.11          ! time delay of the source in seconds
-source_type   =1             ! source type : force=1 or explosion=2
-angle         =0.            ! angle of the source (for a force only)
-factor        =1.d10         ! amplification factor
-#
-# receiver line parameters
-#
-ienreg_surf   =.true.        ! enregistrement dans le volume ou a la surface
-isismostype   =2             ! record 1=displacement 2=velocity 3=acceleration
-nrec          =11            ! number of receivers
-xdeb          =0.            ! first receiver x in meters
-zdeb          =2200.         ! first receiver z in meters
-xfin          =4000.         ! last receiver x in meters
-zfin          =2200.         ! last receiver z in meters
-anglerec      =0.d0          ! angle to rotate the components at the receivers
-#
-# display parameters
-#
-itaff         =100           ! display frequency in time steps
-ivecttype     =2             ! display 1=displacement 2=velocity 3=acceleration
-cutvect       =1.            ! amplitude min affichee en % pour vector plots
-imeshvect     =.true.        ! display mesh on vector plots or not
-imodelvect    =.false.       ! display velocity model on vector plots or not
-iboundvect    =.true.        ! display boundary conditions on vector plots
-interpol      =.true.        ! interpolation of the display or not
-iptsdisp      =6             ! nb of points for interpolation of the display
-isubsamp      =2             ! subsampling of color snapshots
-ignuplot      =.false.       ! generate a GNUPLOT file for the grid
-ioutputgrid   =.false.       ! save the grid in a text file or not
-#
-# velocity and density model (nx,nz)
-#
-nbmodels      =1             ! nb de modeles differents (rho,vp,vs)
-1 0 2200.d0 2500.d0 2165.d0 0 0
-nbzone        =1             ! nb of zones and model number for each zone
-1 80 1 60 1

Deleted: seismo/2D/SPECFEM2D/trunk/MAILLE90/Par_rouen_aniso_ok
===================================================================
--- seismo/2D/SPECFEM2D/trunk/MAILLE90/Par_rouen_aniso_ok	2004-09-11 09:50:32 UTC (rev 8427)
+++ seismo/2D/SPECFEM2D/trunk/MAILLE90/Par_rouen_aniso_ok	2007-12-07 23:45:28 UTC (rev 8428)
@@ -1,81 +0,0 @@
-# ----------------------------------------------------------------
-#
-#    This is the parameter file
-#    Put variable names first and actual value after 15th column
-#
-# ----------------------------------------------------------------
-<-           ->
-#
-# File names and path for different outputs
-#
-title         =Test pour INSA Rouen full anisotropy
-topofile      =topo_rouen_aniso.dat
-interffile    =none
-#
-# geometry of the model (origin lower-left corner = 0,0) and mesh description
-#
-xmin          =0.0d0         ! abscissa of left side of the model
-xmax          =0.06d0        ! abscissa of right side of the model
-nx            =80            ! number of elements along X
-nz            =80            ! number of elements along Z
-ngnod         =4             ! nb noeuds de controle pour blocs generes (4 ou 9)
-ratio         =0.967741      ! ratio pour separation en deux zones
-initialfield  =.false.       ! use a plane wave as source or not
-ireadmodel    =.false.       ! use a plane wave as source or not
-#
-# absorbing boundaries parameters
-#
-absorbhaut    =.false.       ! Absorbing boundary active or not
-absorbbas     =.false.
-absorbgauche  =.false.
-absorbdroite  =.false.
-#
-# time step parameters
-#
-nt            =1400          ! nb total de pas de temps
-dt            =10.d-9        ! valeur du pas de temps
-#
-# source parameters
-#
-isource_surf  =.false.       ! sources dans le volume ou a la surface
-xs            =0.03d0        ! source location x in meters
-zs            =0.03d0        ! source location z in meters
-f0            =1.3d6         ! central source frequency (Hz)
-t0            =0.0000008d0   ! time delay of the source in seconds
-source_type   =1             ! source type : force=1 or explosion=2
-angle         =0.            ! angle of the source (for a force only)
-factor        =1.d6          ! amplification factor
-#
-# receiver line parameters
-#
-ienreg_surf   =.false.       ! enregistrement dans le volume ou a la surface
-isismostype   =1             ! record 1=displacement 2=velocity 3=acceleration
-nrec          =11            ! number of receivers
-xdeb          =0.            ! first receiver x in meters
-zdeb          =0.048d0       ! first receiver z in meters
-xfin          =0.06d0        ! last receiver x in meters
-zfin          =0.048d0       ! last receiver z in meters
-anglerec      =0.d0          ! angle to rotate the components at the receivers
-#
-# display parameters
-#
-itaff         =100           ! display frequency in time steps
-ivecttype     =1             ! display 1=displacement 2=velocity 3=acceleration
-cutvect       =1.            ! amplitude min affichee en % pour vector plots
-imeshvect     =.true.        ! display mesh on vector plots or not
-imodelvect    =.false.       ! display velocity model on vector plots or not
-iboundvect    =.true.        ! display boundary conditions on vector plots
-interpol      =.true.        ! interpolation of the display or not
-iptsdisp      =6             ! nb of points for interpolation of the display
-isubsamp      =2             ! subsampling of color snapshots
-ignuplot      =.false.       ! generate a GNUPLOT file for the grid
-ioutputgrid   =.false.       ! save the grid in a text file or not
-#
-# velocity and density model (nx,nz)
-#
-nbmodels      =2             ! nb de modeles differents (rho,vp,vs)
-1 0 8920.d0 2500.d0 1443.375d0 0 0
-2 0 8920.d0 2500.d0 1443.375d0 0 0
-nbzone        =2             ! nb of zones and model number for each zone
-1 80 1 80 1
-3 51 3 38 2

Deleted: seismo/2D/SPECFEM2D/trunk/MAILLE90/Par_rouen_iso_ok
===================================================================
--- seismo/2D/SPECFEM2D/trunk/MAILLE90/Par_rouen_iso_ok	2004-09-11 09:50:32 UTC (rev 8427)
+++ seismo/2D/SPECFEM2D/trunk/MAILLE90/Par_rouen_iso_ok	2007-12-07 23:45:28 UTC (rev 8428)
@@ -1,81 +0,0 @@
-# ----------------------------------------------------------------
-#
-#    This is the parameter file
-#    Put variable names first and actual value after 15th column
-#
-# ----------------------------------------------------------------
-<-           ->
-#
-# File names and path for different outputs
-#
-title         =Test pour INSA Rouen
-topofile      =topo_rouen.dat
-interffile    =none
-#
-# geometry of the model (origin lower-left corner = 0,0) and mesh description
-#
-xmin          =0.0d0         ! abscissa of left side of the model
-xmax          =4000.d0       ! abscissa of right side of the model
-nx            =80            ! number of elements along X
-nz            =60            ! number of elements along Z
-ngnod         =4             ! nb noeuds de controle pour blocs generes (4 ou 9)
-ratio         =0.967741      ! ratio pour separation en deux zones
-initialfield  =.false.       ! use a plane wave as source or not
-ireadmodel    =.false.       ! use a plane wave as source or not
-#
-# absorbing boundaries parameters
-#
-absorbhaut    =.false.       ! Absorbing boundary active or not
-absorbbas     =.true.
-absorbgauche  =.true.
-absorbdroite  =.true.
-#
-# time step parameters
-#
-nt            =1600          ! nb total de pas de temps
-dt            =1.d-3         ! valeur du pas de temps
-#
-# source parameters
-#
-isource_surf  =.false.       ! sources dans le volume ou a la surface
-xs            =2000.         ! source location x in meters
-zs            =1500.         ! source location z in meters
-f0            =10.0          ! central source frequency (Hz)
-t0            =0.11          ! time delay of the source in seconds
-source_type   =1             ! source type : force=1 or explosion=2
-angle         =0.            ! angle of the source (for a force only)
-factor        =1.d10         ! amplification factor
-#
-# receiver line parameters
-#
-ienreg_surf   =.false.       ! enregistrement dans le volume ou a la surface
-isismostype   =2             ! record 1=displacement 2=velocity 3=acceleration
-nrec          =11            ! number of receivers
-xdeb          =0.            ! first receiver x in meters
-zdeb          =2200.         ! first receiver z in meters
-xfin          =4000.         ! last receiver x in meters
-zfin          =2200.         ! last receiver z in meters
-anglerec      =0.d0          ! angle to rotate the components at the receivers
-#
-# display parameters
-#
-itaff         =100           ! display frequency in time steps
-ivecttype     =2             ! display 1=displacement 2=velocity 3=acceleration
-cutvect       =1.            ! amplitude min affichee en % pour vector plots
-imeshvect     =.true.        ! display mesh on vector plots or not
-imodelvect    =.false.       ! display velocity model on vector plots or not
-iboundvect    =.true.        ! display boundary conditions on vector plots
-interpol      =.true.        ! interpolation of the display or not
-iptsdisp      =6             ! nb of points for interpolation of the display
-isubsamp      =2             ! subsampling of color snapshots
-ignuplot      =.false.       ! generate a GNUPLOT file for the grid
-ioutputgrid   =.false.       ! save the grid in a text file or not
-#
-# velocity and density model (nx,nz)
-#
-nbmodels      =2             ! nb de modeles differents (rho,vp,vs)
-1 0 2200.d0 2500.d0 1443.375d0 0 0
-2 0 2200.d0 2500.d0 1443.375d0 0 0
-nbzone        =2             ! nb of zones and model number for each zone
-1 80 1 60 1
-3 51 3 38 2

Modified: seismo/2D/SPECFEM2D/trunk/MAILLE90/meshfem2D.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/MAILLE90/meshfem2D.f90	2004-09-11 09:50:32 UTC (rev 8427)
+++ seismo/2D/SPECFEM2D/trunk/MAILLE90/meshfem2D.f90	2007-12-07 23:45:28 UTC (rev 8428)
@@ -50,7 +50,7 @@
   character(len=50) file1
 
   character(len=50) interffile,topofile,title
-  character(len=15) junk
+  character(len=34) junk
 
   integer imatnum,inumabs,inumelem,netyp
   integer nelemabs,npgeo,nspec,ninterf,ntopo
@@ -78,6 +78,7 @@
   logical imeshvect
   logical initialfield
   logical imodelvect,iboundvect
+  logical TURN_ANISOTROPY_ON,TURN_ATTENUATION_ON
 
   integer, external :: num
   double precision, external :: bottom,spl,dens
@@ -125,6 +126,8 @@
   read(10,1)junk,ratio
   read(10,4)junk,initialfield
   read(10,4)junk,ireadmodel
+  read(10,4)junk,TURN_ANISOTROPY_ON
+  read(10,4)junk,TURN_ATTENUATION_ON
 
   nxread = nx
   nzread = nz
@@ -660,8 +663,8 @@
   write(15,*) 'isismostype ivecttype'
   write(15,*) isismostype,ivecttype
 
-  write(15,*) 'ireadmodel ioutputgrid'
-  write(15,*) ireadmodel,ioutputgrid
+  write(15,*) 'ireadmodel ioutputgrid TURN_ANISOTROPY_ON TURN_ATTENUATION_ON'
+  write(15,*) ireadmodel,ioutputgrid,TURN_ANISOTROPY_ON,TURN_ATTENUATION_ON
 
   write(15,*) 'ncycl dtinc'
   write(15,*) nt,dt



More information about the cig-commits mailing list