Fixes as suggested by reviewers

Author: Nicola-Fonzi

SU2_PY/FSI_tools/FSIInterface.py

@@ -2129,72 +2129,72 @@ def SteadyFSI(self, FSI_config,FluidSolver, SolidSolver):
           self.MPIPrint(' ')
 
     def MapModes(self, FSI_config, FluidSolver, SolidSolver):
-          """
-          Runs nothing, just extract the structural modes mapped on the fluid mesh
-          """
-
-          if self.have_MPI:
-            myid = self.comm.Get_rank()
-            numberPart = self.comm.Get_size()
-          else:
-            myid = 0
-            numberPart = 1
-
-          nodeNormals = {}
-          for iVertex in range(self.nLocalFluidInterfaceNodes):
-              nx, ny, nz = FluidSolver.GetVertexNormal(self.fluidInterfaceIdentifier, iVertex, False)
-              GlobalIndex = FluidSolver.GetVertexGlobalIndex(self.fluidInterfaceIdentifier, iVertex)
-              nodeNormals[GlobalIndex] = [nx, ny, nz]
-
-          nodeNormals = self.comm.gather(nodeNormals, root=self.rootProcess)
-          if myid == self.rootProcess:
-              normalsToPrint = {}
-              for iDictionary in range(numberPart):
-                  for key, value in nodeNormals[iDictionary].items():
-                      normalsToPrint[key] = value
-              normalsToPrint = dict(sorted(normalsToPrint.items()))
-              with open('Normals.csv', 'w') as f:
-                  writer = csv.writer(f)
-                  for key, value in normalsToPrint.items():
-                      writer.writerow([key, value])
-
-
-          SurfaceFileName = FluidSolver.GetSurfaceFileName()
+      """
+      Runs nothing, just extract the structural modes mapped on the fluid mesh
+      """
 
-          self.MPIPrint('\n********************************')
-          self.MPIPrint('* Begin mapping the modes *')
-          self.MPIPrint('********************************\n')
-          self.MPIPrint("\n")
+      if self.have_MPI:
+        myid = self.comm.Get_rank()
+        numberPart = self.comm.Get_size()
+      else:
+        myid = 0
+        numberPart = 1
 
-          if myid == self.rootProcess:  # The root process contains the solid solver for sure
-              modesNumber = np.array(int(SolidSolver.getNumberOfModes()))
-          else:
-              modesNumber = np.empty(1, dtype=np.int)
+      nodeNormals = {}
+      for iVertex in range(self.nLocalFluidInterfaceNodes):
+        nx, ny, nz = FluidSolver.GetVertexNormal(self.fluidInterfaceIdentifier, iVertex, False)
+        GlobalIndex = FluidSolver.GetVertexGlobalIndex(self.fluidInterfaceIdentifier, iVertex)
+        nodeNormals[GlobalIndex] = [nx, ny, nz]
 
-          self.comm.Bcast(modesNumber, root=self.rootProcess)
+      nodeNormals = self.comm.gather(nodeNormals, root=self.rootProcess)
+      if myid == self.rootProcess:
+        normalsToPrint = {}
+        for iDictionary in range(numberPart):
+          for key, value in nodeNormals[iDictionary].items():
+            normalsToPrint[key] = value
+        normalsToPrint = dict(sorted(normalsToPrint.items()))
+        with open('Normals.csv', 'w') as f:
+          writer = csv.writer(f)
+          for key, value in normalsToPrint.items():
+            writer.writerow([key, value])
+
+
+      SurfaceFileName = FluidSolver.GetSurfaceFileName()
+
+      self.MPIPrint('\n********************************')
+      self.MPIPrint('* Begin mapping the modes *')
+      self.MPIPrint('********************************\n')
+      self.MPIPrint("\n")
+
+      if myid == self.rootProcess:  # The root process contains the solid solver for sure
+        modesNumber = np.array(int(SolidSolver.getNumberOfModes()))
+      else:
+        modesNumber = np.empty(1, dtype=np.int)
 
-          for mode in range(np.asscalar(modesNumber)):
-              self.MPIPrint("Setting mode {} active".format(mode))
-              if myid in self.solidSolverProcessors:
-                  SolidSolver.activateMode(mode)
-              self.MPIBarrier()
-              self.getSolidInterfaceDisplacement(SolidSolver)
-              self.interpolateSolidPositionOnFluidMesh(FSI_config)
-              self.setFluidInterfaceVarCoord(FluidSolver)
+      self.comm.Bcast(modesNumber, root=self.rootProcess)
 
-              self.MPIPrint('\nPerforming mesh deformation...\n')
-              FluidSolver.DynamicMeshUpdate(0)
-              FluidSolver.Output(0)
-              self.MPIBarrier()
+      for mode in range(np.asscalar(modesNumber)):
+        self.MPIPrint("Setting mode {} active".format(mode))
+        if myid in self.solidSolverProcessors:
+          SolidSolver.activateMode(mode)
+        self.MPIBarrier()
+        self.getSolidInterfaceDisplacement(SolidSolver)
+        self.interpolateSolidPositionOnFluidMesh(FSI_config)
+        self.setFluidInterfaceVarCoord(FluidSolver)
 
-              if myid == self.rootProcess:
-                  AllFiles = os.listdir()
-                  for FileNumber,FileName in enumerate(AllFiles):
-                      if SurfaceFileName in FileName:
-                          file = FileName.split(".")[0]
-                          extension = FileName.split(".")[1]
-                          os.rename(file+"."+extension,"Mode{}.".format(mode)+extension)
+        self.MPIPrint('\nPerforming mesh deformation...\n')
+        FluidSolver.DynamicMeshUpdate(0)
+        FluidSolver.Output(0)
+        self.MPIBarrier()
 
-          self.MPIPrint('\n*************************')
-          self.MPIPrint('*  Mapping completed  *')
-          self.MPIPrint('*************************\n')
+        if myid == self.rootProcess:
+          AllFiles = os.listdir()
+          for FileNumber,FileName in enumerate(AllFiles):
+            if SurfaceFileName in FileName:
+              file = FileName.split(".")[0]
+              extension = FileName.split(".")[1]
+              os.rename(file+"."+extension,"Mode{}.".format(mode)+extension)
+
+      self.MPIPrint('\n*************************')
+      self.MPIPrint('*  Mapping completed  *')
+      self.MPIPrint('*************************\n')

SU2_PY/SU2_Nastran/pysu2_nastran.py

@@ -509,7 +509,7 @@ def __checkBlankField(self, string):
     This method considers that Nastran apply 0 when the reference system is not specified
     """
 
-    if string == '        ':
+    if string == ' '*8:
       return int(0)
     return int(string)
 
@@ -932,12 +932,13 @@ def run(self,time):
     self.__computeInterfacePosVel(False)
 
   def activateMode(self, iMode):
-      """ This method is used to artificially set only one mode activated, thus
-          with non zero amplitude.
-      """
-      self.__reset(self.q)
-      self.q[iMode] = 1.0
-      self.__computeInterfacePosVel(True)
+    """
+    This method is used to artificially set only one mode activated, thus
+    with non zero amplitude.
+    """
+    self.__reset(self.q)
+    self.q[iMode] = 1.0
+    self.__computeInterfacePosVel(True)
 
   def setInitialDisplacements(self):
     """
@@ -987,10 +988,11 @@ def applyload(self, iVertex, fx, fy, fz):
     self.node[iPoint].SetForce((fx,fy,fz))
 
   def getNumberOfModes(self):
-      """ This method provides the number of degrees of freedom used in
-          the structural solver.
-      """
-      return self.nDof
+    """
+    This method provides the number of degrees of freedom used in
+    the structural solver.
+    """
+    return self.nDof
 
   def getFSIMarkerID(self):
     """