Merge branch 'develop' into develop

Author: AngPass

SU2_CFD/include/numerics/CNumerics.hpp

@@ -1130,7 +1130,7 @@ class CNumerics {
    * \param[in] val_velocity - Pointer to the velocity.
    * \param[in] val_betainc2 - Value of the artificial compresibility factor.
    * \param[in] val_enthalpy - Value of the enthalpy.
-   * \param[in] val_dRhodT - Value of the derivative of density w.r.t. temperature.
+   * \param[in] val_dRhodh - Value of the derivative of density w.r.t. enthalpy.
    * \param[in] val_normal - Normal vector, the norm of the vector is the area of the face.
    * \param[in] val_scale - Scale of the projection.
    * \param[out] val_Proj_Jac_tensor - Pointer to the projected inviscid Jacobian.
@@ -1139,7 +1139,7 @@ class CNumerics {
                              const su2double *val_velocity,
                              const su2double *val_betainc2,
                              const su2double *val_enthalpy,
-                             const su2double *val_dRhodT,
+                             const su2double *val_dRhodh,
                              const su2double *val_normal,
                              su2double val_scale,
                              su2double **val_Proj_Jac_Tensor) const;

SU2_CFD/include/variables/CIncEulerVariable.hpp

@@ -78,14 +78,14 @@ class CIncEulerVariable : public CFlowVariable {
    * \brief Constructor of the class.
    * \param[in] val_pressure - value of the pressure.
    * \param[in] velocity - Value of the flow velocity (initialization value).
-   * \param[in] temperature - Value of the temperature (initialization value).
+   * \param[in] enthalpy - Value of the enthalpy (initialization value).
    * \param[in] npoint - Number of points/nodes/vertices in the domain.
    * \param[in] ndim - Number of dimensions of the problem.
    * \param[in] nvar - Number of variables of the problem.
    * \param[in] config - Definition of the particular problem.
    */
 
-  CIncEulerVariable(su2double pressure, const su2double *velocity, su2double temperature,
+  CIncEulerVariable(su2double pressure, const su2double *velocity, su2double enthalpy,
                     unsigned long npoint, unsigned long ndim, unsigned long nvar, const CConfig *config);
 
   /*!
@@ -125,7 +125,7 @@ class CIncEulerVariable : public CFlowVariable {
   }
 
   /*!
-   * \brief Set the value of the enthalpy for multicomponent incompressible flows with energy equation.
+   * \brief Set the value of the enthalpy for incompressible flows with energy equation.
    * \param[in] iPoint - Point index.
    */
   inline void SetEnthalpy(unsigned long iPoint, su2double val_enthalpy) {

SU2_CFD/src/numerics/CNumerics.cpp

@@ -250,7 +250,7 @@ void CNumerics::GetInviscidProjJac(const su2double *val_velocity, const su2doubl
 
 void CNumerics::GetInviscidIncProjJac(const su2double *val_density, const su2double *val_velocity,
                                       const su2double *val_betainc2, const su2double *val_enthalpy, 
-                                      const su2double *val_dRhodT, const su2double *val_normal, 
+                                      const su2double *val_dRhodh, const su2double *val_normal, 
                                       su2double val_scale, su2double **val_Proj_Jac_Tensor) const {
   const bool wasActive = AD::BeginPassive();
   unsigned short iDim;
@@ -265,54 +265,54 @@ void CNumerics::GetInviscidIncProjJac(const su2double *val_density, const su2dou
     val_Proj_Jac_Tensor[0][0] = val_scale*(proj_vel/(*val_betainc2));
     val_Proj_Jac_Tensor[0][1] = val_scale*(val_normal[0]*(*val_density));
     val_Proj_Jac_Tensor[0][2] = val_scale*(val_normal[1]*(*val_density));
-    val_Proj_Jac_Tensor[0][3] = val_scale*((*val_dRhodT)*proj_vel);
+    val_Proj_Jac_Tensor[0][3] = val_scale*((*val_dRhodh)*proj_vel);
 
     val_Proj_Jac_Tensor[1][0] = val_scale*(val_normal[0] + val_velocity[0]*proj_vel/(*val_betainc2));
     val_Proj_Jac_Tensor[1][1] = val_scale*((*val_density)*(val_normal[0]*val_velocity[0] + proj_vel));
     val_Proj_Jac_Tensor[1][2] = val_scale*(val_normal[1]*(*val_density)*val_velocity[0]);
-    val_Proj_Jac_Tensor[1][3] = val_scale*((*val_dRhodT)*val_velocity[0]*proj_vel);
+    val_Proj_Jac_Tensor[1][3] = val_scale*((*val_dRhodh)*val_velocity[0]*proj_vel);
 
     val_Proj_Jac_Tensor[2][0] = val_scale*(val_normal[1] + val_velocity[1]*proj_vel/(*val_betainc2));
     val_Proj_Jac_Tensor[2][1] = val_scale*(val_normal[0]*(*val_density)*val_velocity[1]);
     val_Proj_Jac_Tensor[2][2] = val_scale*((*val_density)*(proj_vel + val_normal[1]*val_velocity[1]));
-    val_Proj_Jac_Tensor[2][3] = val_scale*((*val_dRhodT)*val_velocity[1]*proj_vel);
+    val_Proj_Jac_Tensor[2][3] = val_scale*((*val_dRhodh)*val_velocity[1]*proj_vel);
 
     val_Proj_Jac_Tensor[3][0] = val_scale*((*val_enthalpy)*proj_vel/(*val_betainc2));
     val_Proj_Jac_Tensor[3][1] = val_scale*((*val_enthalpy)*val_normal[0]*(*val_density));
     val_Proj_Jac_Tensor[3][2] = val_scale*((*val_enthalpy)*val_normal[1]*(*val_density));
-    val_Proj_Jac_Tensor[3][3] = val_scale*(((*val_enthalpy)*(*val_dRhodT) + (*val_density))*proj_vel);
+    val_Proj_Jac_Tensor[3][3] = val_scale*(((*val_enthalpy)*(*val_dRhodh) + (*val_density))*proj_vel);
 
   } else {
 
     val_Proj_Jac_Tensor[0][0] = val_scale*(proj_vel/(*val_betainc2));
     val_Proj_Jac_Tensor[0][1] = val_scale*(val_normal[0]*(*val_density));
     val_Proj_Jac_Tensor[0][2] = val_scale*(val_normal[1]*(*val_density));
     val_Proj_Jac_Tensor[0][3] = val_scale*(val_normal[2]*(*val_density));
-    val_Proj_Jac_Tensor[0][4] = val_scale*((*val_dRhodT)*proj_vel);
+    val_Proj_Jac_Tensor[0][4] = val_scale*((*val_dRhodh)*proj_vel);
 
     val_Proj_Jac_Tensor[1][0] = val_scale*(val_normal[0] + val_velocity[0]*proj_vel/(*val_betainc2));
     val_Proj_Jac_Tensor[1][1] = val_scale*((*val_density)*(val_normal[0]*val_velocity[0] + proj_vel));
     val_Proj_Jac_Tensor[1][2] = val_scale*(val_normal[1]*(*val_density)*val_velocity[0]);
     val_Proj_Jac_Tensor[1][3] = val_scale*(val_normal[2]*(*val_density)*val_velocity[0]);
-    val_Proj_Jac_Tensor[1][4] = val_scale*((*val_dRhodT)*val_velocity[0]*proj_vel);
+    val_Proj_Jac_Tensor[1][4] = val_scale*((*val_dRhodh)*val_velocity[0]*proj_vel);
 
     val_Proj_Jac_Tensor[2][0] = val_scale*(val_normal[1] + val_velocity[1]*proj_vel/(*val_betainc2));
     val_Proj_Jac_Tensor[2][1] = val_scale*(val_normal[0]*(*val_density)*val_velocity[1]);
     val_Proj_Jac_Tensor[2][2] = val_scale*((*val_density)*(proj_vel + val_normal[1]*val_velocity[1]));
     val_Proj_Jac_Tensor[2][3] = val_scale*(val_normal[2]*(*val_density)*val_velocity[1]);
-    val_Proj_Jac_Tensor[2][4] = val_scale*((*val_dRhodT)*val_velocity[1]*proj_vel);
+    val_Proj_Jac_Tensor[2][4] = val_scale*((*val_dRhodh)*val_velocity[1]*proj_vel);
 
     val_Proj_Jac_Tensor[3][0] = val_scale*(val_normal[2] + val_velocity[2]*proj_vel/(*val_betainc2));
     val_Proj_Jac_Tensor[3][1] = val_scale*(val_normal[0]*(*val_density)*val_velocity[2]);
     val_Proj_Jac_Tensor[3][2] = val_scale*(val_normal[1]*(*val_density)*val_velocity[2]);
     val_Proj_Jac_Tensor[3][3] = val_scale*((*val_density)*(proj_vel + val_normal[2]*val_velocity[2]));
-    val_Proj_Jac_Tensor[3][4] = val_scale*((*val_dRhodT)*val_velocity[2]*proj_vel);
+    val_Proj_Jac_Tensor[3][4] = val_scale*((*val_dRhodh)*val_velocity[2]*proj_vel);
 
     val_Proj_Jac_Tensor[4][0] = val_scale*((*val_enthalpy)*proj_vel/(*val_betainc2));
     val_Proj_Jac_Tensor[4][1] = val_scale*((*val_enthalpy)*val_normal[0]*(*val_density));
     val_Proj_Jac_Tensor[4][2] = val_scale*((*val_enthalpy)*val_normal[1]*(*val_density));
     val_Proj_Jac_Tensor[4][3] = val_scale*((*val_enthalpy)*val_normal[2]*(*val_density));
-    val_Proj_Jac_Tensor[4][4] = val_scale*(((*val_enthalpy)*(*val_dRhodT) + (*val_density))*proj_vel);
+    val_Proj_Jac_Tensor[4][4] = val_scale*(((*val_enthalpy)*(*val_dRhodh) + (*val_density))*proj_vel);
 
   }
   AD::EndPassive(wasActive);

SU2_CFD/src/solvers/CIncEulerSolver.cpp

@@ -2810,18 +2810,17 @@ void CIncEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver
   su2double U_time_nM1[MAXNVAR], U_time_n[MAXNVAR], U_time_nP1[MAXNVAR];
   su2double Volume_nM1, Volume_nP1, TimeStep;
   const su2double *Normal = nullptr, *GridVel_i = nullptr, *GridVel_j = nullptr;
-  su2double Density, Cp;
+  su2double Density;
 
   const bool implicit = (config->GetKind_TimeIntScheme() == EULER_IMPLICIT);
   const bool first_order = (config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_1ST);
   const bool second_order = (config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_2ND);
   const bool energy = config->GetEnergy_Equation();
 
-  const int ndim = nDim;
-  auto V2U = [ndim](su2double Density, su2double Cp, const su2double* V, su2double* U) {
+  const int nvar = nVar;
+  auto V2U = [nvar](su2double Density, const su2double* V, su2double* U) {
     U[0] = Density;
-    for (int iDim = 0; iDim < ndim; iDim++) U[iDim+1] = Density*V[iDim+1];
-    U[ndim+1] = Density*Cp*V[ndim+1];
+    for (int iVar = 1; iVar < nvar; ++iVar) U[iVar] = Density * V[iVar];
   };
 
   /*--- Store the physical time step ---*/
@@ -2848,16 +2847,15 @@ void CIncEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver
       V_time_n   = nodes->GetSolution_time_n(iPoint);
       V_time_nP1 = nodes->GetSolution(iPoint);
 
-      /*--- Access the density and Cp at this node (constant for now). ---*/
+      /*--- Access the density at this node (constant for now). ---*/
 
       Density = nodes->GetDensity(iPoint);
-      Cp = nodes->GetSpecificHeatCp(iPoint);
 
       /*--- Compute the conservative variable vector for all time levels. ---*/
 
-      V2U(Density, Cp, V_time_nM1, U_time_nM1);
-      V2U(Density, Cp, V_time_n, U_time_n);
-      V2U(Density, Cp, V_time_nP1, U_time_nP1);
+      V2U(Density, V_time_nM1, U_time_nM1);
+      V2U(Density, V_time_n, U_time_n);
+      V2U(Density, V_time_nP1, U_time_nP1);
 
       /*--- CV volume at time n+1. As we are on a static mesh, the volume
        of the CV will remained fixed for all time steps. ---*/
@@ -2878,13 +2876,9 @@ void CIncEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver
       /*--- Compute the Jacobian contribution due to the dual time source term. ---*/
 
       if (implicit) {
-        su2double delta = (second_order? 1.5 : 1.0) * Volume_nP1 * Density / TimeStep;
-
-        for (iDim = 0; iDim < nDim; iDim++)
-          Jacobian.AddVal2Diag(iPoint, iDim+1, delta);
+        su2double delta = (second_order ? 1.5 : 1.0) * Volume_nP1 * Density / TimeStep;
 
-        if (energy) delta *= Cp;
-        Jacobian.AddVal2Diag(iPoint, nDim+1, delta);
+        for (iVar = 1; iVar < nVar; ++iVar) Jacobian.AddVal2Diag(iPoint, iVar, delta);
       }
     }
     END_SU2_OMP_FOR
@@ -2909,8 +2903,7 @@ void CIncEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver
 
       V_time_n = nodes->GetSolution_time_n(iPoint);
       Density = nodes->GetDensity(iPoint);
-      Cp = nodes->GetSpecificHeatCp(iPoint);
-      V2U(Density, Cp, V_time_n, U_time_n);
+      V2U(Density, V_time_n, U_time_n);
 
       GridVel_i = geometry->nodes->GetGridVel(iPoint);
 
@@ -2965,8 +2958,7 @@ void CIncEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver
 
           V_time_n = nodes->GetSolution_time_n(iPoint);
           Density = nodes->GetDensity(iPoint);
-          Cp = nodes->GetSpecificHeatCp(iPoint);
-          V2U(Density, Cp, V_time_n, U_time_n);
+          V2U(Density, V_time_n, U_time_n);
 
           for (iVar = 0; iVar < nVar-!energy; iVar++)
             LinSysRes(iPoint,iVar) += U_time_n[iVar]*Residual_GCL;
@@ -2992,16 +2984,15 @@ void CIncEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver
       V_time_n   = nodes->GetSolution_time_n(iPoint);
       V_time_nP1 = nodes->GetSolution(iPoint);
 
-      /*--- Access the density and Cp at this node (constant for now). ---*/
+      /*--- Access the density at this node (constant for now). ---*/
 
       Density = nodes->GetDensity(iPoint);
-      Cp = nodes->GetSpecificHeatCp(iPoint);
 
       /*--- Compute the conservative variable vector for all time levels. ---*/
 
-      V2U(Density, Cp, V_time_nM1, U_time_nM1);
-      V2U(Density, Cp, V_time_n, U_time_n);
-      V2U(Density, Cp, V_time_nP1, U_time_nP1);
+      V2U(Density, V_time_nM1, U_time_nM1);
+      V2U(Density, V_time_n, U_time_n);
+      V2U(Density, V_time_nP1, U_time_nP1);
 
       /*--- CV volume at time n-1 and n+1. In the case of dynamically deforming
        grids, the volumes will change. On rigidly transforming grids, the
@@ -3027,11 +3018,8 @@ void CIncEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver
       if (implicit) {
         su2double delta = (second_order? 1.5 : 1.0) * Volume_nP1 * Density / TimeStep;
 
-        for (iDim = 0; iDim < nDim; iDim++)
-          Jacobian.AddVal2Diag(iPoint, iDim+1, delta);
-
-        if (energy) delta *= Cp;
-        Jacobian.AddVal2Diag(iPoint, nDim+1, delta);
+        for (iVar = 1; iVar < nVar; ++iVar)
+          Jacobian.AddVal2Diag(iPoint, iVar, delta);
       }
     }
     END_SU2_OMP_FOR

SU2_CFD/src/solvers/CSpeciesFlameletSolver.cpp

@@ -440,7 +440,7 @@ void CSpeciesFlameletSolver::BC_Isothermal_Wall_Generic(CGeometry* geometry, CSo
     /*--- Check if the node belongs to the domain (i.e., not a halo node). ---*/
 
     if (geometry->nodes->GetDomain(iPoint)) {
-      if (config->GetMarker_StrongBC(Marker_Tag) == true) {
+      if (config->GetMarker_StrongBC(Marker_Tag)) {
         /*--- Initial guess for enthalpy value. ---*/
         enth_wall = nodes->GetSolution(iPoint, I_ENTH);
 

SU2_CFD/src/variables/CIncNSVariable.cpp

@@ -124,6 +124,9 @@ bool CIncNSVariable::SetPrimVar(unsigned long iPoint, su2double eddy_visc, su2do
 
   SetSpecificHeatCp(iPoint, FluidModel->GetCp());
   SetSpecificHeatCv(iPoint, FluidModel->GetCv());
+
+  /*--- Set enthalpy ---*/
+
   SetEnthalpy(iPoint, FluidModel->GetEnthalpy());
 
   return physical;

SU2_PY/SU2/io/data.py

@@ -359,7 +359,7 @@ def rec2dict(array_in):
         value = array_in[key].tolist()[0][0]
 
         # convert string
-        if isinstance(value[0], unicode):
+        if isinstance(value[0], str):
             value = str(value[0])
 
         # convert array

SU2_PY/SU2/util/bunch.py

@@ -194,15 +194,13 @@ def __repr__(self):
 
         (*) Invertible so long as collection contents are each repr-invertible.
         """
-        keys = self.keys()
-        keys.sort()
+        keys = sorted(self.keys())
         args = ", ".join(["%s=%r" % (key, self[key]) for key in keys])
         return "%s(%s)" % (self.__class__.__name__, args)
 
     def __str__(self):
         """String-form of a OrderedBunch."""
-        keys = self.keys()
-        keys.sort()
+        keys = sorted(self.keys())
         args = ", ".join(["%s=%r" % (key, self[key]) for key in keys])
         return "{%s}" % args
 
@@ -247,7 +245,7 @@ def bunchify(x):
     nb. As dicts are not hashable, they cannot be nested in sets/frozensets.
     """
     if isinstance(x, dict):
-        return Bunch((k, bunchify(v)) for k, v in x.iteritems())
+        return Bunch((k, bunchify(v)) for k, v in x.items())
     elif isinstance(x, (list, tuple)):
         return type(x)(bunchify(v) for v in x)
     else:
@@ -273,7 +271,7 @@ def unbunchify(x):
     nb. As dicts are not hashable, they cannot be nested in sets/frozensets.
     """
     if isinstance(x, dict):
-        return dict((k, unbunchify(v)) for k, v in x.iteritems())
+        return dict((k, unbunchify(v)) for k, v in x.items())
     elif isinstance(x, (list, tuple)):
         return type(x)(unbunchify(v) for v in x)
     else:

SU2_PY/SU2/util/ordered_bunch.py

@@ -265,7 +265,7 @@ def ordered_bunchify(x):
     nb. As dicts are not hashable, they cannot be nested in sets/frozensets.
     """
     if isinstance(x, dict):
-        return OrderedBunch((k, ordered_bunchify(v)) for k, v in x.iteritems())
+        return OrderedBunch((k, ordered_bunchify(v)) for k, v in x.items())
     elif isinstance(x, (list, tuple)):
         return type(x)(ordered_bunchify(v) for v in x)
     else:
@@ -291,9 +291,9 @@ def ordered_unbunchify(x):
     nb. As dicts are not hashable, they cannot be nested in sets/frozensets.
     """
     if isinstance(x, OrderedDict):
-        return OrderedDict((k, ordered_unbunchify(v)) for k, v in x.iteritems())
+        return OrderedDict((k, ordered_unbunchify(v)) for k, v in x.items())
     elif isinstance(x, dict):
-        return dict((k, ordered_unbunchify(v)) for k, v in x.iteritems())
+        return dict((k, ordered_unbunchify(v)) for k, v in x.items())
     elif isinstance(x, (list, tuple)):
         return type(x)(ordered_unbunchify(v) for v in x)
     else:

SU2_PY/SU2/util/ordered_dict.py

@@ -85,7 +85,7 @@ def __reversed__(self):
     def clear(self):
         "od.clear() -> None.  Remove all items from od."
         try:
-            for node in self.__map.itervalues():
+            for node in self.__map.values():
                 del node[:]
             root = self.__root
             root[:] = [root, root, None]