[cig-commits] r9002 - in seismo/2D/SPECFEM2D/trunk: . DATA

[dkomati1 at geodynamics.org]

Author: dkomati1
Date: 2008-01-13 10:10:23 -0800 (Sun, 13 Jan 2008)
New Revision: 9002

Modified:
   seismo/2D/SPECFEM2D/trunk/DATA/STATIONS
   seismo/2D/SPECFEM2D/trunk/DATA/STATIONS_canyon
   seismo/2D/SPECFEM2D/trunk/locate_receivers.F90
   seismo/2D/SPECFEM2D/trunk/meshfem2D.F90
   seismo/2D/SPECFEM2D/trunk/specfem2D.F90
Log:
Suppressed number of stations at the beginning of the STATIONS file


Modified: seismo/2D/SPECFEM2D/trunk/DATA/STATIONS
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/STATIONS	2008-01-13 04:20:53 UTC (rev 9001)
+++ seismo/2D/SPECFEM2D/trunk/DATA/STATIONS	2008-01-13 18:10:23 UTC (rev 9002)
@@ -1,4 +1,3 @@
-          11
 S0001    AA          300.0000000         2997.7298909       0.0         0.0
 S0002    AA          640.0000000         3008.0430011       0.0         0.0
 S0003    AA          980.0000000         3090.8224062       0.0         0.0

Modified: seismo/2D/SPECFEM2D/trunk/DATA/STATIONS_canyon
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/STATIONS_canyon	2008-01-13 04:20:53 UTC (rev 9001)
+++ seismo/2D/SPECFEM2D/trunk/DATA/STATIONS_canyon	2008-01-13 18:10:23 UTC (rev 9002)
@@ -1,4 +1,3 @@
-          80
 S0001    AA            9.0000000            9.0000000       0.0         0.0
 S0002    AA            9.0689655            9.0000000       0.0         0.0
 S0003    AA            9.1379310            9.0000000       0.0         0.0

Modified: seismo/2D/SPECFEM2D/trunk/locate_receivers.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/locate_receivers.F90	2008-01-13 04:20:53 UTC (rev 9001)
+++ seismo/2D/SPECFEM2D/trunk/locate_receivers.F90	2008-01-13 18:10:23 UTC (rev 9002)
@@ -105,22 +105,18 @@
 
 ! **************
 
-  if ( myrank == 0 ) then
-  write(IOUT,*)
-  write(IOUT,*) '********************'
-  write(IOUT,*) ' locating receivers'
-  write(IOUT,*) '********************'
-  write(IOUT,*)
-  write(IOUT,*) 'reading receiver information from the DATA/STATIONS file'
-  write(IOUT,*)
+  if (myrank == 0) then
+    write(IOUT,*)
+    write(IOUT,*) '********************'
+    write(IOUT,*) ' locating receivers'
+    write(IOUT,*) '********************'
+    write(IOUT,*)
+    write(IOUT,*) 'reading receiver information from the DATA/STATIONS file'
+    write(IOUT,*)
   endif
 
-! get number of stations from receiver file
   open(unit=1,file='DATA/STATIONS',status='old',action='read')
-  read(1,*) nrec_dummy
 
-  if(nrec_dummy /= nrec) call exit_MPI('problem with number of receivers')
-
 ! allocate memory for arrays using number of stations
   allocate(final_distance(nrec))
 

Modified: seismo/2D/SPECFEM2D/trunk/meshfem2D.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/meshfem2D.F90	2008-01-13 04:20:53 UTC (rev 9001)
+++ seismo/2D/SPECFEM2D/trunk/meshfem2D.F90	2008-01-13 18:10:23 UTC (rev 9002)
@@ -1222,7 +1222,7 @@
 
 !--- compute position of the receivers and write the STATIONS file
 
-  if ( generate_STATIONS ) then
+  if (generate_STATIONS) then
   print *
   print *,'writing the DATA/STATIONS file'
   print *
@@ -1238,7 +1238,6 @@
   print *
 
   open(unit=15,file='DATA/STATIONS',status='unknown')
-  write(15,*) nrec_total
 
   irec_global_number = 0
 

Modified: seismo/2D/SPECFEM2D/trunk/specfem2D.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/specfem2D.F90	2008-01-13 04:20:53 UTC (rev 9001)
+++ seismo/2D/SPECFEM2D/trunk/specfem2D.F90	2008-01-13 18:10:23 UTC (rev 9002)
@@ -137,8 +137,10 @@
   double precision, dimension(:), allocatable :: coorgread
 
 ! receiver information
+  integer :: nrec,ios
   integer, dimension(:), allocatable :: ispec_selected_rec
   double precision, dimension(:), allocatable :: xi_receiver,gamma_receiver,st_xval,st_zval
+  character(len=150) dummystring
 
 ! for seismograms
   double precision, dimension(:,:), allocatable :: sisux,sisuz
@@ -204,7 +206,7 @@
 
   double precision :: vpmin,vpmax
 
-  integer :: colors,numbers,subsamp,imagetype,NTSTEP_BETWEEN_OUTPUT_INFO,NTSTEP_BETWEEN_OUTPUT_SEISMO,nrec,seismotype
+  integer :: colors,numbers,subsamp,imagetype,NTSTEP_BETWEEN_OUTPUT_INFO,NTSTEP_BETWEEN_OUTPUT_SEISMO,seismotype
   integer :: numat,ngnod,nspec,pointsdisp,nelemabs,nelem_acoustic_surface,ispecabs
 
   logical interpol,meshvect,modelvect,boundvect,assign_external_model,initialfield, &
@@ -795,15 +797,19 @@
     enddo
   enddo
 
-! read total number of receivers
-  open(unit=IIN,file='DATA/STATIONS',status='old')
-  read(IIN,*) nrec
+! get number of stations from receiver file
+  open(unit=IIN,file='DATA/STATIONS',iostat=ios,status='old',action='read')
+  nrec = 0
+  do while(ios == 0)
+    read(IIN,"(a)",iostat=ios) dummystring
+    if(ios == 0) nrec = nrec + 1
+  enddo
   close(IIN)
 
-  if ( myrank == 0 ) then
-  write(IOUT,*)
-  write(IOUT,*) 'Total number of receivers = ',nrec
-  write(IOUT,*)
+  if (myrank == 0) then
+    write(IOUT,*)
+    write(IOUT,*) 'Total number of receivers = ',nrec
+    write(IOUT,*)
   endif
 
   if(nrec < 1) call exit_MPI('need at least one receiver')