Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed CSolver::Convective_Residual #1222

Merged
merged 4 commits into from
Mar 8, 2021
Merged

Removed CSolver::Convective_Residual #1222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36e2782
Removed CSolver::Convective_Residual
maxaehle Mar 4, 2021
7825b3b
CFluidDriver constructor made protected
maxaehle Mar 4, 2021
42fab4f
Removed Error for FINITE_ELEMENT in CIntegration.cpp
maxaehle Mar 8, 2021
174dff1
Merge branch 'develop' into fix_remove_convectiveresidual
maxaehle Mar 8, 2021
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
3 changes: 2 additions & 1 deletion SU2_CFD/include/drivers/CDriver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ class CFluidDriver : public CDriver {
protected:
unsigned long Max_Iter;

public:
protected:

/*!
* \brief Constructor of the class.
Expand All @@ -758,6 +758,7 @@ class CFluidDriver : public CDriver {
unsigned short val_nZone,
SU2_Comm MPICommunicator);

public:
/*!
* \brief Destructor of the class.
*/
Expand Down
16 changes: 0 additions & 16 deletions SU2_CFD/include/solvers/CSolver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,22 +781,6 @@ class CSolver {
CConfig *config,
unsigned short iMesh) { }

/*!
* \brief A virtual member.
* \param[in] geometry - Geometrical definition of the problem.
* \param[in] solver_container - Container vector with all the solutions.
* \param[in] numerics - Description of the numerical method.
* \param[in] config - Definition of the particular problem.
* \param[in] iMesh - Index of the mesh in multigrid computations.
* \param[in] iRKStep - Current step of the Runge-Kutta iteration.
*/
inline virtual void Convective_Residual(CGeometry *geometry,
CSolver **solver_container,
CNumerics *numerics,
CConfig *config,
unsigned short iMesh,
unsigned short iRKStep) { }

/*!
* \brief A virtual member.
* \param[in] geometry - Geometrical definition of the problem.
Expand Down
8 changes: 1 addition & 7 deletions SU2_CFD/src/SU2_CFD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,7 @@ int main(int argc, char *argv[]) {
/*--- Turbomachinery problem. ---*/
driver = new CTurbomachineryDriver(config_file_name, nZone, MPICommunicator);

}
else {

/*--- Instantiate the class for external aerodynamics by default. ---*/
driver = new CFluidDriver(config_file_name, nZone, MPICommunicator);

}
} /*--- These are all the possible cases ---*/

delete config;
config = nullptr;
Expand Down
3 changes: 0 additions & 3 deletions SU2_CFD/src/integration/CIntegration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ void CIntegration::Space_Integration(CGeometry *geometry,
case SPACE_UPWIND:
solver_container[MainSolver]->Upwind_Residual(geometry, solver_container, numerics, config, iMesh);
break;
case FINITE_ELEMENT:
solver_container[MainSolver]->Convective_Residual(geometry, solver_container, numerics[CONV_TERM], config, iMesh, iRKStep);
break;
}

/*--- Compute viscous residuals ---*/
Expand Down