Added titles to xgraph files with name of variable being output

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/Extract/trunk@31 5301f0c2-dbc4-4cee-b2f5-8d7afba4d129

1 files changed, 66 insertions, 43 deletions

diff --git a/src/Extract.F b/src/Extract.F
index 6868a93..2387ace 100644
--- a/src/Extract.F
+++ b/src/Extract.F
@@ -58,7 +58,6 @@ c     Output variables from D3_extract
  
 c     Local variables
 
-      CCTK_INT :: nchar
       INTEGER :: 
      &     ix,iy,iz,fn1,fn2,lmin,lmax,mmin,mmax,lstep,mstep,
      &     il,im,it,ndet,idet,ioutput
@@ -84,13 +83,8 @@ c     Local variables
 
       INTEGER myproc,ierr
       CCTK_REAL dx,dy,dz
-      character*200 filestr
-      character*80 infoline
-
-c     ------------------------------------------------------------------
 
-c     Get the output directory sorted out
-      call CCTK_FortranString(nchar,outdir,filestr)
+      character*80 infoline
 
 c     ------------------------------------------------------------------
 
@@ -303,35 +297,35 @@ c           Open output files
 
             test_myproc1: IF (CCTK_MyProc(cctkGH) == 0 ) THEN
 
-               out1 = filestr(1:nchar)//"/rsch_ini.rl"
+               out1 = "rsch_ini.rl"
                call Extract_open(cctkGH,0,out1,77)
                
-               out1 = filestr(1:nchar)//"/mass_ini.rl"
+               out1 = "mass_ini.rl"
                call Extract_open(cctkGH,0,out1,78)
 
                IF (do_ADMmass(1) == 1) THEN
-                  out1 = filestr(1:nchar)//"/ADMmass_ini.rl"
+                  out1 = "ADMmass_ini.rl"
                   call Extract_open(cctkGH,0,out1,79)
                ENDIF
                IF (do_ADMmass(2) == 1) THEN
-                  out1 = filestr(1:nchar)//"/ADMmassc_ini.rl"
+                  out1 = "ADMmassc_ini.rl"
                   call Extract_open(cctkGH,0,out1,80)
                ENDIF
 
                IF (do_momentum == 1) THEN
-                  out1 = filestr(1:nchar)//"/momentum_x_ini.rl"
+                  out1 = "momentum_x_ini.rl"
                   call Extract_open(cctkGH,0,out1,781)
-                  out1 = filestr(1:nchar)//"/momentum_y_ini.rl"
+                  out1 = "momentum_y_ini.rl"
                   call Extract_open(cctkGH,0,out1,782)
-                  out1 = filestr(1:nchar)//"/momentum_z_ini.rl"
+                  out1 = "momentum_z_ini.rl"
                   call Extract_open(cctkGH,0,out1,783)
                ENDIF
                IF (do_spin == 1) THEN
-                  out1 = filestr(1:nchar)//"/spin_x_ini.rl"
+                  out1 = "spin_x_ini.rl"
                   call Extract_open(cctkGH,0,out1,784)
-                  out1 = filestr(1:nchar)//"/spin_y_ini.rl"
+                  out1 = "spin_y_ini.rl"
                   call Extract_open(cctkGH,0,out1,785)
-                  out1 = filestr(1:nchar)//"/spin_z_ini.rl"
+                  out1 = "spin_z_ini.rl"
                   call Extract_open(cctkGH,0,out1,786)
                ENDIF
 
@@ -346,14 +340,14 @@ c           Open output files
                   loop_m1: DO im = mmin,mmax,lstep
 
                      fn1 = il*10+im
-                     out1 = filestr(1:nchar)//"/Qeven_ini_"//
+                     out1 = "Qeven_ini_"//
      &                    CHAR(il+48)//CHAR(im+48)//".rl"
                      call Extract_open(cctkGH,0,out1,fn1)
 
 c                    Only print odd-parity if full grid
                      IF (igrid == 0) THEN
                         fn2 = 100+il*10+im
-                        out2 = filestr(1:nchar)//"/Qodd_ini_"//
+                        out2 = "Qodd_ini_"//
      &                       CHAR(il+48)//CHAR(im+48)//".rl"
                         call Extract_open(cctkGH,0,out2,fn2)
                      END IF
@@ -589,25 +583,25 @@ c           Output to files
                   IF (do_output) THEN
 
 c                   Output extracted radius and mass
-                     rschfile = filestr(1:nchar)//"/rsch_"//"R"//
+                     rschfile = "rsch_"//"R"//
      &                    CHAR(idet+48)//timestring
-                     massfile = filestr(1:nchar)//"/mass_"//"R"//
+                     massfile = "mass_"//"R"//
      &                    CHAR(idet+48)//timestring
-                     ADMmassfile1 = filestr(1:nchar)//"/ADMmass_"//"R"//
+                     ADMmassfile1 = "ADMmass_"//"R"//
      &                    CHAR(idet+48)//timestring
-                     ADMmassfile2 = filestr(1:nchar)//"/ADMmassc_"//"R"//
+                     ADMmassfile2 = "ADMmassc_"//"R"//
      &                    CHAR(idet+48)//timestring
-                     momentumfile1 = filestr(1:nchar)//"/momentum_x_"//"R"//
+                     momentumfile1 = "momentum_x_"//"R"//
      &                    CHAR(idet+48)//timestring
-                     momentumfile2 = filestr(1:nchar)//"/momentum_y_"//"R"//
+                     momentumfile2 = "momentum_y_"//"R"//
      &                    CHAR(idet+48)//timestring
-                     momentumfile3 = filestr(1:nchar)//"/momentum_z_"//"R"//
+                     momentumfile3 = "momentum_z_"//"R"//
      &                    CHAR(idet+48)//timestring
-                     spinfile1 = filestr(1:nchar)//"/spin_x_"//"R"//
+                     spinfile1 = "spin_x_"//"R"//
      &                    CHAR(idet+48)//timestring
-                     spinfile2 = filestr(1:nchar)//"/spin_y_"//"R"//
+                     spinfile2 = "spin_y_"//"R"//
      &                    CHAR(idet+48)//timestring
-                     spinfile3 = filestr(1:nchar)//"/spin_z_"//"R"//
+                     spinfile3 = "spin_z_"//"R"//
      &                    CHAR(idet+48)//timestring
                   
                      call Extract_write(cctkGH,openfile,rschfile,time,rsch)
@@ -642,10 +636,10 @@ c                    Output gauge invariant variables
                        
                        loop_m5: DO im = mmin,mmax,mstep
 
-                         out1 = filestr(1:nchar)//"/Qeven_"//"R"
+                         out1 = "Qeven_"//"R"
      &                        //CHAR(idet+48)//"_"//CHAR(il+48)//
      &                        CHAR(im+48)//timestring
-                         out2 = filestr(1:nchar)//"/Qodd_"//"R"
+                         out2 = "Qodd_"//"R"
      &                        //CHAR(idet+48)//"_"//CHAR(il+48)//
      &                        CHAR(im+48)//timestring
 
@@ -685,15 +679,24 @@ c                        Only write odd parity waveforms if full grid
 
       DECLARE_CCTK_PARAMETERS
 
-      integer filehandle,openfile
+      integer filehandle,openfile,nchar
       character*(*) filename
       CCTK_POINTER cctkGH
 
+      character*200 fullname
+      character*200 filestr
+
+c     Get the output directory sorted out
+      call CCTK_FortranString(nchar,outdir,filestr)
+      fullname = filestr(1:nchar)//"/"//filename
+
       if (openfile==1) then
-         OPEN(UNIT= filehandle,FILE=filename,STATUS="unknown")
-         call Extract_Advertise(cctkGH,filename)
+         OPEN(UNIT= filehandle,FILE=fullname,STATUS="unknown")
+         write(444,101) char(34),filename
+ 101     format(a1,a14)
+         call Extract_Advertise(cctkGH,fullname)
       else 
-         OPEN(UNIT=filehandle,FILE=filename,STATUS="old",POSITION="append")
+         OPEN(UNIT=filehandle,FILE=fullname,STATUS="old",POSITION="append")
       end if
 
 
@@ -708,14 +711,24 @@ c                        Only write odd parity waveforms if full grid
 
       CCTK_POINTER cctkGH
       CCTK_REAL value1,value2
-      integer openfile
+      integer openfile,nchar
       character*(*) filename
 
+      character*200 fullname
+      character*200 filestr
+      character*80 infoline
+
+c     Get the output directory sorted out
+      call CCTK_FortranString(nchar,outdir,filestr)
+      fullname = filestr(1:nchar)//"/"//filename
+
       if (openfile==1) then
-         OPEN(UNIT= 444,FILE=filename,STATUS="unknown")
-         call Extract_Advertise(cctkGH,filename)
+         OPEN(UNIT= 444,FILE=fullname,STATUS="unknown")
+         write(444,101) char(34),filename
+ 101     format(a1,a14)
+         call Extract_Advertise(cctkGH,fullname)
       else 
-         OPEN(UNIT=444,FILE=filename,STATUS="old",POSITION="append")
+         OPEN(UNIT=444,FILE=fullname,STATUS="old",POSITION="append")
       end if
 
       write(444,*) value1,value2
@@ -734,14 +747,24 @@ c                        Only write odd parity waveforms if full grid
       CCTK_POINTER cctkGH
       CCTK_REAL value1
       CCTK_REAL value2(2)
-      integer openfile
+      integer openfile,nchar
       character*(*) filename
 
+      character*200 fullname
+      character*200 filestr
+      character*80 infoline
+
+c     Get the output directory sorted out
+      call CCTK_FortranString(nchar,outdir,filestr)
+      fullname = filestr(1:nchar)//"/"//filename
+
       if (openfile==1) then
-         OPEN(UNIT= 444,FILE=filename,STATUS="unknown")
-         call Extract_Advertise(cctkGH,filename)
+         OPEN(UNIT= 444,FILE=fullname,STATUS="unknown")
+         write(444,101) char(34),filename
+ 101     format(a1,a14)
+         call Extract_Advertise(cctkGH,fullname)
       else 
-         OPEN(UNIT=444,FILE=filename,STATUS="old",POSITION="append")
+         OPEN(UNIT=444,FILE=fullname,STATUS="old",POSITION="append")
       end if
 
       write(444,*) value1,value2(1),value2(2)