Merge branch 'develop' into fix_primalgrid_const

Author: pcarruscag

SU2_PY/FSI_tools/FSIInterface.py

@@ -145,7 +145,7 @@ def __init__(self, FSI_config, FluidSolver, SolidSolver, have_MPI):
         self.aitkenParam = FSI_config['AITKEN_PARAM']			#relaxation parameter for the BGS method
         self.FSIIter = 0				#current FSI iteration
         self.unsteady = False				#flag for steady or unsteady simulation (default is steady)
-        if FSI_config['CSD_SOLVER']=='IMPOSED':
+        if FSI_config['IMPOSED_MOTION']=='YES':
           self.ImposedMotion = True
         else:
           self.ImposedMotion = False

SU2_PY/FSI_tools/FSI_config.py

@@ -112,20 +112,31 @@ def readConfig(self):
                  (this_param == "MESH_INTERP_METHOD") or \
                  (this_param == "DISP_PRED") or \
                  (this_param == "AITKEN_RELAX") or \
-                 (this_param == "TIME_MARCHING") :
+                 (this_param == "TIME_MARCHING") or \
+                 (this_param == "IMPOSED_MOTION") or \
+                 (this_param == "MAPPING_MODES"):
                 self._ConfigContent[this_param] = this_value
 
             else :
                 print(this_param + " is an invalid option !")
 
     def applyDefaults(self):
-        if self._ConfigContent["CSD_SOLVER"] == "IMPOSED":
+
+        if "MAPPING_MODES" not in self._ConfigContent:
+            self._ConfigContent["MAPPING_MODES"] = "NO"
+            print("MAPPING_MODES keyword was not found in the configuration file of the interface, setting to NO")
+
+        if "IMPOSED_MOTION" not in self._ConfigContent:
+            self._ConfigContent["IMPOSED_MOTION"] = "NO"
+            print("IMPOSED_MOTION keyword was not found in the configuration file of the interface, setting to NO")
+
+        if self._ConfigContent["IMPOSED_MOTION"] == "YES":
             if self._ConfigContent["AITKEN_RELAX"] != "STATIC" or self._ConfigContent["AITKEN_PARAM"] != 1.0:
-                print("WARNING: Setting the Aitken parameter as static and equal to 1 for IMPOSED solver")
-                self._ConfigContent["AITKEN_RELAX"] = "STATIC"
-                self._ConfigContent["AITKEN_PARAM"] = 1.0
+                raise Exception("When imposing motion, the Aitken parameter must be static and equal to 1")
 
         if self._ConfigContent["RESTART_SOL"] == "YES":
             if self._ConfigContent["TIME_TRESHOLD"] != -1:
-                print("WARNING: Setting the time threshold to -1 for immediate coupling when using restart")
-                self._ConfigContent["TIME_TRESHOLD"] = -1
+                raise Exception("When restarting a simulation, the time threshold must be -1 for immediate coupling")
+
+        if self._ConfigContent["MAPPING_MODES"] == "YES" and self._ConfigContent["CSD_SOLVER"]!="NATIVE":
+            raise Exception("Mapping modes only works with the native solver")

SU2_PY/fsi_computation.py

@@ -57,7 +57,7 @@ def main():
   (options, args)=parser.parse_args()
 
   if options.with_MPI:
-    from mpi4py import MPI  # MPI is initialized from now by python and can be continued in C++ !
+    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()
     numberPart = comm.Get_size()
@@ -112,23 +112,24 @@ def main():
   if have_MPI:
     comm.barrier()
 
-  # --- Initialize the solid solver --- # (!! for now we are using only serial solid solvers)
-  if myid == rootProcess:
-    print("\n")
-    print(" Initializing solid solver ".center(80,"*"))
-    if CSD_Solver == 'AEROELASTIC':
-      from SU2_Nastran import pysu2_nastran
-      SolidSolver = pysu2_nastran.Solver(CSD_ConFile,False)
-    elif CSD_Solver == 'IMPOSED':
-      from SU2_Nastran import pysu2_nastran
-      SolidSolver = pysu2_nastran.Solver(CSD_ConFile,True)
-    elif CSD_Solver == 'MAPPING':
-      from SU2_Nastran import pysu2_nastran
-      SolidSolver = pysu2_nastran.Solver(CSD_ConFile,True)
+  # --- Initialize the solid solver --- #
+  # Serial solvers
+  if CSD_Solver in ["NATIVE"]:
+    if myid == rootProcess:
+      print("\n")
+      print(" Initializing solid solver ".center(80,"*"))
+      if CSD_Solver == 'NATIVE':
+        from SU2_Nastran import pysu2_nastran
+        if FSI_config["IMPOSED_MOTION"] == "NO":
+          SolidSolver = pysu2_nastran.Solver(CSD_ConFile,False)
+        else:
+          SolidSolver = pysu2_nastran.Solver(CSD_ConFile,True)
     else:
-      print("\n Invalid solid solver option")
+      SolidSolver = None
+  # Parallel solvers
+  # For now we are only using serial solvers
   else:
-    SolidSolver = None
+    raise Exception('\n Invalid solid solver option')
 
   if have_MPI:
     comm.barrier()
@@ -158,7 +159,7 @@ def main():
   if have_MPI:
     comm.barrier()
 
-  if CSD_Solver != "MAPPING":
+  if FSI_config["MAPPING_MODES"] == "NO":
     # --- Launch a steady or unsteady FSI computation --- #
     if FSI_config['TIME_MARCHING'] == "YES":
       try: