Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion SU2_CFD/include/numerics/NEMO/NEMO_diffusion.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ class CAvgGradCorrected_NEMO : public CNEMONumerics {
*Mean_Eve, /*!< \brief Mean value of eve. */
*Mean_Cvve, /*!< \brief Mean value of cvve. */
Edge_Vector[MAXNDIM]={0.0}, /*!< \brief Vector from point i to point j. */
*Proj_Mean_GradPrimVar_Edge, /*!< \brief Inner product of the Mean gradient and the edge vector. */
*Mean_Diffusion_Coeff, /*!< \brief Mean value of the species diffusion coefficient. */
Mean_Laminar_Viscosity, /*!< \brief Mean value of the viscosity. */
Mean_Eddy_Viscosity, /*!< \brief Mean value of the eddy viscosity. */
Expand Down
3 changes: 1 addition & 2 deletions SU2_CFD/include/numerics/flow/flow_diffusion.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ class CAvgGrad_Base : public CNumerics {
Mean_TauWall, /*!< \brief Mean wall shear stress (wall functions). */
TauWall_i, TauWall_j, /*!< \brief Wall shear stress at point i and j (wall functions). */
dist_ij_2, /*!< \brief Length of the edge and face, squared */
Edge_Vector[MAXNDIM] = {0.0}, /*!< \brief Vector from point i to point j. */
*Proj_Mean_GradPrimVar_Edge = nullptr; /*!< \brief Inner product of the Mean gradient and the edge vector. */
Edge_Vector[MAXNDIM] = {0.0}; /*!< \brief Vector from point i to point j. */

su2double** Jacobian_i = nullptr; /*!< \brief The Jacobian w.r.t. point i after computation. */
su2double** Jacobian_j = nullptr; /*!< \brief The Jacobian w.r.t. point j after computation. */
Expand Down
6 changes: 2 additions & 4 deletions SU2_CFD/src/numerics/NEMO/NEMO_diffusion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ CAvgGradCorrected_NEMO::CAvgGradCorrected_NEMO(unsigned short val_nDim,
for (auto iVar = 0ul; iVar < nPrimVarGrad; iVar++)
Mean_GradPrimVar[iVar] = new su2double [nDim];

Proj_Mean_GradPrimVar_Edge = new su2double[nPrimVarGrad];

Flux = new su2double[nVar];
Jacobian_i = new su2double* [nVar];
Expand All @@ -245,7 +244,6 @@ CAvgGradCorrected_NEMO::~CAvgGradCorrected_NEMO() {
delete [] Mean_GradPrimVar[iVar];
delete [] Mean_GradPrimVar;

delete [] Proj_Mean_GradPrimVar_Edge;

delete [] Flux;

Expand Down Expand Up @@ -323,9 +321,9 @@ CNumerics::ResidualType<> CAvgGradCorrected_NEMO::ComputeResidual(const CConfig

/*--- Projection of the mean gradient in the direction of the edge ---*/
for (auto iVar = 0ul; iVar < nPrimVarGrad; iVar++) {
Proj_Mean_GradPrimVar_Edge[iVar] = GeometryToolbox::DotProduct(nDim, Mean_GradPrimVar[iVar], Edge_Vector);
su2double Proj_Mean_GradPrimVar_Edge = GeometryToolbox::DotProduct(nDim, Mean_GradPrimVar[iVar], Edge_Vector);
for (auto iDim = 0ul; iDim < nDim; iDim++) {
Mean_GradPrimVar[iVar][iDim] -= (Proj_Mean_GradPrimVar_Edge[iVar] -
Mean_GradPrimVar[iVar][iDim] -= (Proj_Mean_GradPrimVar_Edge -
(PrimVar_j[iVar]-PrimVar_i[iVar]))*Edge_Vector[iDim] / dist_ij_2;
}
}
Expand Down
8 changes: 3 additions & 5 deletions SU2_CFD/src/numerics/flow/flow_diffusion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ CAvgGrad_Base::CAvgGrad_Base(unsigned short val_nDim,
for (iVar = 0; iVar < nPrimVar; iVar++)
Mean_GradPrimVar[iVar] = new su2double [nDim];

Proj_Mean_GradPrimVar_Edge = new su2double[val_nPrimVar];

tau_jacobian_i = new su2double* [nDim];
for (iDim = 0; iDim < nDim; iDim++) {
Expand Down Expand Up @@ -78,7 +77,6 @@ CAvgGrad_Base::~CAvgGrad_Base() {
delete [] Mean_GradPrimVar;
}

delete [] Proj_Mean_GradPrimVar_Edge;

if (tau_jacobian_i != nullptr) {
for (unsigned short iDim = 0; iDim < nDim; iDim++) {
Expand Down Expand Up @@ -107,12 +105,12 @@ void CAvgGrad_Base::CorrectGradient(su2double** GradPrimVar,
const su2double val_dist_ij_2,
const unsigned short val_nPrimVar) {
for (unsigned short iVar = 0; iVar < val_nPrimVar; iVar++) {
Proj_Mean_GradPrimVar_Edge[iVar] = 0.0;
su2double Proj_Mean_GradPrimVar_Edge = 0.0;
for (unsigned short iDim = 0; iDim < nDim; iDim++) {
Proj_Mean_GradPrimVar_Edge[iVar] += GradPrimVar[iVar][iDim]*val_edge_vector[iDim];
Proj_Mean_GradPrimVar_Edge += GradPrimVar[iVar][iDim]*val_edge_vector[iDim];
}
for (unsigned short iDim = 0; iDim < nDim; iDim++) {
GradPrimVar[iVar][iDim] -= (Proj_Mean_GradPrimVar_Edge[iVar] -
GradPrimVar[iVar][iDim] -= (Proj_Mean_GradPrimVar_Edge -
(val_PrimVar_j[iVar]-val_PrimVar_i[iVar]))*val_edge_vector[iDim] / val_dist_ij_2;
}
}
Expand Down