Revert "Add an option for disabling preacc to tests."

This reverts commit dfe691b.

Author: jblueh

TestCases/TestCase.py

@@ -68,7 +68,6 @@ def __init__(self,tag_in):
         self.su2_exec    = "SU2_CFD" 
         self.timeout     = 300
         self.tol         = 0.001
-        self.no_preacc   = False
 
         # Options for file-comparison tests
         self.reference_file = "of_grad.dat.ref"
@@ -96,10 +95,6 @@ def run_test(self):
         if self.no_restart:
             self.disable_restart()
 
-        # Check for disabling preacc
-        if self.no_preacc:
-            self.disable_preacc()
-
         # Assemble the shell command to run SU2
         if len(self.test_vals) != 0:
             logfilename = '%s.log' % os.path.splitext(self.cfg_file)[0]
@@ -237,10 +232,6 @@ def run_filediff(self):
         # Adjust the number of iterations in the config file
         self.adjust_iter()
 
-        # Check for disabling preacc
-        if self.no_preacc:
-            self.disable_preacc()
-
         # if root, add flag to mpirun
         if os.geteuid()==0:
             if self.su2_exec.startswith('mpirun'):
@@ -333,10 +324,6 @@ def run_opt(self):
         # Adjust the number of iterations in the config file   
         self.adjust_opt_iter()
 
-        # Check for disabling preacc
-        if self.no_preacc:
-            self.disable_preacc()
-
         # Assemble the shell command to run SU2
         logfilename = '%s.log' % os.path.splitext(self.cfg_file)[0]
         command = "%s %s > %s 2>&1" % (self.su2_exec, self.cfg_file, logfilename)
@@ -774,41 +761,3 @@ def disable_restart(self):
 
         return
 
-    def disable_preacc(self):
-
-        # Read the cfg file
-        workdir = os.getcwd()
-        os.chdir(self.cfg_dir)
-        file_in = open(self.cfg_file, 'r')
-        lines   = file_in.readlines()
-        file_in.close()
-
-        # Rewrite the file with a .autotest extension
-        extension_added = False
-        if not self.cfg_file.endswith('.autotest'):
-            self.cfg_file = "%s.autotest"%self.cfg_file
-            extension_added = True
-        file_out = open(self.cfg_file,'w')
-        lines_to_skip = 0
-        if extension_added:
-            file_out.write('% This file automatically generated by the regression script\n')
-            file_out.write('% Preaccumulation disabled\n')
-        else:
-            while lines[lines_to_skip].startswith('%'):
-                file_out.write(lines[lines_to_skip])
-                lines_to_skip += 1
-            file_out.write('% Preaccumulation disabled\n')
-        preacc_configured = False
-        for line in lines[lines_to_skip:]:
-            if not line.startswith("PREACC"):
-                file_out.write(line)
-            else:
-                preacc_configured = True
-                file_out.write("PREACC= NO\n")
-        if not preacc_configured:
-            file_out.write("PREACC= NO\n")
-
-        file_out.close()
-        os.chdir(workdir)
-
-        return