cleanup and reviewer suggestions

Author: bigfooted

Common/include/containers/CPyWrapperMatrixView.hpp

@@ -54,6 +54,7 @@
                                                                                                                  \
   /*! \brief Gets the value for a (row, column) pair. */                                                         \
   passivedouble operator()(unsigned long row, unsigned long col) const { return Get(row, col); }                 \
+  std::vector<passivedouble> operator()(unsigned long row) const { return Get(row); }                            \
                                                                                                                  \
   /*! \brief Gets the value for a (row, column) pair. */                                                         \
   passivedouble Get(unsigned long row, unsigned long col) const { return SU2_TYPE::GetValue(Access(row, col)); } \

SU2_CFD/include/drivers/CDriver.hpp

@@ -481,30 +481,12 @@ class CDriver : public CDriverBase {
    */
   unsigned long GetNumberInnerIter() const;
 
-  /*!
-   * \brief Set the number of inner iterations.
-   * \return
-   */
-  void SetNumberInnerIter(unsigned long val_iter);
-
   /*!
    * \brief Get the number of outer iterations.
    * \return Number of outer iterations.
    */
   unsigned long GetNumberOuterIter() const;
 
-  /*!
-   * \brief Set the number of outer iterations.
-   * \return
-   */
-  void SetNumberOuterIter(unsigned long val_iter);
-
-  /*!
-   * \brief Get the current solution
-   * \return Current solution
-   */
-  unsigned long GetSolution(unsigned short iSolver, unsigned long iPoint, unsigned short iVar);
-
   /*!
    * \brief Get the current time iteration.
    * \return Current time iteration.
@@ -589,13 +571,13 @@ class CDriver : public CDriverBase {
    * \brief Get the Freestream Density for nondimensionalization
    * \return Freestream Density
    */
-  unsigned long GetDensity_FreeStreamND() const;
+  passivedouble GetDensity_FreeStreamND() const;
 
   /*!
    * \brief Get the reference Body force for nondimensionalization
    * \return reference Body Force
    */
-  unsigned long GetForce_Ref() const;
+  passivedouble GetForce_Ref() const;
 
 
 /// \}

SU2_CFD/include/solvers/CSpeciesSolver.hpp

@@ -104,39 +104,6 @@ class CSpeciesSolver : public CScalarSolver<CSpeciesVariable> {
    */
   void BC_Inlet(CGeometry* geometry, CSolver** solver_container, CNumerics* conv_numerics, CNumerics* visc_numerics,
                 CConfig* config, unsigned short val_marker) override;
- 
- 
-   /*!
-   * \brief Impose the Navier-Stokes wall boundary condition.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] conv_numerics - Description of the numerical method.
-   * \param[in] visc_numerics - Description of the numerical method.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] val_marker - Surface marker where the boundary condition is applied.
-   */
-  void BC_Isothermal_Wall(CGeometry* geometry, CSolver** solver_container, CNumerics* conv_numerics,
-                          CNumerics* visc_numerics, CConfig* config, unsigned short val_marker) override;
-
-   /*!
-   * \brief Impose the Navier-Stokes wall boundary condition.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] conv_numerics - Description of the numerical method.
-   * \param[in] visc_numerics - Description of the numerical method.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] val_marker - Surface marker where the boundary condition is applied.
-   */
-  void BC_HeatFlux_Wall(CGeometry* geometry, CSolver** solver_container, CNumerics* conv_numerics,
-                          CNumerics* visc_numerics, CConfig* config, unsigned short val_marker) override;
-
-  /*!
-   * \brief Generic implementation of the isothermal wall also covering CHT cases,
-   * for which the wall temperature is given by GetConjugateHeatVariable.
-   */
-  void BC_Isothermal_Wall_Generic(CGeometry* geometry, CSolver** solver_container, CNumerics* conv_numerics,
-                                  CNumerics* visc_numerics, CConfig* config, unsigned short val_marker,
-                                  bool cht_mode = false);
 
   /*!
    * \brief Store of a set of provided inlet profile values at a vertex.

SU2_CFD/src/python_wrapper_structure.cpp

@@ -60,13 +60,12 @@ unsigned long CDriver::GetNumberTimeIter() const { return config_container[selec
 
 unsigned long CDriver::GetNumberInnerIter() const { return config_container[selected_zone]->GetnInner_Iter(); }
 unsigned long CDriver::GetNumberOuterIter() const { return config_container[selected_zone]->GetnOuter_Iter(); }
-void CDriver::SetNumberInnerIter(unsigned long val_iter) { config_container[selected_zone]->SetnInner_Iter(val_iter); }
-void CDriver::SetNumberOuterIter(unsigned long val_iter) { config_container[selected_zone]->SetnOuter_Iter(val_iter); }
 
-unsigned long CDriver::GetDensity_FreeStreamND() const {
+passivedouble CDriver::GetDensity_FreeStreamND() const {
   return SU2_TYPE::GetValue(config_container[selected_zone]->GetDensity_FreeStreamND());
   }
-unsigned long CDriver::GetForce_Ref() const {
+
+passivedouble CDriver::GetForce_Ref() const {
   return SU2_TYPE::GetValue(config_container[selected_zone]->GetForce_Ref());
   }
 
@@ -78,11 +77,6 @@ passivedouble CDriver::GetUnsteadyTimeStep() const {
 
 string CDriver::GetSurfaceFileName() const { return config_container[selected_zone]->GetSurfCoeff_FileName(); }
 
-unsigned long CDriver::GetSolution(unsigned short iSOLVER, unsigned long iPoint, unsigned short iVar) {
-  auto solver = solver_container[iZone][INST_0][MESH_0][iSOLVER];
-  return SU2_TYPE::GetValue(solver->GetNodes()->GetSolution(iPoint,iVar));
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 /* Functions related to the management of markers                             */
 ////////////////////////////////////////////////////////////////////////////////

SU2_CFD/src/solvers/CIncEulerSolver.cpp

@@ -1811,6 +1811,8 @@ void CIncEulerSolver::Source_Residual(CGeometry *geometry, CSolver **solver_cont
     }
   }
 
+  //Custom_Source_Residual(geometry, solver_container, numerics_container, config, iMesh);
+
 }
 
 void CIncEulerSolver::Source_Template(CGeometry *geometry, CSolver **solver_container, CNumerics *numerics,

SU2_CFD/src/solvers/CSpeciesSolver.cpp

@@ -344,9 +344,6 @@ void CSpeciesSolver::BC_Inlet(CGeometry* geometry, CSolver** solver_container, C
 
     if (!geometry->nodes->GetDomain(iPoint)) continue;
 
-    /*--- Identify the boundary by string name ---*/
-    string Marker_Tag = config->GetMarker_All_TagBound(val_marker);
-
     if (config->GetMarker_StrongBC(Marker_Tag)==true) {
       nodes->SetSolution_Old(iPoint, Inlet_SpeciesVars[val_marker][iVertex]);
 
@@ -440,25 +437,6 @@ void CSpeciesSolver::SetUniformInlet(const CConfig* config, unsigned short iMark
   }
 }
 
-/*--- Currently all walls are zero-flux for the species ---*/
-void CSpeciesSolver::BC_Isothermal_Wall(CGeometry* geometry, CSolver** solver_container,
-                                                CNumerics* conv_numerics, CNumerics* visc_numerics, CConfig* config,
-                                                unsigned short val_marker) {
-  BC_Isothermal_Wall_Generic(geometry, solver_container, conv_numerics, visc_numerics, config, val_marker);
-}
-
-void CSpeciesSolver::BC_HeatFlux_Wall(CGeometry* geometry, CSolver** solver_container,
-                                                CNumerics* conv_numerics, CNumerics* visc_numerics, CConfig* config,
-                                                unsigned short val_marker) {
-  BC_Isothermal_Wall_Generic(geometry, solver_container, conv_numerics, visc_numerics, config, val_marker);
-}
-
-void CSpeciesSolver::BC_Isothermal_Wall_Generic(CGeometry* geometry, CSolver** solver_container,
-                                                        CNumerics* conv_numerics, CNumerics* visc_numerics,
-                                                        CConfig* config, unsigned short val_marker, bool cht_mode) {
-}
-
-
 void CSpeciesSolver::BC_Outlet(CGeometry* geometry, CSolver** solver_container, CNumerics* conv_numerics,
                                CNumerics* visc_numerics, CConfig* config, unsigned short val_marker) {
 
@@ -591,7 +569,7 @@ void CSpeciesSolver::Source_Residual(CGeometry *geometry, CSolver **solver_conta
 }
 
 
-void CSpeciesSolver::CustomSourceResidual(CGeometry *geometry, CSolver **solver_container,
+void CSpeciesSolver::Custom_Source_Residual(CGeometry *geometry, CSolver **solver_container,
                                       CNumerics **numerics_container, CConfig *config, unsigned short iMesh) {
 
   /*--- Pick one numerics object per thread. ---*/

TestCases/py_wrapper/custom_source_buoyancy/run.py

@@ -33,7 +33,7 @@ def main():
   """
   custom source to add buoyancy term.
   """
-  # parallel 
+  # parallel
   comm = MPI.COMM_WORLD
   # serial
   #comm = 0
@@ -85,7 +85,7 @@ def main():
   #print("max. number of inner iterations: ",driver.GetNumberInnerIter());
   #print("max nr of outer iterations: ",driver.GetNumberOuterIter());
 
-  # is in domain: isdomain = driver.GetNodeDomain(iPoint)  
+  # is in domain: isdomain = driver.GetNodeDomain(iPoint)
   #for i_vertex in range(n_vertex)
   #AllSolutions = driver.GetAllSolutions(iSOLVER)
   Body_Force_Vector = [0.0, -9.81, 0.0]
@@ -96,16 +96,14 @@ def main():
 
   Iter = driver.GetNumberInnerIter()
   print("1. inner iterations = ",Iter)
-  # set the inner iterations to 1
-  driver.SetNumberInnerIter(1)
 
   for inner_iter in range(Iter):
     # set the source term, per point
     print(driver.GetNumberNodes() - driver.GetNumberHaloNodes())
     for i_node in range(driver.GetNumberNodes() - driver.GetNumberHaloNodes()):
       #SolutionVector =  driver.GetSolutionVector(iSOLVER,i_node)
       PrimitiveVector =  driver.GetPrimitiveVector(iSOLVER,i_node)
-      DensityInc_i = PrimitiveVector[iDENSITY] 
+      DensityInc_i = PrimitiveVector[iDENSITY]
 
       for iDim in range(nDim):
         custom_source_vector[iDim+1] = -(DensityInc_i - DensityInc_0) * Body_Force_Vector[iDim] / Force_Ref

TestCases/py_wrapper/turbulent_premixed_psi/run.py

@@ -30,13 +30,12 @@
 from mpi4py import MPI
 import numpy as np
 
-# Import mpi4py for parallel run
-if options.with_MPI == True:
-  from mpi4py import MPI
-  comm = MPI.COMM_WORLD
-  rank = comm.Get_rank()
-else:
-  comm = 0
+# with mpi:
+from mpi4py import MPI
+comm = MPI.COMM_WORLD
+rank = comm.Get_rank()
+# without mpi:
+#  comm = 0
 
 # flame temperature of the methane-air mixture (phi=0.5, P=5)
 Tf = 1777
@@ -84,11 +83,11 @@ def SetInitialSpecies(SU2Driver):
     for iPoint in range(SU2Driver.GetNumberNodes() - SU2Driver.GetNumberHaloNodes()):
       coord = allCoords.Get(iPoint)
       C = initC(coord)
-      # now update the initial condition for the species 
+      # now update the initial condition for the species
       SU2Driver.SetSolutionVector(iSPECIESSOLVER, iPoint, [C])
 
 # ################################################################## #
-# Temperature is an algebraic function of c 
+# Temperature is an algebraic function of c
 # ################################################################## #
 def update_temperature(SU2Driver, iPoint):
     # first, get the progress variable
@@ -106,7 +105,7 @@ def update_temperature(SU2Driver, iPoint):
 
 
 # ################################################################## #
-# Source term according to Zimont 
+# Source term according to Zimont
 # ################################################################## #
 def zimont(SU2Driver, iPoint):
 
@@ -141,7 +140,7 @@ def zimont(SU2Driver, iPoint):
     return Sc
 
 # ################################################################## #
-# Get the list of solver variable names 
+# Get the list of solver variable names
 # ################################################################## #
 def getsolvar(SU2Driver):
     primindex = SU2Driver.GetPrimitiveIndices()
@@ -155,7 +154,7 @@ def getsolvar(SU2Driver):
     return varindex
 
 # ################################################################## #
-# Main routine 
+# Main routine
 # ################################################################## #
 def main():
 
@@ -223,7 +222,7 @@ def main():
     driver.Preprocess(inner_iter)
     driver.Run()
 
-    # set the source term, per point, 
+    # set the source term, per point,
     for i_node in range(driver.GetNumberNodes() - driver.GetNumberHaloNodes()):
       # add source term:
       # default TFC of Zimont: rho*Sc = rho_u * U_t * grad(c)