[cig-commits] r19265 - in seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER: . src/specfem3D

[rietmann at geodynamics.org]

Author: rietmann
Date: 2011-12-05 01:16:02 -0800 (Mon, 05 Dec 2011)
New Revision: 19265

Modified:
   seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/README
   seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/specfem3D/iterate_time.f90
Log:
a crash fix for NOISE=3 and a few additions

Modified: seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/README
===================================================================
--- seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/README	2011-12-02 23:46:59 UTC (rev 19264)
+++ seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/README	2011-12-05 09:16:02 UTC (rev 19265)
@@ -19,4 +19,7 @@
   logical, parameter :: EXT_MESH_RECV_NORMAL = .true.
 
 Settings for Eiger
-./configure --with-cuda FC=mpif90 MPIFC=mpif90 CUDA_LIB=-L/apps/eiger/Cuda-4.0/cuda/lib64 MPI_INC=-I/apps/eiger/mvapich2/1.5.1p1/mvapich2-gnu/include
\ No newline at end of file
+./configure --with-cuda FC=mpif90 MPIFC=mpif90 CUDA_LIB=-L/apps/eiger/Cuda-4.0/cuda/lib64 MPI_INC=-I/apps/eiger/mvapich2/1.5.1p1/mvapich2-gnu/include
+
+Settings for todi.cscs.ch
+./configure --with-cuda FC=ftn MPIFC=ftn CUDA_LIB=-L$CUDA_HOME/lib64 MPI_INC=-I$MPICH_DIR/include
\ No newline at end of file

Modified: seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/specfem3D/iterate_time.f90
===================================================================
--- seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/specfem3D/iterate_time.f90	2011-12-02 23:46:59 UTC (rev 19264)
+++ seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/specfem3D/iterate_time.f90	2011-12-05 09:16:02 UTC (rev 19265)
@@ -125,14 +125,40 @@
 !
   enddo   ! end of main time loop
 
+  call it_print_elapsed_time()
+  
   ! Transfer fields from GPU card to host for further analysis
   if(GPU_MODE) call it_transfer_from_GPU()
 
   end subroutine iterate_time
 
 
-!=====================================================================
+  !=====================================================================
+  
+  subroutine it_print_elapsed_time()
+    use specfem_par
+    use specfem_par_elastic
+    use specfem_par_acoustic
+    implicit none
 
+    double precision :: tCPU,t_remain,t_total
+    integer :: ihours,iminutes,iseconds,int_tCPU, &
+         ihours_remain,iminutes_remain,iseconds_remain,int_t_remain, &
+         ihours_total,iminutes_total,iseconds_total,int_t_total
+    
+    if(myrank == 0) then
+       ! elapsed time since beginning of the simulation
+       tCPU = wtime() - time_start
+       int_tCPU = int(tCPU)
+       ihours = int_tCPU / 3600
+       iminutes = (int_tCPU - 3600*ihours) / 60
+       iseconds = int_tCPU - 3600*ihours - 60*iminutes
+       write(IMAIN,*) 'Time-Loop Complete. Timing info:'
+       write(IMAIN,*) 'Total elapsed time in seconds = ',tCPU
+       write(IMAIN,"(' Total elapsed time in hh:mm:ss = ',i4,' h ',i2.2,' m ',i2.2,' s')") ihours,iminutes,iseconds
+    endif
+  end subroutine it_print_elapsed_time
+
   subroutine it_check_stability()
 
 ! computes the maximum of the norm of the displacement
@@ -703,7 +729,7 @@
                               SIMULATION_TYPE,SAVE_FORWARD, &
                               ACOUSTIC_SIMULATION,ELASTIC_SIMULATION, &
                               ABSORBING_CONDITIONS,NOISE_TOMOGRAPHY,COMPUTE_AND_STORE_STRAIN, &
-                              ATTENUATION,OCEANS, &
+                              ATTENUATION,ANISOTROPY,OCEANS, &
                               APPROXIMATE_HESS_KL)
 
   end subroutine it_transfer_from_GPU