Skip to content

Commit a4e650b

Browse files
committed
cleaning includes and using factory class
1 parent f22b7ab commit a4e650b

30 files changed

Lines changed: 83 additions & 700 deletions

SU2_CFD/include/SU2_CFD.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
#include "../../Common/include/grid_movement_structure.hpp"
4444
#include "../../Common/include/CConfig.hpp"
4545
#include "../include/definition_structure.hpp"
46-
#include "../include/iteration_structure.hpp"
4746
#include "../include/interfaces/CInterface.hpp"
4847

4948
using namespace std;

SU2_CFD/include/drivers/CDriver.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030

3131
#include "../../../Common/include/mpi_structure.hpp"
3232

33-
#include "../iteration_structure.hpp"
3433
#include "../integration/CIntegration.hpp"
3534
#include "../solvers/CSolver.hpp"
3635
#include "../interfaces/CInterface.hpp"
@@ -42,6 +41,8 @@ using namespace std;
4241

4342
class COutputLegacy;
4443
class CInterpolator;
44+
class CIteration;
45+
class COutput;
4546

4647
/*!
4748
* \class CDriver

SU2_CFD/include/drivers/CMultizoneDriver.hpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,5 @@ class CMultizoneDriver : public CDriver {
135135
* \brief Returns whether all specified windowed-time-averaged ouputs have been converged
136136
* \return Boolean indicating whether the problem is converged.
137137
*/
138-
inline virtual bool GetTimeConvergence() const{
139-
return driver_output->GetTimeConvergence();
140-
}
138+
virtual bool GetTimeConvergence() const;
141139
};

SU2_CFD/include/drivers/CSinglezoneDriver.hpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,7 @@ class CSinglezoneDriver : public CDriver {
102102
* \brief Returns whether all specified windowed-time-averaged ouputs have been converged
103103
* \return Boolean indicating whether the problem is converged.
104104
*/
105-
inline virtual bool GetTimeConvergence() const{
106-
return output_container[ZONE_0]->GetTimeConvergence();
107-
}
108-
105+
virtual bool GetTimeConvergence() const;
109106

110107
/*!
111108
* \brief Runtime_Parsing

SU2_CFD/include/iteration/CAdjFluidIteration.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class CAdjFluidIteration : public CFluidIteration {
4141
* \brief Constructor of the class.
4242
* \param[in] config - Definition of the particular problem.
4343
*/
44-
CAdjFluidIteration(CConfig* config);
44+
CAdjFluidIteration(const CConfig* config);
4545

4646
/*!
4747
* \brief Destructor of the class.

SU2_CFD/include/iteration/CDiscAdjFEAIteration.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class CDiscAdjFEAIteration : public CIteration {
4747
* \brief Constructor of the class.
4848
* \param[in] config - Definition of the particular problem.
4949
*/
50-
CDiscAdjFEAIteration(CConfig* config);
50+
CDiscAdjFEAIteration(const CConfig* config);
5151

5252
/*!
5353
* \brief Destructor of the class.
@@ -237,4 +237,4 @@ class CDiscAdjFEAIteration : public CIteration {
237237
*/
238238
void LoadDynamic_Solution(CGeometry**** geometry, CSolver***** solver, CConfig** config, unsigned short val_iZone,
239239
unsigned short val_iInst, int val_DirectIter) override;
240-
};
240+
};

SU2_CFD/include/iteration/CDiscAdjFluidIteration.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class CDiscAdjFluidIteration : public CIteration {
4848
* \brief Constructor of the class.
4949
* \param[in] config - Definition of the particular problem.
5050
*/
51-
CDiscAdjFluidIteration(CConfig* config);
51+
CDiscAdjFluidIteration(const CConfig* config);
5252

5353
/*!
5454
* \brief Destructor of the class.
@@ -242,4 +242,4 @@ class CDiscAdjFluidIteration : public CIteration {
242242
*/
243243
void LoadUnsteady_Solution(CGeometry**** geometry, CSolver***** solver, CConfig** config, unsigned short val_iZone,
244244
unsigned short val_iInst, int val_DirectIter) override;
245-
};
245+
};

SU2_CFD/include/iteration/CDiscAdjHeatIteration.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class CDiscAdjHeatIteration : public CIteration {
4747
* \brief Constructor of the class.
4848
* \param[in] config - Definition of the particular problem.
4949
*/
50-
CDiscAdjHeatIteration(CConfig* config);
50+
CDiscAdjHeatIteration(const CConfig* config);
5151

5252
/*!
5353
* \brief Destructor of the class.
@@ -234,4 +234,4 @@ class CDiscAdjHeatIteration : public CIteration {
234234
*/
235235
void LoadUnsteady_Solution(CGeometry**** geometry, CSolver***** solver, CConfig** config, unsigned short val_iZone,
236236
unsigned short val_iInst, int val_DirectIter) override;
237-
};
237+
};

SU2_CFD/include/iteration/CFEAIteration.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class CFEAIteration : public CIteration {
4242
* \brief Constructor of the class.
4343
* \param[in] config - Definition of the particular problem.
4444
*/
45-
CFEAIteration(CConfig* config);
45+
CFEAIteration(const CConfig* config);
4646

4747
/*!
4848
* \brief Destructor of the class.

SU2_CFD/include/iteration/CFEMFluidIteration.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class CFEMFluidIteration : public CFluidIteration {
4242
* \brief Constructor of the class.
4343
* \param[in] config - Definition of the particular problem.
4444
*/
45-
CFEMFluidIteration(CConfig* config);
45+
CFEMFluidIteration(const CConfig* config);
4646

4747
/*!
4848
* \brief Destructor of the class.
@@ -101,4 +101,4 @@ class CFEMFluidIteration : public CFluidIteration {
101101
CNumerics****** numerics, CConfig** config, CSurfaceMovement** surface_movement,
102102
CVolumetricMovement*** grid_movement, CFreeFormDefBox*** FFDBox, unsigned short val_iZone,
103103
unsigned short val_iInst) override;
104-
};
104+
};

0 commit comments

Comments
 (0)