[cig-commits] [commit] master: avoding dependence of nc_routines on nc_snapshots (ed7fe18)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/axisem

On branch  : master
Link       : https://github.com/geodynamics/axisem/compare/607f803cf074063627513d235f9ed0837fc1dd44...b6457db24acdde4a4e1c08935ae1b22adf87f5bf

>---------------------------------------------------------------

commit ed7fe18e43d0f2c91f031811e030ec5d1cea53c1
Author: martinvandriel <vandriel at erdw.ethz.ch>
Date:   Thu Oct 16 19:45:21 2014 +0200

    avoding dependence of nc_routines on nc_snapshots


>---------------------------------------------------------------

ed7fe18e43d0f2c91f031811e030ec5d1cea53c1
 SOLVER/data_io.f90     | 3 ---
 SOLVER/main.f90        | 4 +++-
 SOLVER/nc_routines.F90 | 4 ----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/SOLVER/data_io.f90 b/SOLVER/data_io.f90
index 43dcd04..1f1a020 100644
--- a/SOLVER/data_io.f90
+++ b/SOLVER/data_io.f90
@@ -41,9 +41,6 @@ module data_io
 
   logical           :: need_fluid_displ
   real(kind=dp)     :: strain_samp
-  !integer           :: iseismo  !< current seismogram sample
-  !integer           :: istrain  !< current kernel wavefield sample
-  !integer           :: isnap    !< current wavefield sample for movies
   integer           :: nseismo  !< Number of seismogram samples
   integer           :: nstrain  !< Number of wavefield dumps for kernels
   integer           :: nsnap    !< Number of wavefield snapshots for movies
diff --git a/SOLVER/main.f90 b/SOLVER/main.f90
index 4b49fed..dc5d2d6 100644
--- a/SOLVER/main.f90
+++ b/SOLVER/main.f90
@@ -26,6 +26,7 @@ program axisem
   use data_proc,      only : nproc, mynum, appnproc, appmynum, lpr, procstrg
   use data_io,        only : dump_xdmf, use_netcdf, verbose
   use nc_routines,    only : nc_end_output, nc_finish_prepare
+  use nc_snapshots,   only : nc_close_snapfile
   use data_source,    only : isim,num_simul
   use data_mesh,      only : do_mesh_tests
   use parameters,     only : open_local_output_file, readin_parameters, &
@@ -101,7 +102,8 @@ program axisem
   
   if (dump_xdmf) then
      if (lpr .and. verbose >= 1) write(6,*)'MAIN: Finishing xdmf xml file...'
-     call finish_xdmf_xml() ! meshes_io
+     call finish_xdmf_xml ! meshes_io
+     call nc_close_snapfile ! nc_snapshots
   endif
 
   call end_clock ! clocks
diff --git a/SOLVER/nc_routines.F90 b/SOLVER/nc_routines.F90
index 094da96..420d341 100644
--- a/SOLVER/nc_routines.F90
+++ b/SOLVER/nc_routines.F90
@@ -1940,7 +1940,6 @@ subroutine nc_end_output
 #ifdef enable_netcdf
     use data_mesh, only: num_rec
     use data_io,   only: dump_xdmf
-    use nc_snapshots
     integer           :: iproc
 
     call flush(6)
@@ -1963,9 +1962,6 @@ subroutine nc_end_output
         call nc_dump_rec_to_disk()
     endif
 #endif
-    if (dump_xdmf) then
-        call nc_close_snapfile
-    end if
 
     !Set the finalized flag to true in the output file
 #ifndef enable_parallel_netcdf