[cig-commits] [commit] master: writing xdmf files for all displ components (3a7fbba)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/axisem/compare/be819aae57cc99f055989132fc778afa4778d3ec...3a7fbbac2b69a2178e788da14208ab04e301cc5e

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

commit 3a7fbbac2b69a2178e788da14208ab04e301cc5e
Author: martinvandriel <martin at vandriel.de>
Date:   Tue Sep 16 20:13:15 2014 +0200

    writing xdmf files for all displ components


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

3a7fbbac2b69a2178e788da14208ab04e301cc5e
 SOLVER/nc_routines.F90 | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/SOLVER/nc_routines.F90 b/SOLVER/nc_routines.F90
index 7837b27..121926d 100644
--- a/SOLVER/nc_routines.F90
+++ b/SOLVER/nc_routines.F90
@@ -156,20 +156,21 @@ end subroutine
 !-----------------------------------------------------------------------------------------
 
 !-----------------------------------------------------------------------------------------
-subroutine dump_mesh_data_xdmf(filename, varname, npoints, nsnap)
-  character(len=*), intent(in)      :: filename, varname
+subroutine dump_mesh_data_xdmf(nc_filename_in, xdmf_filename_in, varname, npoints, nsnap)
+  character(len=*), intent(in)      :: nc_filename_in, xdmf_filename_in, varname
   integer, intent(in)               :: npoints, nsnap
 
   integer                           :: iinput_xdmf
   integer                           :: i
-  character(len=512)                :: filename_np
+  character(len=128)                :: xdmf_filename, nc_filename
 
-  ! relative filename for xdmf content
-  filename_np = trim(filename(index(filename, '/', back=.true.)+1:))
+  xdmf_filename = trim(nc_filename_in(:index(nc_filename_in, '/', back=.true.))) &
+                    // xdmf_filename_in
+  nc_filename = trim(nc_filename_in(index(nc_filename_in, '/', back=.true.)+1:))
 
   ! XML Data
-  open(newunit=iinput_xdmf, file=trim(filename)//'.xdmf')
-  write(iinput_xdmf, 733) npoints, npoints, trim(filename_np), npoints, trim(filename_np)
+  open(newunit=iinput_xdmf, file=trim(xdmf_filename))
+  write(iinput_xdmf, 733) npoints, npoints, trim(nc_filename), npoints, trim(nc_filename)
 
   do i=1, nsnap
      ! create new snapshot in the temporal collection
@@ -177,7 +178,7 @@ subroutine dump_mesh_data_xdmf(filename, varname, npoints, nsnap)
 
      ! write attribute
      write(iinput_xdmf, 7342) varname, npoints, i-1, npoints, nsnap, npoints, &
-                              trim(filename_np), trim(varname)
+                              trim(nc_filename), trim(varname)
 
      write(iinput_xdmf, 7343)
   enddo
@@ -1025,7 +1026,14 @@ subroutine nc_define_outputfile(nrec, rec_names, rec_th, rec_th_req, rec_ph, rec
               
               if (nstrain <= dumpstepsnap) dumpstepsnap = nstrain
               if (lpr) then
-                  call dump_mesh_data_xdmf(nc_fnam, 'Snapshots/disp_s',  &
+                  call dump_mesh_data_xdmf(trim(nc_fnam), 'disp_s.xdmf', 'Snapshots/disp_s',  &
+                                           npts_sol_global + npts_flu_global, & 
+                                           nstrain)
+                  if (src_type(1) /= 'monopole') &
+                     call dump_mesh_data_xdmf(trim(nc_fnam), 'disp_p.xdmf', 'Snapshots/disp_p',  &
+                                              npts_sol_global + npts_flu_global, & 
+                                              nstrain)
+                  call dump_mesh_data_xdmf(trim(nc_fnam), 'disp_z.xdmf', 'Snapshots/disp_z',  &
                                            npts_sol_global + npts_flu_global, & 
                                            nstrain)
               end if
@@ -1079,7 +1087,7 @@ subroutine nc_define_outputfile(nrec, rec_names, rec_th, rec_th_req, rec_ph, rec
               
               if (nstrain <= dumpstepsnap) dumpstepsnap = nstrain
               if (lpr) then
-                  call dump_mesh_data_xdmf(nc_fnam, 'Snapshots/straintrace',  &
+                  call dump_mesh_data_xdmf(nc_fnam, 'straintrace.xdmf', 'Snapshots/straintrace',  &
                                            npts_sol_global + npts_flu_global, & 
                                            nstrain)
               end if