[cig-commits] r19670 - in seismo/3D/SPECFEM3D/trunk: examples/homogeneous_halfspace src/meshfem3D src/specfem3D

[danielpeter at geodynamics.org]

Author: danielpeter
Date: 2012-02-23 18:28:08 -0800 (Thu, 23 Feb 2012)
New Revision: 19670

Modified:
   seismo/3D/SPECFEM3D/trunk/examples/homogeneous_halfspace/process.sh
   seismo/3D/SPECFEM3D/trunk/src/meshfem3D/meshfem3D.f90
   seismo/3D/SPECFEM3D/trunk/src/specfem3D/iterate_time.f90
Log:
adds estimated time output to timestamp files

Modified: seismo/3D/SPECFEM3D/trunk/examples/homogeneous_halfspace/process.sh
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/homogeneous_halfspace/process.sh	2012-02-24 01:11:55 UTC (rev 19669)
+++ seismo/3D/SPECFEM3D/trunk/examples/homogeneous_halfspace/process.sh	2012-02-24 02:28:08 UTC (rev 19670)
@@ -42,8 +42,8 @@
 cd bin/
 rm -f ./x*
 cp ../../../bin/xdecompose_mesh_SCOTCH ./
-cp ../../../bin/xgenerate_databases
-cp ../../../bin/xspecfem3D
+cp ../../../bin/xgenerate_databases ./
+cp ../../../bin/xspecfem3D ./
 cd ../
 
 # decomposes mesh

Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/meshfem3D.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/meshfem3D.f90	2012-02-24 01:11:55 UTC (rev 19669)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/meshfem3D.f90	2012-02-24 02:28:08 UTC (rev 19670)
@@ -345,11 +345,12 @@
 ! get interface data from external file to count the spectral elements along Z
   if(myrank == 0) then
      write(IMAIN,*) 'Reading interface data from file ',&
-          MF_IN_DATA_FILES_PATH(1:len_trim(MF_IN_DATA_FILES_PATH))//INTERFACES_FILE(1:len_trim(INTERFACES_FILE)), &
-          ' to count the spectral elements'
+      MF_IN_DATA_FILES_PATH(1:len_trim(MF_IN_DATA_FILES_PATH))//INTERFACES_FILE(1:len_trim(INTERFACES_FILE)), &
+      ' to count the spectral elements'
   end if
 
-  open(unit=IIN,file=MF_IN_DATA_FILES_PATH(1:len_trim(MF_IN_DATA_FILES_PATH))//INTERFACES_FILE,status='old')
+  open(unit=IIN,file=MF_IN_DATA_FILES_PATH(1:len_trim(MF_IN_DATA_FILES_PATH))//INTERFACES_FILE, &
+      status='old')
 
   max_npx_interface  = -1
   max_npy_interface  = -1

Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/iterate_time.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/iterate_time.f90	2012-02-24 01:11:55 UTC (rev 19669)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/iterate_time.f90	2012-02-24 02:28:08 UTC (rev 19670)
@@ -257,6 +257,16 @@
     ! adjoint simulations
     if (SIMULATION_TYPE == 3) write(IOUT,*) &
            'Max norm U (backward) in all slices = ',b_Usolidnorm_all
+    ! estimation
+    write(IOUT,*) 'Time steps done = ',it,' out of ',NSTEP
+    write(IOUT,*) 'Time steps remaining = ',NSTEP - it    
+    write(IOUT,*) 'Estimated remaining time in seconds = ',t_remain
+    write(IOUT,"(' Estimated remaining time in hh:mm:ss = ',i4,' h ',i2.2,' m ',i2.2,' s')") &
+             ihours_remain,iminutes_remain,iseconds_remain    
+    write(IOUT,*) 'Estimated total run time in seconds = ',t_total
+    write(IOUT,"(' Estimated total run time in hh:mm:ss = ',i4,' h ',i2.2,' m ',i2.2,' s')") &
+             ihours_total,iminutes_total,iseconds_total
+    write(IOUT,*) 'We have done ',sngl(100.d0*dble(it)/dble(NSTEP)),'% of that'           
     close(IOUT)