Merge branch 'develop' into cleanup_flow_solver_duplication

Author: pcarruscag

SU2_PY/SU2/util/filter_adjoint.py

@@ -27,11 +27,13 @@
 
 from __future__ import division, print_function, absolute_import
 
-import os, math
+import os
+import math
 from numpy import pi
 from optparse import OptionParser
 import numpy as np
-import libSU2, libSU2_mesh
+import libSU2
+import libSU2_mesh
 
 # plotting with matplotlib
 try:
@@ -179,7 +181,7 @@ def process_surface_adjoint( config_filename       ,
         Sens_smoother = smooth( S_clip, Sens_smooth, smth_len  , 'blackman' ) 
         Sens_filter = Sens_smooth + (Sens_smooth - Sens_smoother)             # sharpener
     else:
-        raise Exception, 'unknown filter type'
+        raise Exception('unknown filter type')
 
     # --------------------------------------------
     #  PLOTTING
@@ -282,8 +284,6 @@ def process_surface_adjoint( config_filename       ,
     print('----------------- Exit Success (Process Surface Adjoint) ----------------')
     print('')    
 
-    return
-
 #: def process_surface_adjoint()
 
 
@@ -472,10 +472,10 @@ def window(t,x,window_delta,window='hanning'):
     """
 
     if x.ndim != 1:
-        raise ValueError, "smooth only accepts 1 dimension arrays."
+        raise ValueError("smooth only accepts 1 dimension arrays.")
 
-    if not window in ['flat', 'hanning', 'hamming', 'bartlett', 'blackman']:
-        raise ValueError, "Window is not of 'flat', 'hanning', 'hamming', 'bartlett', 'blackman'"
+    if window not in ['flat', 'hanning', 'hamming', 'bartlett', 'blackman']:
+        raise ValueError("Window is not of 'flat', 'hanning', 'hamming', 'bartlett', 'blackman'")
 
     # interpolate to constant time sample width
     min_dt = np.min( np.diff(t) )
@@ -514,6 +514,7 @@ def window(t,x,window_delta,window='hanning'):
 #  Run Main from Command Line
 # -----------------------------------------------------------------
 
-if __name__ == '__main__': main()
+if __name__ == '__main__':
+    main()
 
 

SU2_PY/compute_uncertainty.py

@@ -27,7 +27,11 @@
 # imports
 import numpy as np
 from optparse import OptionParser
-import os, sys, shutil, copy, os.path
+import os
+import sys
+import shutil
+import copy
+import os.path
 sys.path.append(os.environ['SU2_RUN'])
 import SU2
 
@@ -66,13 +70,13 @@ def main():
 
     # perform eigenvalue perturbations
     for comp in range(1,4):
-        print "\n\n =================== Performing " + str(comp) + "  Component Perturbation =================== \n\n"
+        print('\n\n =================== Performing ' + str(comp) + '  Component Perturbation =================== \n\n')
 
         # make copies
         konfig = copy.deepcopy(config)
         ztate  = copy.deepcopy(state)
 
-	# set componentality
+        # set componentality
         konfig.UQ_COMPONENT = comp
 
         # send output to a folder
@@ -85,14 +89,14 @@ def main():
         # run su2
         info = SU2.run.CFD(konfig)
         ztate.update(info)
-	
-	# Solution merging
-    	konfig.SOLUTION_FILENAME = konfig.RESTART_FILENAME
-    	info = SU2.run.merge(konfig)
-    	ztate.update(info)
+
+        # Solution merging
+        konfig.SOLUTION_FILENAME = konfig.RESTART_FILENAME
+        info = SU2.run.merge(konfig)
+        ztate.update(info)
 
 
-    print "\n\n =================== Performing p1c1 Component Perturbation =================== \n\n"
+    print('\n\n =================== Performing p1c1 Component Perturbation =================== \n\n')
 
     # make copies
     konfig = copy.deepcopy(config)
@@ -118,7 +122,7 @@ def main():
     info = SU2.run.merge(konfig)
     state.update(info)
 
-    print "\n\n =================== Performing p1c2 Component Perturbation =================== \n\n"
+    print('\n\n =================== Performing p1c2 Component Perturbation =================== \n\n')
 
     # make copies
     konfig = copy.deepcopy(config)

SU2_PY/fsi_computation.py

@@ -29,7 +29,10 @@
 #  Imports
 # ----------------------------------------------------------------------
 
-import os, sys, shutil, copy
+import os
+import sys
+import shutil
+import copy
 import time as timer
 from math import *	# use mathematical expressions
 from optparse import OptionParser	# use a parser for configuration
@@ -56,7 +59,7 @@ def main():
 
   (options, args)=parser.parse_args()
 
-  if options.with_MPI == True:
+  if options.with_MPI:
     from mpi4py import MPI  # MPI is initialized from now by python and can be continued in C++ !
     comm = MPI.COMM_WORLD
     myid = comm.Get_rank()
@@ -74,9 +77,9 @@ def main():
   if myid == rootProcess:
       if os.getcwd() not in sys.path:
           sys.path.append(os.getcwd())
-	  print("Setting working directory : {}".format(os.getcwd()))
-      else: 
-	  print("Working directory is set to {}".format(os.getcwd()))
+          print("Setting working directory : {}".format(os.getcwd()))
+      else:
+          print("Working directory is set to {}".format(os.getcwd()))
 
   # starts timer
   start = timer.time()
@@ -89,7 +92,7 @@ def main():
 
   CSD_Solver = FSI_config['CSD_SOLVER']			# CSD solver
 
-  if have_MPI == True:
+  if have_MPI:
     comm.barrier()
 
   # --- Initialize the fluid solver --- #
@@ -99,13 +102,13 @@ def main():
     FluidSolver = pysu2.CFluidDriver(CFD_ConFile, 1, FSI_config['NDIM'], comm)
   except TypeError as exception:
     print('A TypeError occured in pysu2.CSingleZoneDriver : ',exception)
-    if have_MPI == True:
+    if have_MPI:
       print('ERROR : You are trying to initialize MPI with a serial build of the wrapper. Please, remove the --parallel option that is incompatible with a serial build.')
     else:
       print('ERROR : You are trying to launch a computation without initializing MPI but the wrapper has been built in parallel. Please add the --parallel option in order to initialize MPI for the wrapper.')
     return
 
-  if have_MPI == True:
+  if have_MPI:
     comm.barrier()
 
   # --- Initialize the solid solver --- # (!! for now we are using only serial solid solvers)
@@ -125,29 +128,29 @@ def main():
   else:
     SolidSolver = None
 
-  if have_MPI == True:
+  if have_MPI:
     comm.barrier()
 
   # --- Initialize and set the FSI interface (coupling environement) --- #
   if myid == rootProcess:
     print('\n***************************** Initializing FSI interface *****************************')
-  if have_MPI == True:
+  if have_MPI:
     comm.barrier()
   FSIInterface = FSI.Interface(FSI_config, FluidSolver, SolidSolver, have_MPI)
 
   if myid == rootProcess:
     print('\n***************************** Connect fluid and solid solvers *****************************')
-  if have_MPI == True:
+  if have_MPI:
     comm.barrier()
   FSIInterface.connect(FSI_config, FluidSolver, SolidSolver)
 
   if myid == rootProcess:
     print('\n***************************** Mapping fluid-solid interfaces *****************************')
-  if have_MPI == True:
+  if have_MPI:
     comm.barrier()
   FSIInterface.interfaceMapping(FluidSolver, SolidSolver, FSI_config)
 
-  if have_MPI == True: 
+  if have_MPI:
     comm.barrier()
 
   # --- Launch a steady or unsteady FSI computation --- #
@@ -177,15 +180,15 @@ def main():
       if myid == rootProcess:
         print('A KeyboardInterrupt occured in FSIInterface.SteadyFSI : ',exception)
 
-  if have_MPI == True:
+  if have_MPI:
     comm.barrier()
 
   # --- Exit cleanly the fluid and solid solvers --- #
   FluidSolver.Postprocessing()
   if myid == rootProcess:
       SolidSolver.exit()
 
-  if have_MPI == True:
+  if have_MPI:
     comm.barrier()
 
   # stops timer