diff options
-rw-r--r-- | doc/UsersGuide/ApplicationThorns.tex | 2 | ||||
-rw-r--r-- | lib/make/cctk_Config.h.in | 1 | ||||
-rw-r--r-- | lib/sbin/RunTestUtils.pl | 17 |
3 files changed, 6 insertions, 14 deletions
diff --git a/doc/UsersGuide/ApplicationThorns.tex b/doc/UsersGuide/ApplicationThorns.tex index 61a9970d..cc943339 100644 --- a/doc/UsersGuide/ApplicationThorns.tex +++ b/doc/UsersGuide/ApplicationThorns.tex @@ -3521,7 +3521,7 @@ matching as long as there are no whitespaces in the regular expression. For example: \begin{alltt} -ABSTOL 1e-8 ^Psi4\backslash.[xy] +ABSTOL 1e-8 ^Psi4.[xy] RELTOL 1e-12 gxx \end{alltt} diff --git a/lib/make/cctk_Config.h.in b/lib/make/cctk_Config.h.in index 648104d2..13cd301f 100644 --- a/lib/make/cctk_Config.h.in +++ b/lib/make/cctk_Config.h.in @@ -177,7 +177,6 @@ * version >= 20121010 to be on the safe side. */ #if (defined __INTEL_COMPILER && \ __INTEL_COMPILER_BUILD_DATE >= 20121010 && \ - __INTEL_COMPILER_BUILD_DATE < 20131008 && \ !defined CCTK_INTEL_COMPILER_DONT_DISABLE_RESTRICT) # define CCTK_DISABLE_RESTRICT 1 #endif diff --git a/lib/sbin/RunTestUtils.pl b/lib/sbin/RunTestUtils.pl index 26930ff3..d97dd8b9 100644 --- a/lib/sbin/RunTestUtils.pl +++ b/lib/sbin/RunTestUtils.pl @@ -854,7 +854,7 @@ sub PrintDataBase sub PrintToleranceTable { my($test,$thorn,$testdata,$runconfig) = @_; - my($fileabstol,$filereltol,$maxfilenamelen); + my($fileabstol,$filereltol); # Get default tolerances for the test if (defined($runconfig{"$thorn $test ABSTOL"}->{".*"})) @@ -882,22 +882,15 @@ sub PrintToleranceTable { $testreltol=$runconfig{"RELTOL"}; } - - # longest file name for table alignment - $maxfilenamelen = length("(.*)"); - foreach $file (split(" ",$testdata->{"$thorn $test DATAFILES"})) - { - $maxfilenamelen = length($file) if ($maxfilenamelen < length($file)); - } - + # Print test's default tolerances and any deviations print "------------------------------------------------------------------------\n\n"; print " Test $thorn: $test \n"; print " \"$testdata->{\"$thorn $test DESC\"}\"\n"; - print " File"," "x($maxfilenamelen-4),"\tAbs Tol\t\tRel Tol\n"; + print " File\t\tAbs Tol\t\tRel Tol\n"; print " --------------------------------------------------------------------\n"; - print " (.*)"," "x($maxfilenamelen-4),"\t$testabstol\t\t$testreltol\n"; + print " (.*)\t\t$testabstol\t\t$testreltol\n"; foreach $file (split(" ",$testdata->{"$thorn $test DATAFILES"})) { ($fileabstol, $filereltol)=&GetFileTolerances($test,$thorn,\%runconfig,$file); @@ -905,7 +898,7 @@ sub PrintToleranceTable if ( $filereltol == $testreltol ) { $filereltol="--"; } if ( $fileabstol ne "--" || $filereltol ne "--" ) { - print " $file"," "x($maxfilenamelen-length($file)),"\t$fileabstol\t\t$filereltol\n"; + print " $file\t\t$fileabstol\t\t$filereltol\n"; } } print "\n"; |