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

walter at geodynamics.org walter at geodynamics.org
Fri Dec 7 15:44:25 PST 2007


Author: walter
Date: 2007-12-07 15:44:24 -0800 (Fri, 07 Dec 2007)
New Revision: 8416

Added:
   seismo/2D/SPECFEM2D/trunk/MAILLE90/topo_rouen.dat
Removed:
   seismo/2D/SPECFEM2D/trunk/MAILLE90/maille_struct.f90
Modified:
   seismo/2D/SPECFEM2D/trunk/MAILLE90/Par
   seismo/2D/SPECFEM2D/trunk/MAILLE90/maille.f90
   seismo/2D/SPECFEM2D/trunk/MAILLE90/maille_non_struct_2.f90
   seismo/2D/SPECFEM2D/trunk/MAILLE90/maille_non_struct_3.f90
Log:
modified mesher in SEM_2D_Dimitri/MAILLE90


Modified: seismo/2D/SPECFEM2D/trunk/MAILLE90/Par
===================================================================
--- seismo/2D/SPECFEM2D/trunk/MAILLE90/Par	2007-12-07 23:44:19 UTC (rev 8415)
+++ seismo/2D/SPECFEM2D/trunk/MAILLE90/Par	2007-12-07 23:44:24 UTC (rev 8416)
@@ -8,16 +8,16 @@
 #
 # File names and path for different outputs
 #
-title         =PML thin slice periodic conditions
-topofile      =topoPMLthinslice.dat
+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          =15.d0         ! abscissa of right side of the model
-nx            =20            ! number of elements along X
-nz            =100            ! number of elements along Z
+xmax          =4000.d0       ! abscissa of right side of the model
+nx            =64            ! number of elements along X
+nz            =48            ! number of elements along Z
 idegpoly      =5             ! degre approximation spectrale (nb points - 1)
 ngnod         =4             ! nb noeuds de controle pour blocs generes (4 ou 9)
 ratio         =0.967741      ! ratio pour separation en deux zones
@@ -27,17 +27,17 @@
 #
 # absorbing boundaries parameters
 #
-absorbhaut    =.false.       ! Absorbing boundary active or not 
-absorbbas     =.false.      
-absorbgauche  =.false.      
-absorbdroite  =.false.      
-periohaut     =.true.        ! Periodic boundary active or not
+absorbhaut    =.false.       ! Absorbing boundary active or not
+absorbbas     =.true.
+absorbgauche  =.true.
+absorbdroite  =.true.
+periohaut     =.false.       ! Periodic boundary active or not
 periogauche   =.false.
 #
 # time step parameters
 #
-nt            =7500          ! nb total de pas de temps
-dt            =2.e-5        ! valeur du pas de temps
+nt            =8000          ! nb total de pas de temps
+dt            =0.25e-3       ! valeur du pas de temps
 niter         =1             ! nb d'iterations de corrector
 #
 # sources parameters
@@ -46,34 +46,34 @@
 isources_surf =.false.       ! sources dans le volume ou a la surface
 valseuil      =5.            ! threshold for maximum frequency of the source
 freqmaxrep    =3000.         ! maximum frequency for plots of source function
-# source #1	
-xs            =9.0          ! source location x in meters    4.5
-zs            =27.75         ! source location z in meters
-f0            =700.0          ! central source frequency (Hz)
-t0            =0.0015d0        ! time delay of the source in seconds
+# source #1
+xs            =2000.         ! source location x in meters
+zs            =1500.         ! source location z in meters
+f0            =12.0          ! central source frequency (Hz)
+t0            =0.09          ! time delay of the source in seconds
 source_type   =1             ! source type : force=1 or explosion=2
 itimetype     =6             ! time type : dirac=7 ricker=6 first_deriv=5
-angle         =0.           ! angle of the source (for a force only) -90.
+angle         =0.            ! angle of the source (for a force only)
 factor        =1.d10         ! amplification factor
 #
 # receiver line parameters
 #
 sismos        =.true.        ! store the seismograms or not
-isamp         =5             ! sampling rate for seismogram output
-ienreg_surf   =.false.        ! enregistrement dans le volume ou a la surface
+isamp         =1             ! sampling rate for seismogram output
+ienreg_surf   =.false.       ! enregistrement dans le volume ou a la surface
 isismostype   =1             ! record 1=displacement 2=velocity 3=acceleration
 ### first line ###
-nrec          =2             ! number of receivers
-xdeb          =3.75d0        ! first receiver x in meters	   10.5
-zdeb          =33.75d0        ! first receiver z in meters	
-xfin          =3.75d0        ! last receiver x in meters
-zfin          =33.75d0        ! last receiver z in meters
-anglerec      =0.d0         ! angle to rotate the components at the receivers
+nrec          =10            ! 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
 irepr         =1             ! representation (1=X 2=Z 3=distance)
 ### second line (optional) ###
-nrec2         =0              ! number of receivers
-xfin2         =3900.d0        ! last receiver x in meters
-zfin2         =1920.d0        ! last receiver z in meters
+nrec2         =0             ! number of receivers
+xfin2         =3900.d0       ! last receiver x in meters
+zfin2         =1920.d0       ! last receiver z in meters
 anglerec2     =0.d0          ! angle to rotate the components at the receivers
 ###
 factorxsu     =3.5           ! factor for Seismic Unix seismograms
@@ -84,16 +84,16 @@
 # display parameters
 #
 display       =.true.        ! display the simulation using PostScript or not
-itaff         =200            ! display frequency in time steps
+itaff         =100           ! display frequency in time steps
 itfirstaff    =5             ! time step of first display
-iaffinfo      =40            ! interval in time steps to output some basic info
+iaffinfo      =100           ! interval in time steps to output some basic info
 ivectplot     =.true.        ! vector plots or not
 ivecttype     =1             ! display 1=displacement 2=velocity 3=acceleration
-cutvect       =0.5           ! amplitude min affichee en % pour vector plots
+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      =.false.        ! interpolation of the display or not
+interpol      =.false.       ! interpolation of the display or not
 iptsdisp      =6             ! nb of points for interpolation of the display
 isubsamp      =2             ! subsampling of color snapshots
 scalex        =1.            ! X-scaling du display pour PostScript
@@ -103,16 +103,15 @@
 orig_x        =2.4d0         ! X-axis origin of PostScript plot in centimeters
 orig_z        =2.9d0         ! Z-axis origin of PostScript plot in centimeters
 ignuplot      =.false.       ! generate a GNUPLOT file for the grid
-iavs          =.false.        ! generate an AVS file for the grid and data
+iavs          =.false.       ! generate an AVS file for the grid and data
 ioutputgrid   =.false.       ! save the grid in a text file or not
 compenergy    =.false.       ! compute the total and potential energy or not
 #
 # velocity and density model (nx,nz)
 #
-nbmodels      =2             ! nb de modeles differents (rho,vp,vs) 1400.
-1 0 2200.d0 2000.d0 1154.73d0 0 0
-2 0 2200.d0 2000.d0 1154.73d0 0 0
-nbzone        =3             ! nb of zones and model number for each zone
-1 20 1   100 1
-17 20 1   100 2
-1  4 1   100 2
+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 64 1  48 1
+3 51 3  38 2

Modified: seismo/2D/SPECFEM2D/trunk/MAILLE90/maille.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/MAILLE90/maille.f90	2007-12-07 23:44:19 UTC (rev 8415)
+++ seismo/2D/SPECFEM2D/trunk/MAILLE90/maille.f90	2007-12-07 23:44:24 UTC (rev 8416)
@@ -24,7 +24,7 @@
 
 ! variables needed to compute the transformation
   double precision, allocatable :: psi(:),eta(:),absx(:), &
-      a00(:),a01(:),valeta(:),bot0(:),top0(:),bot_p(:),top_p(:)
+      a00(:),a01(:),valeta(:),bot0(:),top0(:)
 
 ! stockage du modele de vitesse et densite
   double precision, allocatable :: rho(:),cp(:),cs(:),aniso3(:),aniso4(:)
@@ -95,15 +95,14 @@
   open(unit=10,file='Par',status='old')
 
 ! formats
-
- 1 format(a,f20.8)
- 2 format(a,i20)
+ 1 format(a,f12.5)
+ 2 format(a,i8)
  3 format(a,a)
- 4 format(a,l20)
+ 4 format(a,l8)
 
 ! read the header
   do i=1,10
-  read(10,*)
+    read(10,*)
   enddo
 
 ! read file names and path for output
@@ -137,8 +136,8 @@
 
 ! multiplier par 2 si elements 9 noeuds
   if(ngnod == 9) then
-      nx = nx * 2
-      nz = nz * 2
+    nx = nx * 2
+    nz = nz * 2
   endif
 
 ! skip comment
@@ -186,24 +185,23 @@
   allocate(factor(nbsources))
 
   do i=1,nbsources
-      read(10,*)
-      read(10,1)junk,xs(i)
-      read(10,1)junk,zs(i)
-      read(10,1)junk,f0(i)
-      read(10,1)junk,t0(i)
-      read(10,2)junk,isource_type(i)
-      read(10,2)junk,itimetype(i)
-      read(10,1)junk,angle(i)
-      read(10,1)junk,factor(i)
+    read(10,*)
+    read(10,1)junk,xs(i)
+    read(10,1)junk,zs(i)
+    read(10,1)junk,f0(i)
+    read(10,1)junk,t0(i)
+    read(10,2)junk,isource_type(i)
+    read(10,2)junk,itimetype(i)
+    read(10,1)junk,angle(i)
+    read(10,1)junk,factor(i)
 
-      print *
-      print *,' Source #',i
-      print *,'Position xs, zs = ',xs(i),zs(i)
-      print *,'Frequency, delay = ',f0(i),t0(i)
-      print *,'Source type (1=force 2=explo) : ', &
-                    isource_type(i)
-      print *,'Angle of the source if force = ',angle(i)
-      print *,'Multiplying factor = ',factor(i)
+    print *
+    print *,' Source #',i
+    print *,'Position xs, zs = ',xs(i),zs(i)
+    print *,'Frequency, delay = ',f0(i),t0(i)
+    print *,'Source type (1=force 2=explo) : ',isource_type(i)
+    print *,'Angle of the source if force = ',angle(i)
+    print *,'Multiplying factor = ',factor(i)
   enddo
 
 ! skip comment
@@ -402,14 +400,14 @@
 ! stocker le modele de vitesse et densite
    do i=ixdebzone,ixfinzone
       do j=izdebzone,izfinzone
-  if(ngnod == 4) then
-  num_modele(i,j) = imodnum
-  else
-  num_modele(2*(i-1)+1,2*(j-1)+1) = imodnum
-  num_modele(2*(i-1)+1,2*(j-1)+2) = imodnum
-  num_modele(2*(i-1)+2,2*(j-1)+1) = imodnum
-  num_modele(2*(i-1)+2,2*(j-1)+2) = imodnum
-  endif
+        if(ngnod == 4) then
+          num_modele(i,j) = imodnum
+        else
+          num_modele(2*(i-1)+1,2*(j-1)+1) = imodnum
+          num_modele(2*(i-1)+1,2*(j-1)+2) = imodnum
+          num_modele(2*(i-1)+2,2*(j-1)+1) = imodnum
+          num_modele(2*(i-1)+2,2*(j-1)+2) = imodnum
+        endif
       enddo
    enddo
 
@@ -432,15 +430,14 @@
   allocate(valeta(0:nz))
   allocate(bot0(0:nx))
   allocate(top0(0:nx))
-  allocate(bot_p(0:nx))
-  allocate(top_p(0:nx))
 
 ! calcul des points regulierement espaces
   do i=0,nx
-        psi(i) = i/dble(nx)
+    psi(i) = i/dble(nx)
   enddo
+
   do j=0,nz
-        eta(j) = j/dble(nz)
+    eta(j) = j/dble(nz)
   enddo
 
 ! quelques verifications de base a faire
@@ -486,7 +483,7 @@
   allocate(coefs_topo(ntopo))
 
   do i=1,ntopo
-       read(15,*) xtopo(i),ztopo(i)
+    read(15,*) xtopo(i),ztopo(i)
   enddo
   close(15)
 
@@ -503,12 +500,12 @@
   allocate(coefs_interf(ninterf))
 
   do i=1,ninterf
-       read(15,*) xinterf(i),zinterf(i)
+    read(15,*) xinterf(i),zinterf(i)
   enddo
 
   close(15)
   else
-      print *,'*** No interface file specified ***'
+    print *,'*** No interface file specified ***'
   endif
 
 ! check the values read
@@ -546,9 +543,7 @@
   print *, 'Position (x,z) des ',nbsources,' sources'
   print *
   do i=1,nbsources
-   if(isources_surf) then
-      zs(i) = spl(xs(i),xtopo,ztopo,coefs_topo,ntopo)
-   endif
+   if(isources_surf) zs(i) = spl(xs(i),xtopo,ztopo,coefs_topo,ntopo)
    print *, 'Source ',i,' = ',xs(i),zs(i)
   enddo
 
@@ -557,15 +552,13 @@
   print *, 'Position (x,z) des ',nrec,' receivers'
   print *
   do irec=1,nrec
-   if(ienreg_surf) then
-      zrec(irec) = spl(xrec(irec),xtopo,ztopo,coefs_topo,ntopo)
-   endif
+   if(ienreg_surf) zrec(irec) = spl(xrec(irec),xtopo,ztopo,coefs_topo,ntopo)
    print *, 'Receiver ',irec,' = ',xrec(irec),zrec(irec)
   enddo
 
 !--- definition du maillage suivant X
   do ix=0,nx
-          absx(ix) = dens(ix,psi,xmin,xmax,nx)
+    absx(ix) = dens(ix,psi,xmin,xmax,nx)
   enddo
 
   if (interffile == 'none') then
@@ -573,16 +566,14 @@
 ! *** une seule zone si pas d'interface specifiee
 
   do iz=0,nz
-  valeta(iz) = eta(iz)
-  a00(iz) = 1-valeta(iz)
-  a01(iz) = valeta(iz)
+    valeta(iz) = eta(iz)
+    a00(iz) = 1-valeta(iz)
+    a01(iz) = valeta(iz)
   enddo
 
   do ix=0,nx
-          bot0(ix) = bottom(absx(ix))
-          top0(ix) = spl(absx(ix),xtopo,ztopo,coefs_topo,ntopo)
-          bot_p(ix) = botprime(absx(ix))
-          top_p(ix) = spl_prime(absx(ix),xtopo,ztopo,coefs_topo,ntopo)
+    bot0(ix) = bottom(absx(ix))
+    top0(ix) = spl(absx(ix),xtopo,ztopo,coefs_topo,ntopo)
   enddo
 
 ! valeurs de x et y pour display domaine physique
@@ -602,16 +593,14 @@
 ! *** ZONE DU BAS ***
 
   do iz=0,ncut
-  valeta(iz) = dble(iz)/(nz*ratio)
-  a00(iz) = 1-valeta(iz)
-  a01(iz) = valeta(iz)
+    valeta(iz) = dble(iz)/(nz*ratio)
+    a00(iz) = 1-valeta(iz)
+    a01(iz) = valeta(iz)
   enddo
 
   do ix=0,nx
-          bot0(ix) = bottom(absx(ix))
-          top0(ix) = spl(absx(ix),xinterf,zinterf,coefs_interf,ninterf)
-          bot_p(ix) = botprime(absx(ix))
-          top_p(ix) = spl_prime(absx(ix),xinterf,zinterf,coefs_interf,ninterf)
+    bot0(ix) = bottom(absx(ix))
+    top0(ix) = spl(absx(ix),xinterf,zinterf,coefs_interf,ninterf)
   enddo
 
 ! valeurs de x et y pour display domaine physique
@@ -633,8 +622,6 @@
   do ix=0,nx
     bot0(ix) = spl(absx(ix),xinterf,zinterf,coefs_interf,ninterf)
     top0(ix) = spl(absx(ix),xtopo,ztopo,coefs_topo,ntopo)
-    bot_p(ix) = spl_prime(absx(ix),xinterf,zinterf,coefs_interf,ninterf)
-    top_p(ix) = spl_prime(absx(ix),xtopo,ztopo,coefs_topo,ntopo)
   enddo
 
 ! valeurs de x et y pour display domaine physique
@@ -666,17 +653,17 @@
 
 ! dessin de la topo de surface (splines)
   do i=0,nx-1
-            write(20,15) sngl(absx(i)),sngl(top0(i))
-            write(20,15) sngl(absx(i+1)),sngl(top0(i+1))
-            write(20,10)
+    write(20,15) sngl(absx(i)),sngl(top0(i))
+    write(20,15) sngl(absx(i+1)),sngl(top0(i+1))
+    write(20,10)
   enddo
 
 ! dessin de l'interface du milieu
   if (interffile /= 'none') then
   do i=0,nx-1
-            write(20,15) sngl(absx(i)),sngl(bot0(i))
-            write(20,15) sngl(absx(i+1)),sngl(bot0(i+1))
-            write(20,10)
+    write(20,15) sngl(absx(i)),sngl(bot0(i))
+    write(20,15) sngl(absx(i+1)),sngl(bot0(i+1))
+    write(20,10)
   enddo
   endif
 
@@ -684,33 +671,33 @@
   print *, 'Ecriture lignes horizontales'
   istepx = 1
   if(ngnod == 4) then
-      istepz = 1
+    istepz = 1
   else
-      istepz = 2
+    istepz = 2
   endif
   do ili=0,nz,istepz
-        do icol=0,nx-istepx,istepx
-  write(20,15) sngl(x(icol,ili)),sngl(z(icol,ili))
-  write(20,15) sngl(x(icol+istepx,ili)),sngl(z(icol+istepx,ili))
-  write(20,10)
-                   enddo
+    do icol=0,nx-istepx,istepx
+      write(20,15) sngl(x(icol,ili)),sngl(z(icol,ili))
+      write(20,15) sngl(x(icol+istepx,ili)),sngl(z(icol+istepx,ili))
+      write(20,10)
+    enddo
   enddo
 
 ! dessin des lignes verticales de la grille
   print *, 'Ecriture lignes verticales'
   if(ngnod == 4) then
-      istepx = 1
+    istepx = 1
   else
-      istepx = 2
+    istepx = 2
   endif
   istepz = 1
-       do icol=0,nx,istepx
-               do ili=0,nz-istepz,istepz
-  write(20,15) sngl(x(icol,ili)),sngl(z(icol,ili))
-  write(20,15) sngl(x(icol,ili+istepz)),sngl(z(icol,ili+istepz))
-  write(20,10)
-                enddo
-       enddo
+  do icol=0,nx,istepx
+    do ili=0,nz-istepz,istepz
+      write(20,15) sngl(x(icol,ili)),sngl(z(icol,ili))
+      write(20,15) sngl(x(icol,ili+istepz)),sngl(z(icol,ili+istepz))
+      write(20,10)
+    enddo
+  enddo
 
   close(20)
 
@@ -740,10 +727,10 @@
   ndofn = 2
   ndime = 2
   npgeo = (nx+1)*(nz+1)
-  if (ngnod == 4) then
-      nspel = nx*nz
+  if(ngnod == 4) then
+    nspel = nx*nz
   else
-      nspel = nx*nz/4
+    nspel = nx*nz/4
   endif
   write(15,*) 'ndofn ndime npgeo'
   write(15,*) ndofn,ndime,npgeo
@@ -786,9 +773,9 @@
 
   write(15,*) 'iexec iecho'
   if(iexec) then
-    write(15,*) '1       1'
+    write(15,*) '1 1'
   else
-    write(15,*) '0       1'
+    write(15,*) '0 1'
   endif
 
   write(15,*) 'ncycl dtinc niter'
@@ -849,12 +836,11 @@
   nxgll = idegpoly + 1
 
   write(15,*) 'netyp numat ngnod nxgll nygll nspec iptsdisp ielemabs ielemperio'
-  write(15,*) netyp,nbmodeles,ngnod,nxgll,nxgll,nspel,iptsdisp, &
-                nelemabs,nelemperio
+  write(15,*) netyp,nbmodeles,ngnod,nxgll,nxgll,nspel,iptsdisp,nelemabs,nelemperio
 
   write(15,*) 'Material sets (num 0 rho vp vs 0 0) or (num 2 rho c11 c13 c33 c44)'
   do i=1,nbmodeles
-       write(15,*) i,icodemat(i),rho(i),cp(i),cs(i),aniso3(i),aniso4(i)
+    write(15,*) i,icodemat(i),rho(i),cp(i),cs(i),aniso3(i),aniso4(i)
   enddo
 
 
@@ -862,27 +848,26 @@
 
   k=0
   if(ngnod == 4) then
-      do j=0,nz-1
-      do i=0,nx-1
+    do j=0,nz-1
+    do i=0,nx-1
 
-      k = k + 1
-      imatnum = num_modele(i+1,j+1)
-      write(15,*) k,imatnum,num(i,j,nx),num(i+1,j,nx),num(i+1,j+1,nx), &
-                    num(i,j+1,nx)
-      enddo
-      enddo
+    k = k + 1
+    imatnum = num_modele(i+1,j+1)
+    write(15,*) k,imatnum,num(i,j,nx),num(i+1,j,nx),num(i+1,j+1,nx),num(i,j+1,nx)
+    enddo
+    enddo
   else
-      do j=0,nz-2,2
-      do i=0,nx-2,2
+    do j=0,nz-2,2
+    do i=0,nx-2,2
 
-      k = k + 1
-      imatnum = num_modele(i+1,j+1)
-      write(15,*) k,imatnum,num(i,j,nx),num(i+2,j,nx),num(i+2,j+2,nx), &
+    k = k + 1
+    imatnum = num_modele(i+1,j+1)
+    write(15,*) k,imatnum,num(i,j,nx),num(i+2,j,nx),num(i+2,j+2,nx), &
               num(i,j+2,nx),num(i+1,j,nx),num(i+2,j+1,nx), &
               num(i+1,j+2,nx),num(i,j+1,nx),num(i+1,j+1,nx)
 
-      enddo
-      enddo
+    enddo
+    enddo
   endif
 
 !
@@ -985,7 +970,7 @@
   integer i,j,nx
 
     num = j*(nx+1) + i + 1
-  return
+
   end function num
 
 ! ------- definition des fonctions representant les interfaces -------
@@ -997,8 +982,9 @@
   double precision function bottom(x)
   implicit none
   double precision x
+
     bottom = 0.d0
-  return
+
   end function bottom
 
 !
@@ -1006,7 +992,9 @@
 !
 
 !--- spline
+
   double precision function spl(x,xtopo,ztopo,coefs,ntopo)
+
   implicit none
   integer ntopo
   double precision x,xp
@@ -1019,12 +1007,12 @@
   if (xp > xtopo(ntopo)) xp = xtopo(ntopo)
   call splint(xtopo,ztopo,coefs,ntopo,xp,spl)
 
-  return
   end function spl
 
 ! --- fonction de densification du maillage horizontal
 
   double precision function dens(ix,psi,xmin,xmax,nx)
+
   implicit none
   integer ix,nx
   double precision psi(0:nx)
@@ -1032,13 +1020,14 @@
 
   dens = xmin + dble(xmax-xmin)*psi(ix)
 
-  return
   end function dens
 
 ! --------------------------------------
 
 ! routine de calcul des coefs du spline (Numerical Recipes)
+
   subroutine spline(x,y,n,yp1,ypn,y2)
+
   implicit none
 
   integer n
@@ -1054,28 +1043,29 @@
   y2(1)=-0.5
   u(1)=(3./(x(2)-x(1)))*((y(2)-y(1))/(x(2)-x(1))-yp1)
   do i=2,n-1
-      sig=(x(i)-x(i-1))/(x(i+1)-x(i-1))
-      p=sig*y2(i-1)+2.
-      y2(i)=(sig-1.)/p
-      u(i)=(6.*((y(i+1)-y(i))/(x(i+1)-x(i))-(y(i)-y(i-1)) &
-                    /(x(i)-x(i-1)))/(x(i+1)-x(i-1))-sig*u(i-1))/p
+    sig=(x(i)-x(i-1))/(x(i+1)-x(i-1))
+    p=sig*y2(i-1)+2.
+    y2(i)=(sig-1.)/p
+    u(i)=(6.*((y(i+1)-y(i))/(x(i+1)-x(i))-(y(i)-y(i-1)) &
+               /(x(i)-x(i-1)))/(x(i+1)-x(i-1))-sig*u(i-1))/p
   enddo
   qn=0.5
   un=(3./(x(n)-x(n-1)))*(ypn-(y(n)-y(n-1))/(x(n)-x(n-1)))
   y2(n)=(un-qn*u(n-1))/(qn*y2(n-1)+1.)
   do k=n-1,1,-1
-      y2(k)=y2(k)*y2(k+1)+u(k)
+    y2(k)=y2(k)*y2(k+1)+u(k)
   enddo
 
   deallocate(u)
 
-  return
   end subroutine spline
 
 ! --------------
 
 ! routine d'evaluation du spline (Numerical Recipes)
+
   SUBROUTINE SPLINT(XA,YA,Y2A,N,X,Y)
+
   implicit none
 
   integer n
@@ -1088,20 +1078,19 @@
   KLO=1
   KHI=N
   do while (KHI-KLO > 1)
-      K=(KHI+KLO)/2
-      IF(XA(K) > X)THEN
-            KHI=K
-      ELSE
-            KLO=K
-      ENDIF
+    K=(KHI+KLO)/2
+    IF(XA(K) > X)THEN
+      KHI=K
+    ELSE
+      KLO=K
+    ENDIF
   enddo
   H=XA(KHI)-XA(KLO)
   IF (H == 0.d0) stop 'Bad input in spline evaluation'
   A=(XA(KHI)-X)/H
   B=(X-XA(KLO))/H
 
-  Y=A*YA(KLO)+B*YA(KHI)+((A**3-A)*Y2A(KLO)+ &
-              (B**3-B)*Y2A(KHI))*(H**2)/6.d0
-  RETURN
+  Y=A*YA(KLO)+B*YA(KHI)+((A**3-A)*Y2A(KLO)+ (B**3-B)*Y2A(KHI))*(H**2)/6.d0
+
   end subroutine SPLINT
 

Modified: seismo/2D/SPECFEM2D/trunk/MAILLE90/maille_non_struct_2.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/MAILLE90/maille_non_struct_2.f90	2007-12-07 23:44:19 UTC (rev 8415)
+++ seismo/2D/SPECFEM2D/trunk/MAILLE90/maille_non_struct_2.f90	2007-12-07 23:44:24 UTC (rev 8416)
@@ -107,11 +107,10 @@
   open(unit=10,file='Par',status='old')
 
 ! formats
-
- 1 format(a,f20.8)
- 2 format(a,i20)
+ 1 format(a,f12.5)
+ 2 format(a,i8)
  3 format(a,a)
- 4 format(a,l20)
+ 4 format(a,l8)
 
 ! read the header
   do i=1,10

Modified: seismo/2D/SPECFEM2D/trunk/MAILLE90/maille_non_struct_3.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/MAILLE90/maille_non_struct_3.f90	2007-12-07 23:44:19 UTC (rev 8415)
+++ seismo/2D/SPECFEM2D/trunk/MAILLE90/maille_non_struct_3.f90	2007-12-07 23:44:24 UTC (rev 8416)
@@ -107,11 +107,10 @@
   open(unit=10,file='Par',status='old')
 
 ! formats
-
- 1 format(a,f20.8)
- 2 format(a,i20)
+ 1 format(a,f12.5)
+ 2 format(a,i8)
  3 format(a,a)
- 4 format(a,l20)
+ 4 format(a,l8)
 
 ! read the header
   do i=1,10

Deleted: seismo/2D/SPECFEM2D/trunk/MAILLE90/maille_struct.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/MAILLE90/maille_struct.f90	2007-12-07 23:44:19 UTC (rev 8415)
+++ seismo/2D/SPECFEM2D/trunk/MAILLE90/maille_struct.f90	2007-12-07 23:44:24 UTC (rev 8416)
@@ -1,918 +0,0 @@
-!=====================================================================
-!
-!             P r e m a i l l e u r    F o r t r a n  9 0
-!             -------------------------------------------
-!
-!                           Version 3.0
-!                           -----------
-!
-!                         Dimitri Komatitsch
-!    Department of Earth and Planetary Sciences - Harvard University
-!
-!                         (c) August 1998
-!
-!=====================================================================
-
-!
-! *** Version optimisee avec maillage structure pour Jacques Muller - Elf ***
-!
-
-  program maille_struct
-
-  implicit none
-
-! definir les tableaux pour allocation dynamique
-
-! coordinates of the grid points
-  double precision, allocatable :: x(:,:),z(:,:)
-
-! variables needed to compute the transformation
-  double precision, allocatable :: psi(:),eta(:),absx(:), &
-      a00(:),a01(:),valeta(:),bot0(:),top0(:)
-
-! stockage du modele de vitesse et densite
-  double precision, allocatable :: rho(:),cp(:),cs(:)
-
-! the topography data
-  double precision, allocatable :: xtopo(:),ztopo(:),coefs_topo(:)
-
-! arrays for the source
-  double precision, allocatable :: xs(:),zs(:),f0(:),t0(:),angle(:),factor(:)
-  integer, allocatable :: isource_type(:),itimetype(:)
-
-! arrays for the receivers
-  double precision, allocatable :: xrec(:),zrec(:)
-
-! nom du fichier GNUPLOT contenant la grille
-  character(len=50) file1
-
-  character(len=50) interffile,topofile,title
-  character(len=15) junk
-
-  integer imatnum,inumabs,inumelem,nelemperio,nxgll,netyp
-  integer icodehaut,icodebas,icodegauche,icodedroite
-  integer nelemabs,npgeo,nspec,ntopo
-  integer k,icol,ili,istepx,istepz,ix,iz,irec,i,j
-  integer imodele,nbmodeles,iaffinfo
-  integer itaff,itfirstaff,iptsdisp,isubsamp,nrec,n1ana,n2ana
-  integer irepr,nrec1,nrec2,isamp,nbsources,isismostype,ivecttype
-  integer ngnod,nt,niter,idegpoly,nx,nz,nxread,nzread
-  integer icodematread
-
-  double precision valseuil,freqmaxrep,ratio
-  double precision tang1,tangN
-  double precision orig_x,orig_z,sizemax,cutvect,scalex,scalez
-  double precision factorxsu,factorana,xspacerec,zspacerec
-  double precision anglerec,anglerec2,xmin,xmax
-  double precision xfin,zfin,xfin2,zfin2,xdeb,zdeb,xdeb2,zdeb2
-  double precision alphanewm,betanewm,gammanewm,dt
-  double precision rhoread,cpread,csread,aniso3read,aniso4read
-
-  logical interpol,ignuplot,ireadmodel,iavs,ivisual3,ioutputgrid
-  logical abshaut,absbas,absgauche,absdroite,absstacey
-  logical periohaut,periogauche
-  logical sismos,isources_surf,ienreg_surf,ienreg_surf2,display
-  logical ivectplot,imeshvect
-  logical topoplane,iexec,initialfield
-  logical imodelvect,iboundvect,usletter,compenergy
-
-  integer, external :: num
-  double precision, external :: bottom,spl,dens
-
-  double precision, parameter :: zero = 0.d0, one = 1.d0
-
-! sauvegarde de la grille format Gnuplot
-  logical, parameter :: save_gnuplot = .false.
-
-! --- code des numeros d'aretes pour les bords absorbants
-  integer, parameter :: iaretebas    = 1
-  integer, parameter :: iaretedroite = 2
-  integer, parameter :: iaretehaut   = 3
-  integer, parameter :: iaretegauche = 4
-
-! simulation a 2D
-  integer, parameter :: ndime = 2
-  integer, parameter :: ndofn = 2
-
-! DK DK DK ajout Elf : extraction de la topo du fichier SEP
-!!  call system('rm -f topo_from_SEP.dat topo_SEP_maille90.dat ; xextract_topo')
-
-  print *
-  print *,' *** Version optimisee avec maillage structure ***'
-  print *
-
-! ***
-! *** read the parameter file
-! ***
-
-  print *,' Reading the parameter file ... '
-  print *
-
-  open(unit=10,file='Par',status='old')
-
-! formats
-
- 1 format(a,f20.8)
- 2 format(a,i20)
- 3 format(a,a)
- 4 format(a,l20)
-
-! read the header
-  do i=1,10
-  read(10,*)
-  enddo
-
-! read file names and path for output
-  read(10,3)junk,title
-  read(10,3)junk,topofile
-  read(10,3)junk,interffile
-
-  write(*,*) 'Titre de la simulation'
-  write(*,*) title
-  print *
-
-! skip comment
-  read(10,*)
-  read(10,*)
-  read(10,*)
-
-! read grid parameters
-  read(10,1)junk,xmin
-  read(10,1)junk,xmax
-  read(10,2)junk,nx
-  read(10,2)junk,nz
-  read(10,2)junk,idegpoly
-  read(10,2)junk,ngnod
-  read(10,1)junk,ratio
-  read(10,4)junk,topoplane
-  read(10,4)junk,initialfield
-  read(10,4)junk,ireadmodel
-  read(10,4)junk,iexec
-
-! DK DK forcer pour Elf
-  ngnod = 9
-  topoplane = .false.
-  initialfield = .false.
-
-  nxread = nx
-  nzread = nz
-
-! multiplier par 2 pour elements 9 noeuds
-      nx = nx * 2
-      nz = nz * 2
-
-! skip comment
-  read(10,*)
-  read(10,*)
-  read(10,*)
-
-! read absorbing boundaries parameters
-  read(10,4)junk,abshaut
-  read(10,4)junk,absbas
-  read(10,4)junk,absgauche
-  read(10,4)junk,absdroite
-  read(10,4)junk,absstacey
-  read(10,4)junk,periohaut
-  read(10,4)junk,periogauche
-
-! DK DK forcer pour Elf
-  abshaut = .false.
-  periohaut = .false.
-  periogauche = .false.
-
-! skip comment
-  read(10,*)
-  read(10,*)
-  read(10,*)
-
-! read time step parameters
-  read(10,2)junk,nt
-  read(10,1)junk,dt
-  read(10,2)junk,niter
-  read(10,1)junk,alphanewm
-  read(10,1)junk,betanewm
-  read(10,1)junk,gammanewm
-
-! skip comment
-  read(10,*)
-  read(10,*)
-  read(10,*)
-
-! read source parameters
-  read(10,2)junk,nbsources
-  read(10,4)junk,isources_surf
-  read(10,1)junk,valseuil
-  read(10,1)junk,freqmaxrep
-  print *,'Nb de sources a lire : ',nbsources
-
-  allocate(xs(nbsources))
-  allocate(zs(nbsources))
-  allocate(f0(nbsources))
-  allocate(t0(nbsources))
-  allocate(isource_type(nbsources))
-  allocate(itimetype(nbsources))
-  allocate(angle(nbsources))
-  allocate(factor(nbsources))
-
-  do i=1,nbsources
-      read(10,*)
-      read(10,1)junk,xs(i)
-      read(10,1)junk,zs(i)
-      read(10,1)junk,f0(i)
-      read(10,1)junk,t0(i)
-      read(10,2)junk,isource_type(i)
-      read(10,2)junk,itimetype(i)
-      read(10,1)junk,angle(i)
-      read(10,1)junk,factor(i)
-
-      print *
-      print *,' Source #',i
-      print *,'Position xs, zs = ',xs(i),zs(i)
-      print *,'Frequency, delay = ',f0(i),t0(i)
-      print *,'Source type (1=force 2=explo) : ', &
-                    isource_type(i)
-      print *,'Angle of the source if force = ',angle(i)
-      print *,'Multiplying factor = ',factor(i)
-  enddo
-
-! skip comment
-  read(10,*)
-  read(10,*)
-  read(10,*)
-
-! read receivers line parameters
-  read(10,4)junk,sismos
-  read(10,2)junk,isamp
-  read(10,2)junk,isismostype
-  read(10,2)junk,irepr
-  read(10,*)
-  read(10,2)junk,nrec1
-  read(10,1)junk,xdeb
-  read(10,1)junk,zdeb
-  read(10,1)junk,xfin
-  read(10,1)junk,zfin
-  read(10,4)junk,ienreg_surf
-  read(10,1)junk,anglerec
-  read(10,*)
-  read(10,2)junk,nrec2
-  read(10,1)junk,xdeb2
-  read(10,1)junk,zdeb2
-  read(10,1)junk,xfin2
-  read(10,1)junk,zfin2
-  read(10,4)junk,ienreg_surf2
-  read(10,1)junk,anglerec2
-  read(10,*)
-  read(10,1)junk,factorxsu
-  read(10,2)junk,n1ana
-  read(10,2)junk,n2ana
-  read(10,1)junk,factorana
-
-! determination et affichage position ligne de receivers
-  if(nrec2 < 0) stop 'negative value of nrec2 !'
-
-  if(nrec2 == 0) then
-    nrec = nrec1
-  else
-    nrec = nrec1 + nrec2
-  endif
-
-! DK DK forcer pour Elf
-  n1ana = 1
-  n2ana = nrec
-
-  allocate(xrec(nrec))
-  allocate(zrec(nrec))
-
-  if(nrec2 == 0) then
-  print *
-  print *,'There are ',nrec,' receivers on a single line'
-  xspacerec=(xfin-xdeb)/dble(nrec-1)
-  zspacerec=(zfin-zdeb)/dble(nrec-1)
-  do i=1,nrec
-     xrec(i) = xdeb + dble(i-1)*xspacerec
-     zrec(i) = zdeb + dble(i-1)*zspacerec
-  enddo
-  else
-  print *
-  print *,'There are ',nrec,' receivers on two lines'
-  print *,'First line contains ',nrec1,' receivers'
-  print *,'Second line contains ',nrec2,' receivers'
-  xspacerec=(xfin-xdeb)/dble(nrec1-1)
-  zspacerec=(zfin-zdeb)/dble(nrec1-1)
-  do i=1,nrec1
-     xrec(i) = xdeb + dble(i-1)*xspacerec
-     zrec(i) = zdeb + dble(i-1)*zspacerec
-  enddo
-  xspacerec=(xfin2-xdeb2)/dble(nrec2-1)
-  zspacerec=(zfin2-zdeb2)/dble(nrec2-1)
-  do i=1,nrec2
-     xrec(i+nrec1) = xdeb2 + dble(i-1)*xspacerec
-     zrec(i+nrec1) = zdeb2 + dble(i-1)*zspacerec
-  enddo
-  endif
-
-! skip comment
-  read(10,*)
-  read(10,*)
-  read(10,*)
-
-! read display parameters
-  read(10,4)junk,display
-  read(10,2)junk,itaff
-  read(10,2)junk,itfirstaff
-  read(10,2)junk,iaffinfo
-  read(10,4)junk,ivectplot
-  read(10,2)junk,ivecttype
-  read(10,1)junk,cutvect
-  read(10,4)junk,imeshvect
-  read(10,4)junk,imodelvect
-  read(10,4)junk,iboundvect
-  read(10,4)junk,interpol
-  read(10,2)junk,iptsdisp
-  read(10,2)junk,isubsamp
-  read(10,1)junk,scalex
-  read(10,1)junk,scalez
-  read(10,1)junk,sizemax
-  read(10,4)junk,usletter
-  read(10,1)junk,orig_x
-  read(10,1)junk,orig_z
-  read(10,4)junk,ignuplot
-  read(10,4)junk,iavs
-  read(10,4)junk,ivisual3
-  read(10,4)junk,ioutputgrid
-  read(10,4)junk,compenergy
-
-! DK DK forcer pour Elf
-  ignuplot = .false.
-  iavs = .false.
-  ivisual3 = .false.
-  compenergy = .false.
-
-! skip comment
-  read(10,*)
-  read(10,*)
-  read(10,*)
-
-! lecture des differents modeles de materiaux
-
-  read(10,2)junk,nbmodeles
-  if(nbmodeles <= 0) stop 'Negative number of models not allowed !!'
-
-  allocate(rho(nbmodeles))
-  allocate(cp(nbmodeles))
-  allocate(cs(nbmodeles))
-
-  rho(:) = 0.d0
-  cp(:) = 0.d0
-  cs(:) = 0.d0
-
-  do imodele=1,nbmodeles
-      read(10,*) i,icodematread,rhoread,cpread,csread,aniso3read,aniso4read
-      if(i<1 .or. i>nbmodeles) stop 'Wrong material set number'
-      rho(i) = rhoread
-      cp(i) = cpread
-      cs(i) = csread
-      if (rho(i) < 0.d0 .or. cp(i) < 0.d0 .or. cs(i) < 0.d0) &
-          stop 'Negative value of velocity or density'
-  enddo
-
-  print *
-  print *, 'Nb de modeles de roche = ',nbmodeles
-  print *
-  do i=1,nbmodeles
-      print *,'Modele #',i,' isotrope'
-      print *,'rho,cp,cs = ',rho(i),cp(i),cs(i)
-  enddo
-  print *
-
-  close(10)
-
-  print *
-  print *,' Parameter file successfully read... '
-
-! --------- fin lecture fichier parametres --------------
-
-  allocate(psi(0:nx))
-  allocate(eta(0:nz))
-  allocate(absx(0:nx))
-  allocate(a00(0:nz))
-  allocate(a01(0:nz))
-  allocate(valeta(0:nz))
-  allocate(bot0(0:nx))
-  allocate(top0(0:nx))
-
-! calcul des points regulierement espaces
-  do i=0,nx
-        psi(i) = i/dble(nx)
-  enddo
-  do j=0,nz
-        eta(j) = j/dble(nz)
-  enddo
-
-! quelques verifications de base a faire
-
-  if(ngnod /= 9) stop 'erreur ngnod different de 9 !!'
-
-  print *
-  print *,'Le maillage uniforme comporte ',nx/2,' x ',nz/2,' elements'
-  print *,'La grille equivalente uniforme a une taille de ', &
-        nx*idegpoly/2 + 1,' x ',nz*idegpoly/2 + 1,' points (', &
-        (nx*idegpoly/2 + 1)*(nz*idegpoly/2 + 1),' points)'
-
-  print *,'Chaque element comporte ',idegpoly+1,' points dans chaque direction'
-  print *,'Les elements de controle sont des elements ',ngnod,' noeuds'
-  print *
-
-!------------------------------------------------------
-
-  allocate(x(0:nx,0:nz))
-  allocate(z(0:nx,0:nz))
-
-  x(:,:)=0.d0
-  z(:,:)=0.d0
-
-! get topography data from external file
-  print *,'Reading topography from file ',topofile
-  open(unit=15,file=topofile,status='old')
-  read(15,*) ntopo
-  if (ntopo < 2) stop 'Not enough topography points (min 2)'
-  print *,'Reading ',ntopo,' points from topography file'
-  print *
-
-  allocate(xtopo(ntopo))
-  allocate(ztopo(ntopo))
-  allocate(coefs_topo(ntopo))
-
-  do i=1,ntopo
-       read(15,*) xtopo(i),ztopo(i)
-  enddo
-  close(15)
-
-! check the values read
-  print *
-  print *, 'Topography data points (x,z)'
-  print *, '----------------------------'
-  print *
-  print *, 'Topo 1 = (',xtopo(1),',',ztopo(1),')'
-  print *, 'Topo ntopo = (',xtopo(ntopo),',',ztopo(ntopo),')'
-
-!--- calculate the spline function for the topography
-!--- imposer les tangentes aux deux bords
-  tang1 = (ztopo(2)-ztopo(1))/(xtopo(2)-xtopo(1))
-  tangN = (ztopo(ntopo)-ztopo(ntopo-1))/(xtopo(ntopo)-xtopo(ntopo-1))
-  call spline(xtopo,ztopo,ntopo,tang1,tangN,coefs_topo)
-
-! *** afficher limites du modele lu
-  print *
-  print *, 'Limites absolues modele fichier topo :'
-  print *
-  print *, 'Xmin = ',minval(xtopo),'   Xmax = ',maxval(xtopo)
-  print *, 'Zmin = ',minval(ztopo),'   Zmax = ',maxval(ztopo)
-  print *
-
-! *** modifier sources pour position par rapport a la surface
-  print *
-  print *, 'Position (x,z) des ',nbsources,' sources'
-  print *
-  do i=1,nbsources
-
-! DK DK DK Elf : position source donnee en profondeur par rapport a la topo
-   zs(i) = spl(xs(i),xtopo,ztopo,coefs_topo,ntopo) - zs(i)
-
-   if(isources_surf) zs(i) = spl(xs(i),xtopo,ztopo,coefs_topo,ntopo)
-   print *, 'Source ',i,' = ',xs(i),zs(i)
-  enddo
-
-! *** modifier recepteurs pour enregistrement en surface
-  print *
-  print *, 'Position (x,z) des ',nrec,' receivers'
-  print *
-  do irec=1,nrec
-
-! DK DK DK Elf : distinguer les deux lignes de recepteurs
-  if(irec <= nrec1) then
-   if(ienreg_surf) zrec(irec) = spl(xrec(irec),xtopo,ztopo,coefs_topo,ntopo)
-  else
-   if(ienreg_surf2) zrec(irec) = spl(xrec(irec),xtopo,ztopo,coefs_topo,ntopo)
-  endif
-   print *, 'Receiver ',irec,' = ',xrec(irec),zrec(irec)
-
-  enddo
-
-!--- definition du maillage suivant X
-  do ix=0,nx
-          absx(ix) = dens(ix,psi,xmin,xmax,nx)
-  enddo
-
-! *** une seule zone
-
-  do iz=0,nz
-
-! DK DK DK densification sinusoidale ici en vertical
-  valeta(iz) = eta(iz) + ratio * sin(3.14159265 * eta(iz))
-  if(valeta(iz) < zero) valeta(iz) = zero
-  if(valeta(iz) > one ) valeta(iz) = one
-! DK DK DK densification sinusoidale ici en vertical
-
-  a00(iz) = 1-valeta(iz)
-  a01(iz) = valeta(iz)
-  enddo
-
-  do ix=0,nx
-          bot0(ix) = bottom(absx(ix))
-          top0(ix) = spl(absx(ix),xtopo,ztopo,coefs_topo,ntopo)
-  enddo
-
-! valeurs de x et y pour display domaine physique
-  do ix=0,nx
-  do iz=0,nz
-  x(ix,iz) = absx(ix)
-  z(ix,iz) = a00(iz)*bot0(ix) + a01(iz)*top0(ix)
-  enddo
-  enddo
-
-! calculer min et max de X et Z sur la grille
-  print *
-  print *, 'Valeurs min et max de X sur le maillage = ',minval(x),maxval(x)
-  print *, 'Valeurs min et max de Z sur le maillage = ',minval(z),maxval(z)
-  print *
-
-! ***
-! *** generer un fichier 'GNUPLOT' pour le controle de la grille ***
-! ***
-
-  if(save_gnuplot) then
-
-  print *
-  print *,' Ecriture de la grille format GNUPLOT...'
-
-  file1='gridfile.gnu'
-
- open(unit=20,file=file1,status='unknown')
-
-! dessin de la topo de surface (splines)
-  do i=0,nx-1
-            write(20,15) sngl(absx(i)),sngl(top0(i))
-            write(20,15) sngl(absx(i+1)),sngl(top0(i+1))
-            write(20,10)
-  enddo
-
-! dessin des lignes horizontales de la grille
-  print *, 'Ecriture lignes horizontales'
-  istepx = 1
-      istepz = 2
-  do ili=0,nz,istepz
-        do icol=0,nx-istepx,istepx
-  write(20,15) sngl(x(icol,ili)),sngl(z(icol,ili))
-  write(20,15) sngl(x(icol+istepx,ili)),sngl(z(icol+istepx,ili))
-  write(20,10)
-                   enddo
-  enddo
-
-! dessin des lignes verticales de la grille
-  print *, 'Ecriture lignes verticales'
-      istepx = 2
-  istepz = 1
-       do icol=0,nx,istepx
-               do ili=0,nz-istepz,istepz
-  write(20,15) sngl(x(icol,ili)),sngl(z(icol,ili))
-  write(20,15) sngl(x(icol,ili+istepz)),sngl(z(icol,ili+istepz))
-  write(20,10)
-                enddo
-       enddo
-
-  close(20)
-
-! cree le script de dessin pour gnuplot
-  open(unit=20,file='plotgrid.gnu',status='unknown')
-  write(20,*) 'set term postscript landscape monochrome solid "Helvetica" 22'
-  write(20,*) 'set output "grille.ps"'
-  write(20,*) 'plot "gridfile.gnu" title "Macroblocs mesh" w l'
-  close(20)
-
-  print *,' Fin ecriture de la grille format GNUPLOT'
-  print *
-
-  endif
-
-! *** generation de la base de donnees
-
-  print *
-  print *,' Creation de la base de donnees pour SPECFEM...'
-  print *
-
-  open(unit=15,file='../SPECFEM90/DataBase',status='unknown')
-
-  write(15,*) '#'
-  write(15,*) '# Base de Donnees pour Specfem - Premailleur Fortran 90'
-  write(15,*) '# ',title
-  write(15,*) '# Dimitri Komatitsch, (c) EPS - Harvard August 1998'
-  write(15,*) '#'
-
-  write(15,*) 'Titre simulation'
-  write(15,40) title
-
-  npgeo = (nx+1)*(nz+1)
-  nspec = nx*nz/4
-  write(15,*) 'ndofn ndime npgeo'
-  write(15,*) ndofn,ndime,npgeo
-
-  write(15,*) 'display ignuplot interpol'
-  write(15,*) display,ignuplot,interpol
-
-  write(15,*) 'itaff itfirstaff icolor inumber'
-  write(15,*) itaff,itfirstaff,0,0
-
-  write(15,*) 'ivectplot imeshvect imodelvect iboundvect cutvect isubsamp'
-  write(15,*) ivectplot,imeshvect,imodelvect,iboundvect,cutvect,isubsamp
-
-  write(15,*) 'scalex scalez sizemax angle rapport USletter'
-  write(15,*) scalex,scalez,sizemax,20.,0.40,usletter
-
-  write(15,*) 'orig_x orig_z isymbols'
-  write(15,*) orig_x,orig_z,' T'
-
-  write(15,*) 'valseuil freqmaxrep'
-  write(15,*) valseuil,freqmaxrep
-
-  write(15,*) 'sismos nrec nrec1 nrec2 isamp'
-  write(15,*) sismos,nrec,nrec1,nrec2,isamp
-
-  write(15,*) 'irepr anglerec anglerec2'
-  write(15,*) irepr,anglerec,anglerec2
-
-  write(15,*) 'topoplane absstacey compenergy'
-  write(15,*) topoplane,absstacey,compenergy
-
-  write(15,*) 'initialfield factorana factorxsu n1ana n2ana'
-  write(15,*) initialfield,factorana,factorxsu,n1ana,n2ana
-
-  write(15,*) 'isismostype ivecttype iaffinfo'
-  write(15,*) isismostype,ivecttype,iaffinfo
-
-  write(15,*) 'ireadmodel ioutputgrid iavs ivisual3'
-  write(15,*) ireadmodel,ioutputgrid,iavs,ivisual3
-
-  write(15,*) 'iexec iecho'
-  if(iexec) then
-    write(15,*) '1       1'
-  else
-    write(15,*) '0       1'
-  endif
-
-  write(15,*) 'ncycl dtinc niter'
-  write(15,*) nt,dt,niter
-
-  write(15,*) 'alpha beta gamma (alpha not used for the moment)'
-  write(15,*) alphanewm,betanewm,gammanewm
-
-  write(15,*) 'nltfl (number of force or pressure sources)'
-  write(15,*) nbsources
-
-  write(15,*) 'Collocated forces and/or pressure sources:'
-  do i=1,nbsources
-      write(15,*) itimetype(i),isource_type(i), &
-         xs(i)-xmin ,zs(i), &
-        f0(i),t0(i),factor(i),angle(i),0
-  enddo
-
-  write(15,*) 'Receivers positions:'
-  do irec=1,nrec
-      write(15,*) irec,xrec(irec)-xmin ,zrec(irec)
-  enddo
-
-  write(15,*) 'Coordinates of macroblocs mesh (coorg):'
-  do j=0,nz
-      do i=0,nx
-      write(15,*) num(i,j,nx),x(i,j)-xmin,z(i,j)
-      enddo
-  enddo
-
-!
-!--- introduction des bords absorbants
-!
-
-  nelemabs = 0
-  if(absbas) nelemabs = nelemabs + nx
-  if(abshaut) nelemabs = nelemabs + nx
-  if(absgauche) nelemabs = nelemabs + nz
-  if(absdroite) nelemabs = nelemabs + nz
-
-! on a deux fois trop d'elements pour elements 9 noeuds
-  nelemabs = nelemabs / 2
-
-! enlever aussi les coins qui ont ete comptes deux fois
-  if(absbas .and. absgauche) nelemabs = nelemabs - 1
-  if(absbas .and. absdroite) nelemabs = nelemabs - 1
-  if(abshaut .and. absgauche) nelemabs = nelemabs - 1
-  if(abshaut .and. absdroite) nelemabs = nelemabs - 1
-
-  nelemperio = 0
-
-  netyp = 2
-  nxgll = idegpoly + 1
-
-  write(15,*) 'netyp numat ngnod nxgll nygll nspec iptsdisp ielemabs ielemperio'
-  write(15,*) netyp,nbmodeles,ngnod,nxgll,nxgll,nspec,iptsdisp, &
-                nelemabs,nelemperio
-
-  write(15,*) 'Material sets (num 0 rho vp vs 0 0)'
-  do i=1,nbmodeles
-       write(15,*) i,0,rho(i),cp(i),cs(i),0,0
-  enddo
-
-
-  write(15,*) 'Arrays kmato and knods for each bloc:'
-
-  k=0
-      do j=0,nz-2,2
-      do i=0,nx-2,2
-
-      k = k + 1
-      imatnum = 1
-      write(15,*) k,imatnum,num(i,j,nx),num(i+2,j,nx),num(i+2,j+2,nx), &
-              num(i,j+2,nx),num(i+1,j,nx),num(i+2,j+1,nx), &
-              num(i+1,j+2,nx),num(i,j+1,nx),num(i+1,j+1,nx)
-
-      enddo
-      enddo
-
-!
-!--- sauvegarde des bords absorbants
-!
-
-  print *
-  print *,'Au total il y a ',nelemabs,' elements absorbants'
-  print *
-  print *,'Bords absorbants actifs :'
-  print *
-  print *,'Haut   = ',abshaut
-  print *,'Bas    = ',absbas
-  print *,'Gauche = ',absgauche
-  print *,'Droite = ',absdroite
-  print *
-  print *,'Stacey = ',absstacey
-  print *
-
-! generer la liste des elements absorbants
-  if(nelemabs > 0) then
-  write(15,*) 'Liste des elements absorbants (haut bas gauche droite) :'
-  inumabs = 0
-  do iz=1,nzread
-  do ix=1,nxread
-    icodehaut = 0
-    icodebas = 0
-    icodegauche = 0
-    icodedroite = 0
-    inumelem = (iz-1)*nxread + ix
-    if(abshaut   .and. iz==nzread) icodehaut = iaretehaut
-    if(absbas    .and. iz== 1) icodebas = iaretebas
-    if(absgauche .and. ix== 1) icodegauche = iaretegauche
-    if(absdroite .and. ix==nxread) icodedroite = iaretedroite
-    if(icodehaut>0 .or. icodebas>0 .or. icodegauche>0 .or. icodedroite>0) then
-      inumabs = inumabs + 1
-      write(15,*) inumabs,inumelem,icodehaut,icodebas,icodegauche,icodedroite
-    endif
-  enddo
-  enddo
-  endif
-
-  close(15)
-
- 10 format('')
- 15 format(e10.5,1x,e10.5)
- 40 format(a50)
-
-  end program maille_struct
-
-! *****************
-! routines maillage
-! *****************
-
-! --- numero global du noeud
-
-  integer function num(i,j,nx)
-  implicit none
-  integer i,j,nx
-
-    num = j*(nx+1) + i + 1
-  return
-  end function num
-
-! ------- definition des fonctions representant les interfaces -------
-
-!
-! --- bas du modele
-!
-
-  double precision function bottom(x)
-  implicit none
-  double precision x
-    bottom = 0.d0
-  return
-  end function bottom
-
-!
-! --- representation interfaces par un spline
-!
-
-!--- spline
-  double precision function spl(x,xtopo,ztopo,coefs,ntopo)
-  implicit none
-  integer ntopo
-  double precision x,xp
-  double precision xtopo(ntopo),ztopo(ntopo)
-  double precision coefs(ntopo)
-
-  spl = 0.
-  xp = x
-  if (xp < xtopo(1)) xp = xtopo(1)
-  if (xp > xtopo(ntopo)) xp = xtopo(ntopo)
-  call splint(xtopo,ztopo,coefs,ntopo,xp,spl)
-
-  return
-  end function spl
-
-! --- fonction de densification du maillage horizontal
-
-  double precision function dens(ix,psi,xmin,xmax,nx)
-  implicit none
-  integer ix,nx
-  double precision psi(0:nx)
-  double precision xmin,xmax
-
-  dens = xmin + dble(xmax-xmin)*psi(ix)
-
-  return
-  end function dens
-
-! --------------------------------------
-
-! routine de calcul des coefs du spline (Numerical Recipes)
-  subroutine spline(x,y,n,yp1,ypn,y2)
-  implicit none
-
-  integer n
-  double precision x(n),y(n),y2(n)
-  double precision, dimension(:), allocatable :: u
-  double precision yp1,ypn
-
-  integer i,k
-  double precision sig,p,qn,un
-
-  allocate(u(n))
-
-  y2(1)=-0.5
-  u(1)=(3./(x(2)-x(1)))*((y(2)-y(1))/(x(2)-x(1))-yp1)
-  do i=2,n-1
-      sig=(x(i)-x(i-1))/(x(i+1)-x(i-1))
-      p=sig*y2(i-1)+2.
-      y2(i)=(sig-1.)/p
-      u(i)=(6.*((y(i+1)-y(i))/(x(i+1)-x(i))-(y(i)-y(i-1)) &
-                    /(x(i)-x(i-1)))/(x(i+1)-x(i-1))-sig*u(i-1))/p
-  enddo
-  qn=0.5
-  un=(3./(x(n)-x(n-1)))*(ypn-(y(n)-y(n-1))/(x(n)-x(n-1)))
-  y2(n)=(un-qn*u(n-1))/(qn*y2(n-1)+1.)
-  do k=n-1,1,-1
-      y2(k)=y2(k)*y2(k+1)+u(k)
-  enddo
-
-  deallocate(u)
-
-  return
-  end subroutine spline
-
-! --------------
-
-! routine d'evaluation du spline (Numerical Recipes)
-  SUBROUTINE SPLINT(XA,YA,Y2A,N,X,Y)
-  implicit none
-
-  integer n
-  double precision XA(N),YA(N),Y2A(N)
-  double precision x,y
-
-  integer k,klo,khi
-  double precision h,a,b
-
-  KLO=1
-  KHI=N
-  do while (KHI-KLO > 1)
-      K=(KHI+KLO)/2
-      IF(XA(K) > X)THEN
-            KHI=K
-      ELSE
-            KLO=K
-      ENDIF
-  enddo
-  H=XA(KHI)-XA(KLO)
-  IF (H == 0.d0) stop 'Bad input in spline evaluation'
-  A=(XA(KHI)-X)/H
-  B=(X-XA(KLO))/H
-
-  Y=A*YA(KLO)+B*YA(KHI)+((A**3-A)*Y2A(KLO)+ &
-              (B**3-B)*Y2A(KHI))*(H**2)/6.d0
-  RETURN
-  end subroutine SPLINT
-

Added: seismo/2D/SPECFEM2D/trunk/MAILLE90/topo_rouen.dat
===================================================================
--- seismo/2D/SPECFEM2D/trunk/MAILLE90/topo_rouen.dat	2007-12-07 23:44:19 UTC (rev 8415)
+++ seismo/2D/SPECFEM2D/trunk/MAILLE90/topo_rouen.dat	2007-12-07 23:44:24 UTC (rev 8416)
@@ -0,0 +1,3 @@
+2
+0 3000
+5000 3000



More information about the cig-commits mailing list