changes from code review

Author: bigfooted

SU2_CFD/include/drivers/CDriverBase.hpp

@@ -445,7 +445,15 @@ class CDriverBase {
   }
 
   /*!
-   * \brief Get a read/write view of the usrr defined source on all mesh nodes of a solver.
+   * \brief Get read/write view of the gradients of a solver variable in a point.
+   */
+  inline CPyWrapper3DMatrixView Gradient(unsigned short iSolver) {
+    auto* solver = GetSolverAndCheckMarker(iSolver);
+    return CPyWrapper3DMatrixView(solver->GetNodes()->GetGradient(), "Gradient of " + solver->GetSolverName(), false);
+  }
+
+  /*!
+   * \brief Get a read/write view of the user defined source on all mesh nodes of a solver.
    */
   inline CPyWrapperMatrixView UserDefinedSource(unsigned short iSolver) {
     auto* solver = GetSolverAndCheckMarker(iSolver);
@@ -676,23 +684,6 @@ class CDriverBase {
     return sens;
   }
 
-  /*!
-   * \brief Get the gradients of a solver variable in a point.
-   * \returns Vector of gradients grad(iVar).
-   */
-  inline vector<passivedouble> GetGradient(unsigned short iSolver, unsigned long iPoint, unsigned short iVar) {
-    const auto nDim = GetNumberDimensions();
-    auto* solver = GetSolverAndCheckMarker(iSolver);
-    auto* nodes = solver->GetNodes();
-
-    vector<passivedouble> grad(nDim, 0.0);
-    for (auto iDim = 0u; iDim < nDim; ++iDim) {
-          grad[iDim] = SU2_TYPE::GetValue(nodes->GetGradient(iPoint, iVar, iDim));
-    }
-    return grad;
-  }
-
-
   /*!
    * \brief Set the adjoint of the structural displacements.
    * \note This can be the input of the FEA solver in an adjoint FSI setting.

SU2_CFD/src/output/CFlowOutput.cpp

@@ -1594,7 +1594,7 @@ void CFlowOutput::LoadVolumeDataScalar(const CConfig* config, const CSolver* con
         SetVolumeOutputValue("DIFFUSIVITY_"+ std::to_string(iVar), iPoint, Node_Species->GetDiffusivity(iPoint,iVar));
         if (config->GetKind_SlopeLimit_Species() != LIMITER::NONE)
           SetVolumeOutputValue("LIMITER_SPECIES_" + std::to_string(iVar), iPoint, Node_Species->GetLimiter(iPoint, iVar));
-        if (config->GetPyCustom_Source()){
+        if (config->GetPyCustomSource()){
           SetVolumeOutputValue("SPECIES_UDS_" + std::to_string(iVar), iPoint, Node_Species->GetUserDefinedSource()(iPoint, iVar));
         }
       }

TestCases/py_wrapper/turbulent_premixed_psi/run.py

@@ -39,21 +39,22 @@
 # flame temperature of the methane-air mixture (phi=0.5, P=5)
 Tf = 1777
 
-# unburnt temperature of the propane-air mixture (phi=0.5, P=5)
+# unburnt temperature of the methane-air mixture (phi=0.5, P=5)
 Tu = 673.0
 Pu = 5.0
 phi = 0.5
 # unburnt density at P=5
 rho_u = 2.52
-# unburnt thermal conductivity of methane-air at phi=0.5 (phi=0.5, P=5)
+# unburnt thermal conductivity of methane-air (phi=0.5, P=5)
 k_u = 0.0523
-# unburnt heat capacity of methane-air at phi=0.5 (P=5)
+# unburnt heat capacity of methane-air (phi=0.5, P=5)
 cp_u = 1311.0
 
 # P = rho*R*T
 # 5 = 2.55 * R * 673
 # R = 0.0029
 
+
 # ################################################################## #
 # create a function for the initial progress variable c              #
 # ################################################################## #
@@ -80,7 +81,6 @@ def SetInitialSpecies(SU2Driver):
       coord = allCoords.Get(iPoint)
       C = initC(coord)
       # now update the initial condition for the species
-      #SU2Driver.SetSolutionVector(iSPECIESSOLVER, iPoint, [C])
       SU2Driver.Solution(iSPECIESSOLVER).Set(iPoint,0,C)
 
 # ################################################################## #
@@ -105,11 +105,11 @@ def update_temperature(SU2Driver, iPoint):
 def zimont(SU2Driver, iPoint):
 
     iSSTSOLVER = SU2Driver.GetSolverIndices()['SST']
-    #tke, dissipation = SU2Driver.GetSolutionVector(iSSTSOLVER,iPoint)
     tke, dissipation = SU2Driver.Solution(iSSTSOLVER)(iPoint)
 
     iSPECIESSOLVER = SU2Driver.GetSolverIndices()['SPECIES']
-    gradc = SU2Driver.GetGradient(iSPECIESSOLVER,iPoint,0)
+    # get the gradient of species_0
+    gradc = SU2Driver.Gradient(iSPECIESSOLVER)(iPoint,0)
     primindex = SU2Driver.GetPrimitiveIndices()
     iDENSITY = primindex.get("DENSITY")
     iMU = primindex.get("LAMINAR_VISCOSITY")
@@ -137,7 +137,7 @@ def zimont(SU2Driver, iPoint):
 def getsolvar(SU2Driver):
     primindex = SU2Driver.GetPrimitiveIndices()
     iFLOWSOLVER = SU2Driver.GetSolverIndices()['INC.FLOW']
-    nVars = SU2Driver.GetNumberSolverVars(iFLOWSOLVER)
+    nVars = SU2Driver.Solution(iFLOWSOLVER).Shape()[1]
     varindex = primindex.copy()
     for prim in varindex.copy():
       if varindex[prim] >=nVars:
@@ -177,9 +177,9 @@ def main():
   # all the indices and the map to the names of the primitives
   primindex = driver.GetPrimitiveIndices()
   nElem = driver.GetNumberElements()
-  nVars = driver.GetNumberSolverVars(iFLOWSOLVER)
-  nVarsSpecies = driver.GetNumberSolverVars(iSPECIESSOLVER)
-  nVarsTurb = driver.GetNumberSolverVars(iSSTSOLVER)
+  nVars = driver.Solution(iFLOWSOLVER).Shape()[1]
+  nVarsSpecies = driver.Solution(iSPECIESSOLVER).Shape()[1]
+  nVarsTurb = driver.Solution(iSSTSOLVER).Shape()[1]
 
   if rank == 0:
     print("Dimensions of the problem = ",nDim)