diff options
29 files changed, 214 insertions, 163 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) diff --git a/test/test_extract/Qeven_R1_20.tl b/test/test_extract/Qeven_R1_20.tl index 83d690c..9f3441a 100644 --- a/test/test_extract/Qeven_R1_20.tl +++ b/test/test_extract/Qeven_R1_20.tl @@ -1,6 +1,7 @@ - 0.000000000000000 8.972052559819884E-005 - 6.000000000000000E-002 8.970378062771200E-005 - 0.120000000000000 8.965344700944420E-005 - 0.180000000000000 8.956922874185792E-005 - 0.240000000000000 8.945063280155110E-005 - 0.300000000000000 8.929696961305240E-005 +"Qeven_R1_20.tl + 0.000000000000000 8.972052559819884E-005 0.000000000000000 + 6.000000000000000E-002 8.970378062771200E-005 0.000000000000000 + 0.120000000000000 8.965344700944420E-005 0.000000000000000 + 0.180000000000000 8.956922874185792E-005 0.000000000000000 + 0.240000000000000 8.945063280155110E-005 0.000000000000000 + 0.300000000000000 8.929696961305240E-005 0.000000000000000 diff --git a/test/test_extract/Qeven_R1_20.ul b/test/test_extract/Qeven_R1_20.ul index d839c59..9235a05 100644 --- a/test/test_extract/Qeven_R1_20.ul +++ b/test/test_extract/Qeven_R1_20.ul @@ -1,6 +1,7 @@ - 0.000000000000000 8.972052559819884E-005 - 6.000123372338084E-002 8.970378062771200E-005 - 0.120002467446762 8.965344700944420E-005 - 0.180003701170143 8.956922874185792E-005 - 0.240004934893523 8.945063280155110E-005 - 0.300006168616904 8.929696961305240E-005 +"Qeven_R1_20.ul + 0.000000000000000 8.972052559819884E-005 0.000000000000000 + 6.000123372338084E-002 8.970378062771200E-005 0.000000000000000 + 0.120002467446762 8.965344700944420E-005 0.000000000000000 + 0.180003701170143 8.956922874185792E-005 0.000000000000000 + 0.240004934893523 8.945063280155110E-005 0.000000000000000 + 0.300006168616904 8.929696961305240E-005 0.000000000000000 diff --git a/test/test_extract/Qeven_R1_22.tl b/test/test_extract/Qeven_R1_22.tl index 8801aeb..e667a96 100644 --- a/test/test_extract/Qeven_R1_22.tl +++ b/test/test_extract/Qeven_R1_22.tl @@ -1,6 +1,7 @@ - 0.000000000000000 -1.429927191936292E-016 - 6.000000000000000E-002 -1.715957493915300E-016 - 0.120000000000000 -9.588443900459433E-017 - 0.180000000000000 -1.141612758587051E-016 - 0.240000000000000 -1.325056477610180E-016 - 0.300000000000000 -1.421876000352480E-016 +"Qeven_R1_22.tl + 0.000000000000000 -1.429927191936292E-016 0.000000000000000 + 6.000000000000000E-002 -1.715957493915300E-016 0.000000000000000 + 0.120000000000000 -9.588443900459433E-017 0.000000000000000 + 0.180000000000000 -1.141612758587051E-016 0.000000000000000 + 0.240000000000000 -1.325056477610180E-016 0.000000000000000 + 0.300000000000000 -1.421876000352480E-016 0.000000000000000 diff --git a/test/test_extract/Qeven_R1_22.ul b/test/test_extract/Qeven_R1_22.ul index b27e56b..b64fa62 100644 --- a/test/test_extract/Qeven_R1_22.ul +++ b/test/test_extract/Qeven_R1_22.ul @@ -1,6 +1,7 @@ - 0.000000000000000 -1.429927191936292E-016 - 6.000123372338084E-002 -1.715957493915300E-016 - 0.120002467446762 -9.588443900459433E-017 - 0.180003701170143 -1.141612758587051E-016 - 0.240004934893523 -1.325056477610180E-016 - 0.300006168616904 -1.421876000352480E-016 +"Qeven_R1_22.ul + 0.000000000000000 -1.429927191936292E-016 0.000000000000000 + 6.000123372338084E-002 -1.715957493915300E-016 0.000000000000000 + 0.120002467446762 -9.588443900459433E-017 0.000000000000000 + 0.180003701170143 -1.141612758587051E-016 0.000000000000000 + 0.240004934893523 -1.325056477610180E-016 0.000000000000000 + 0.300006168616904 -1.421876000352480E-016 0.000000000000000 diff --git a/test/test_extract/Qeven_R1_40.tl b/test/test_extract/Qeven_R1_40.tl index fe74cc1..6b1acf9 100644 --- a/test/test_extract/Qeven_R1_40.tl +++ b/test/test_extract/Qeven_R1_40.tl @@ -1,6 +1,7 @@ - 0.000000000000000 5.419467643140070E-003 - 6.000000000000000E-002 5.416284276317310E-003 - 0.120000000000000 5.406751055104460E-003 - 0.180000000000000 5.390918695748600E-003 - 0.240000000000000 5.368871920191480E-003 - 0.300000000000000 5.340729729175874E-003 +"Qeven_R1_40.tl + 0.000000000000000 5.419467643140070E-003 0.000000000000000 + 6.000000000000000E-002 5.416284276317310E-003 0.000000000000000 + 0.120000000000000 5.406751055104460E-003 0.000000000000000 + 0.180000000000000 5.390918695748600E-003 0.000000000000000 + 0.240000000000000 5.368871920191480E-003 0.000000000000000 + 0.300000000000000 5.340729729175874E-003 0.000000000000000 diff --git a/test/test_extract/Qeven_R1_40.ul b/test/test_extract/Qeven_R1_40.ul index 12385b1..df4b283 100644 --- a/test/test_extract/Qeven_R1_40.ul +++ b/test/test_extract/Qeven_R1_40.ul @@ -1,6 +1,7 @@ - 0.000000000000000 5.419467643140070E-003 - 6.000123372338084E-002 5.416284276317310E-003 - 0.120002467446762 5.406751055104460E-003 - 0.180003701170143 5.390918695748600E-003 - 0.240004934893523 5.368871920191480E-003 - 0.300006168616904 5.340729729175874E-003 +"Qeven_R1_40.ul + 0.000000000000000 5.419467643140070E-003 0.000000000000000 + 6.000123372338084E-002 5.416284276317310E-003 0.000000000000000 + 0.120002467446762 5.406751055104460E-003 0.000000000000000 + 0.180003701170143 5.390918695748600E-003 0.000000000000000 + 0.240004934893523 5.368871920191480E-003 0.000000000000000 + 0.300006168616904 5.340729729175874E-003 0.000000000000000 diff --git a/test/test_extract/Qeven_R1_42.tl b/test/test_extract/Qeven_R1_42.tl index a516580..9dd590e 100644 --- a/test/test_extract/Qeven_R1_42.tl +++ b/test/test_extract/Qeven_R1_42.tl @@ -1,6 +1,7 @@ - 0.000000000000000 1.839167570360290E-019 - 6.000000000000000E-002 -1.316475222282300E-017 - 0.120000000000000 2.063929520727801E-017 - 0.180000000000000 1.020223309918223E-017 - 0.240000000000000 5.890517438043270E-017 - 0.300000000000000 4.285901014202180E-017 +"Qeven_R1_42.tl + 0.000000000000000 1.839167570360290E-019 0.000000000000000 + 6.000000000000000E-002 -1.316475222282300E-017 0.000000000000000 + 0.120000000000000 2.063929520727801E-017 0.000000000000000 + 0.180000000000000 1.020223309918223E-017 0.000000000000000 + 0.240000000000000 5.890517438043270E-017 0.000000000000000 + 0.300000000000000 4.285901014202180E-017 0.000000000000000 diff --git a/test/test_extract/Qeven_R1_42.ul b/test/test_extract/Qeven_R1_42.ul index bb05c32..6985401 100644 --- a/test/test_extract/Qeven_R1_42.ul +++ b/test/test_extract/Qeven_R1_42.ul @@ -1,6 +1,7 @@ - 0.000000000000000 1.839167570360290E-019 - 6.000123372338084E-002 -1.316475222282300E-017 - 0.120002467446762 2.063929520727801E-017 - 0.180003701170143 1.020223309918223E-017 - 0.240004934893523 5.890517438043270E-017 - 0.300006168616904 4.285901014202180E-017 +"Qeven_R1_42.ul + 0.000000000000000 1.839167570360290E-019 0.000000000000000 + 6.000123372338084E-002 -1.316475222282300E-017 0.000000000000000 + 0.120002467446762 2.063929520727801E-017 0.000000000000000 + 0.180003701170143 1.020223309918223E-017 0.000000000000000 + 0.240004934893523 5.890517438043270E-017 0.000000000000000 + 0.300006168616904 4.285901014202180E-017 0.000000000000000 diff --git a/test/test_extract/Qeven_R1_44.tl b/test/test_extract/Qeven_R1_44.tl index 9b54f75..98661ee 100644 --- a/test/test_extract/Qeven_R1_44.tl +++ b/test/test_extract/Qeven_R1_44.tl @@ -1,6 +1,7 @@ - 0.000000000000000 3.246410001833720E-003 - 6.000000000000000E-002 3.244501609592321E-003 - 0.120000000000000 3.238786497720730E-003 - 0.180000000000000 3.229294907844053E-003 - 0.240000000000000 3.216077359689030E-003 - 0.300000000000000 3.199204815125520E-003 +"Qeven_R1_44.tl + 0.000000000000000 3.246410001833720E-003 0.000000000000000 + 6.000000000000000E-002 3.244501609592321E-003 0.000000000000000 + 0.120000000000000 3.238786497720730E-003 0.000000000000000 + 0.180000000000000 3.229294907844053E-003 0.000000000000000 + 0.240000000000000 3.216077359689030E-003 0.000000000000000 + 0.300000000000000 3.199204815125520E-003 0.000000000000000 diff --git a/test/test_extract/Qeven_R1_44.ul b/test/test_extract/Qeven_R1_44.ul index d77ba80..0e653b8 100644 --- a/test/test_extract/Qeven_R1_44.ul +++ b/test/test_extract/Qeven_R1_44.ul @@ -1,6 +1,7 @@ - 0.000000000000000 3.246410001833720E-003 - 6.000123372338084E-002 3.244501609592321E-003 - 0.120002467446762 3.238786497720730E-003 - 0.180003701170143 3.229294907844053E-003 - 0.240004934893523 3.216077359689030E-003 - 0.300006168616904 3.199204815125520E-003 +"Qeven_R1_44.ul + 0.000000000000000 3.246410001833720E-003 0.000000000000000 + 6.000123372338084E-002 3.244501609592321E-003 0.000000000000000 + 0.120002467446762 3.238786497720730E-003 0.000000000000000 + 0.180003701170143 3.229294907844053E-003 0.000000000000000 + 0.240004934893523 3.216077359689030E-003 0.000000000000000 + 0.300006168616904 3.199204815125520E-003 0.000000000000000 diff --git a/test/test_extract/Qeven_R2_20.tl b/test/test_extract/Qeven_R2_20.tl index 7edac66..08156ce 100644 --- a/test/test_extract/Qeven_R2_20.tl +++ b/test/test_extract/Qeven_R2_20.tl @@ -1,6 +1,7 @@ - 0.000000000000000 3.444552929179100E-006 - 6.000000000000000E-002 3.400325691078150E-006 - 0.120000000000000 3.267643867003920E-006 - 0.180000000000000 3.046471729133420E-006 - 0.240000000000000 2.736637062931090E-006 - 0.300000000000000 2.337680215642520E-006 +"Qeven_R2_20.tl + 0.000000000000000 3.444552929179100E-006 0.000000000000000 + 6.000000000000000E-002 3.400325691078150E-006 0.000000000000000 + 0.120000000000000 3.267643867003920E-006 0.000000000000000 + 0.180000000000000 3.046471729133420E-006 0.000000000000000 + 0.240000000000000 2.736637062931090E-006 0.000000000000000 + 0.300000000000000 2.337680215642520E-006 0.000000000000000 diff --git a/test/test_extract/Qeven_R2_20.ul b/test/test_extract/Qeven_R2_20.ul index 92cef3a..0a1dbdd 100644 --- a/test/test_extract/Qeven_R2_20.ul +++ b/test/test_extract/Qeven_R2_20.ul @@ -1,6 +1,7 @@ - 0.000000000000000 3.444552929179100E-006 - 6.000123372338084E-002 3.400325691078150E-006 - 0.120002467446762 3.267643867003920E-006 - 0.180003701170143 3.046471729133420E-006 - 0.240004934893523 2.736637062931090E-006 - 0.300006168616904 2.337680215642520E-006 +"Qeven_R2_20.ul + 0.000000000000000 3.444552929179100E-006 0.000000000000000 + 6.000123372338084E-002 3.400325691078150E-006 0.000000000000000 + 0.120002467446762 3.267643867003920E-006 0.000000000000000 + 0.180003701170143 3.046471729133420E-006 0.000000000000000 + 0.240004934893523 2.736637062931090E-006 0.000000000000000 + 0.300006168616904 2.337680215642520E-006 0.000000000000000 diff --git a/test/test_extract/Qeven_R2_22.tl b/test/test_extract/Qeven_R2_22.tl index 09a5d36..5dc59e1 100644 --- a/test/test_extract/Qeven_R2_22.tl +++ b/test/test_extract/Qeven_R2_22.tl @@ -1,6 +1,7 @@ - 0.000000000000000 -9.911198406843690E-018 - 6.000000000000000E-002 2.258406099950760E-018 - 0.120000000000000 1.727575088711200E-017 - 0.180000000000000 -1.122674261675461E-017 - 0.240000000000000 -1.293437973374160E-017 - 0.300000000000000 -6.418089601519781E-018 +"Qeven_R2_22.tl + 0.000000000000000 -9.911198406843690E-018 0.000000000000000 + 6.000000000000000E-002 2.258406099950760E-018 0.000000000000000 + 0.120000000000000 1.727575088711200E-017 0.000000000000000 + 0.180000000000000 -1.122674261675461E-017 0.000000000000000 + 0.240000000000000 -1.293437973374160E-017 0.000000000000000 + 0.300000000000000 -6.418089601519781E-018 0.000000000000000 diff --git a/test/test_extract/Qeven_R2_22.ul b/test/test_extract/Qeven_R2_22.ul index afa3358..6b0f9c3 100644 --- a/test/test_extract/Qeven_R2_22.ul +++ b/test/test_extract/Qeven_R2_22.ul @@ -1,6 +1,7 @@ - 0.000000000000000 -9.911198406843690E-018 - 6.000123372338084E-002 2.258406099950760E-018 - 0.120002467446762 1.727575088711200E-017 - 0.180003701170143 -1.122674261675461E-017 - 0.240004934893523 -1.293437973374160E-017 - 0.300006168616904 -6.418089601519781E-018 +"Qeven_R2_22.ul + 0.000000000000000 -9.911198406843690E-018 0.000000000000000 + 6.000123372338084E-002 2.258406099950760E-018 0.000000000000000 + 0.120002467446762 1.727575088711200E-017 0.000000000000000 + 0.180003701170143 -1.122674261675461E-017 0.000000000000000 + 0.240004934893523 -1.293437973374160E-017 0.000000000000000 + 0.300006168616904 -6.418089601519781E-018 0.000000000000000 diff --git a/test/test_extract/Qeven_R2_40.tl b/test/test_extract/Qeven_R2_40.tl index 02094f3..8be0a02 100644 --- a/test/test_extract/Qeven_R2_40.tl +++ b/test/test_extract/Qeven_R2_40.tl @@ -1,6 +1,7 @@ - 0.000000000000000 2.863242322505190E-003 - 6.000000000000000E-002 2.861516772828220E-003 - 0.120000000000000 2.856345829157490E-003 - 0.180000000000000 2.847739979660552E-003 - 0.240000000000000 2.835695143562180E-003 - 0.300000000000000 2.820162256447334E-003 +"Qeven_R2_40.tl + 0.000000000000000 2.863242322505190E-003 0.000000000000000 + 6.000000000000000E-002 2.861516772828220E-003 0.000000000000000 + 0.120000000000000 2.856345829157490E-003 0.000000000000000 + 0.180000000000000 2.847739979660552E-003 0.000000000000000 + 0.240000000000000 2.835695143562180E-003 0.000000000000000 + 0.300000000000000 2.820162256447334E-003 0.000000000000000 diff --git a/test/test_extract/Qeven_R2_40.ul b/test/test_extract/Qeven_R2_40.ul index 81d770e..af83a93 100644 --- a/test/test_extract/Qeven_R2_40.ul +++ b/test/test_extract/Qeven_R2_40.ul @@ -1,6 +1,7 @@ - 0.000000000000000 2.863242322505190E-003 - 6.000123372338084E-002 2.861516772828220E-003 - 0.120002467446762 2.856345829157490E-003 - 0.180003701170143 2.847739979660552E-003 - 0.240004934893523 2.835695143562180E-003 - 0.300006168616904 2.820162256447334E-003 +"Qeven_R2_40.ul + 0.000000000000000 2.863242322505190E-003 0.000000000000000 + 6.000123372338084E-002 2.861516772828220E-003 0.000000000000000 + 0.120002467446762 2.856345829157490E-003 0.000000000000000 + 0.180003701170143 2.847739979660552E-003 0.000000000000000 + 0.240004934893523 2.835695143562180E-003 0.000000000000000 + 0.300006168616904 2.820162256447334E-003 0.000000000000000 diff --git a/test/test_extract/Qeven_R2_42.tl b/test/test_extract/Qeven_R2_42.tl index 8ba33f8..537ab38 100644 --- a/test/test_extract/Qeven_R2_42.tl +++ b/test/test_extract/Qeven_R2_42.tl @@ -1,6 +1,7 @@ - 0.000000000000000 -1.413901178966644E-016 - 6.000000000000000E-002 -1.532675122003234E-016 - 0.120000000000000 -1.324608622008160E-016 - 0.180000000000000 -1.522217254887320E-016 - 0.240000000000000 -1.891501665412580E-016 - 0.300000000000000 -1.170247430161871E-016 +"Qeven_R2_42.tl + 0.000000000000000 -1.413901178966644E-016 0.000000000000000 + 6.000000000000000E-002 -1.532675122003234E-016 0.000000000000000 + 0.120000000000000 -1.324608622008160E-016 0.000000000000000 + 0.180000000000000 -1.522217254887320E-016 0.000000000000000 + 0.240000000000000 -1.891501665412580E-016 0.000000000000000 + 0.300000000000000 -1.170247430161871E-016 0.000000000000000 diff --git a/test/test_extract/Qeven_R2_42.ul b/test/test_extract/Qeven_R2_42.ul index 02333bc..ec4afe7 100644 --- a/test/test_extract/Qeven_R2_42.ul +++ b/test/test_extract/Qeven_R2_42.ul @@ -1,6 +1,7 @@ - 0.000000000000000 -1.413901178966644E-016 - 6.000123372338084E-002 -1.532675122003234E-016 - 0.120002467446762 -1.324608622008160E-016 - 0.180003701170143 -1.522217254887320E-016 - 0.240004934893523 -1.891501665412580E-016 - 0.300006168616904 -1.170247430161871E-016 +"Qeven_R2_42.ul + 0.000000000000000 -1.413901178966644E-016 0.000000000000000 + 6.000123372338084E-002 -1.532675122003234E-016 0.000000000000000 + 0.120002467446762 -1.324608622008160E-016 0.000000000000000 + 0.180003701170143 -1.522217254887320E-016 0.000000000000000 + 0.240004934893523 -1.891501665412580E-016 0.000000000000000 + 0.300006168616904 -1.170247430161871E-016 0.000000000000000 diff --git a/test/test_extract/Qeven_R2_44.tl b/test/test_extract/Qeven_R2_44.tl index e1fe048..de5a785 100644 --- a/test/test_extract/Qeven_R2_44.tl +++ b/test/test_extract/Qeven_R2_44.tl @@ -1,6 +1,7 @@ - 0.000000000000000 1.683152102526570E-003 - 6.000000000000000E-002 1.682126830080770E-003 - 0.120000000000000 1.679054429567830E-003 - 0.180000000000000 1.673941198019380E-003 - 0.240000000000000 1.666784768830793E-003 - 0.300000000000000 1.657555966034450E-003 +"Qeven_R2_44.tl + 0.000000000000000 1.683152102526570E-003 0.000000000000000 + 6.000000000000000E-002 1.682126830080770E-003 0.000000000000000 + 0.120000000000000 1.679054429567830E-003 0.000000000000000 + 0.180000000000000 1.673941198019380E-003 0.000000000000000 + 0.240000000000000 1.666784768830793E-003 0.000000000000000 + 0.300000000000000 1.657555966034450E-003 0.000000000000000 diff --git a/test/test_extract/Qeven_R2_44.ul b/test/test_extract/Qeven_R2_44.ul index 4b70c13..6cf8e55 100644 --- a/test/test_extract/Qeven_R2_44.ul +++ b/test/test_extract/Qeven_R2_44.ul @@ -1,6 +1,7 @@ - 0.000000000000000 1.683152102526570E-003 - 6.000123372338084E-002 1.682126830080770E-003 - 0.120002467446762 1.679054429567830E-003 - 0.180003701170143 1.673941198019380E-003 - 0.240004934893523 1.666784768830793E-003 - 0.300006168616904 1.657555966034450E-003 +"Qeven_R2_44.ul + 0.000000000000000 1.683152102526570E-003 0.000000000000000 + 6.000123372338084E-002 1.682126830080770E-003 0.000000000000000 + 0.120002467446762 1.679054429567830E-003 0.000000000000000 + 0.180003701170143 1.673941198019380E-003 0.000000000000000 + 0.240004934893523 1.666784768830793E-003 0.000000000000000 + 0.300006168616904 1.657555966034450E-003 0.000000000000000 diff --git a/test/test_extract/mass_R1.tl b/test/test_extract/mass_R1.tl index c2170f4..2fc9ec9 100644 --- a/test/test_extract/mass_R1.tl +++ b/test/test_extract/mass_R1.tl @@ -1,3 +1,4 @@ +"mass_R1.tl 0.000000000000000 1.00215289105785 6.000000000000000E-002 1.00211680403105 0.120000000000000 1.00200854783692 diff --git a/test/test_extract/mass_R1.ul b/test/test_extract/mass_R1.ul index 9b2deb0..2273b11 100644 --- a/test/test_extract/mass_R1.ul +++ b/test/test_extract/mass_R1.ul @@ -1,3 +1,4 @@ +"mass_R1.ul 0.000000000000000 1.00215289105785 6.000123372338084E-002 1.00211680403105 0.120002467446762 1.00200854783692 diff --git a/test/test_extract/mass_R2.tl b/test/test_extract/mass_R2.tl index 4c3c13d..83744f7 100644 --- a/test/test_extract/mass_R2.tl +++ b/test/test_extract/mass_R2.tl @@ -1,3 +1,4 @@ +"mass_R2.tl 0.000000000000000 1.00140132658945 6.000000000000000E-002 1.00137612159190 0.120000000000000 1.00130050924648 diff --git a/test/test_extract/mass_R2.ul b/test/test_extract/mass_R2.ul index 7684ad7..9349298 100644 --- a/test/test_extract/mass_R2.ul +++ b/test/test_extract/mass_R2.ul @@ -1,3 +1,4 @@ +"mass_R2.ul 0.000000000000000 1.00140132658945 6.000123372338084E-002 1.00137612159190 0.120002467446762 1.00130050924648 diff --git a/test/test_extract/rsch_R1.tl b/test/test_extract/rsch_R1.tl index 772210b..08876aa 100644 --- a/test/test_extract/rsch_R1.tl +++ b/test/test_extract/rsch_R1.tl @@ -1,3 +1,4 @@ +"rsch_R1.tl 0.000000000000000 3.60015516306996 6.000000000000000E-002 3.60001705673354 0.120000000000000 3.59960271823300 diff --git a/test/test_extract/rsch_R1.ul b/test/test_extract/rsch_R1.ul index a4790fc..efb4f38 100644 --- a/test/test_extract/rsch_R1.ul +++ b/test/test_extract/rsch_R1.ul @@ -1,3 +1,4 @@ +"rsch_R1.ul 0.000000000000000 3.60015516306996 6.000123372338084E-002 3.60001705673354 0.120002467446762 3.59960271823300 diff --git a/test/test_extract/rsch_R2.tl b/test/test_extract/rsch_R2.tl index 990457f..a7f1104 100644 --- a/test/test_extract/rsch_R2.tl +++ b/test/test_extract/rsch_R2.tl @@ -1,3 +1,4 @@ +"rsch_R2.tl 0.000000000000000 4.08341378093056 6.000000000000000E-002 4.08330620977965 0.120000000000000 4.08298348570685 diff --git a/test/test_extract/rsch_R2.ul b/test/test_extract/rsch_R2.ul index b0c4a2e..8af3607 100644 --- a/test/test_extract/rsch_R2.ul +++ b/test/test_extract/rsch_R2.ul @@ -1,3 +1,4 @@ +"rsch_R2.ul 0.000000000000000 4.08341378093056 6.000123372338084E-002 4.08330620977965 0.120002467446762 4.08298348570685 |