Skip to content

Commit 8782e91

Browse files
pcarruscagpcarruscag
committed
update automake, fix include paths, delete some dtors, fix one warning
1 parent d917235 commit 8782e91

15 files changed

Lines changed: 51 additions & 55 deletions

‎SU2_CFD/include/iteration/CDiscAdjFluidIteration.hpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,6 @@ class CDiscAdjFluidIteration : public CIteration {
4949
explicit CDiscAdjFluidIteration(const CConfig *config) : CIteration(config),
5050
turbulent(config->GetKind_Solver() == DISC_ADJ_RANS || config->GetKind_Solver() == DISC_ADJ_INC_RANS) {}
5151

52-
/*!
53-
* \brief Destructor of the class.
54-
*/
55-
~CDiscAdjFluidIteration(void) override;
56-
5752
/*!
5853
* \brief Preprocessing to prepare for an iteration of the physics.
5954
* \brief Perform a single iteration of the adjoint fluid system.

‎SU2_CFD/include/iteration/CDiscAdjHeatIteration.hpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ class CDiscAdjHeatIteration : public CIteration {
4343
*/
4444
explicit CDiscAdjHeatIteration(const CConfig *config) : CIteration(config) {}
4545

46-
/*!
47-
* \brief Destructor of the class.
48-
*/
49-
~CDiscAdjHeatIteration(void) override;
50-
5146
/*!
5247
* \brief Perform a single iteration of the adjoint fluid system.
5348
* \param[in] output - Pointer to the COutput class.

‎SU2_CFD/include/iteration/CIteration.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828

2929
#pragma once
3030

31-
#include "../../Common/include/CConfig.hpp"
32-
#include "../../Common/include/geometry/CGeometry.hpp"
33-
#include "../../Common/include/grid_movement_structure.hpp"
34-
#include "../../Common/include/mpi_structure.hpp"
35-
#include "../include/integration/CIntegration.hpp"
31+
#include "../../../Common/include/CConfig.hpp"
32+
#include "../../../Common/include/geometry/CGeometry.hpp"
33+
#include "../../../Common/include/grid_movement_structure.hpp"
34+
#include "../../../Common/include/mpi_structure.hpp"
35+
#include "../integration/CIntegration.hpp"
3636

3737
using namespace std;
3838

‎SU2_CFD/obj/Makefile.am‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,17 @@ libSU2Core_sources = ../src/definition_structure.cpp \
6666
../src/drivers/CDiscAdjMultizoneDriver.cpp \
6767
../src/drivers/CDriver.cpp \
6868
../src/drivers/CDummyDriver.cpp \
69-
../src/iteration_structure.cpp \
69+
../src/iteration/CIteration.cpp \
70+
../src/iteration/CIterationFactory.cpp \
71+
../src/iteration/CAdjFluidIteration.cpp \
72+
../src/iteration/CDiscAdjFluidIteration.cpp \
73+
../src/iteration/CDiscAdjHeatIteration.cpp \
74+
../src/iteration/CDiscAdjFEAIteration.cpp \
75+
../src/iteration/CFEAIteration.cpp \
76+
../src/iteration/CFEMFluidIteration.cpp \
77+
../src/iteration/CFluidIteration.cpp \
78+
../src/iteration/CHeatIteration.cpp \
79+
../src/iteration/CTurboIteration.cpp \
7080
../src/numerics/CNumerics.cpp \
7181
../src/numerics/template.cpp \
7282
../src/numerics/transition.cpp \

‎SU2_CFD/src/iteration/CAdjFluidIteration.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
* License along with SU2. If not, see <http://www.gnu.org/licenses/>.
2626
*/
2727

28-
#include "../include/iteration/CAdjFluidIteration.hpp"
29-
#include "../include/output/COutput.hpp"
28+
#include "../../include/iteration/CAdjFluidIteration.hpp"
29+
#include "../../include/output/COutput.hpp"
3030

3131
void CAdjFluidIteration::Preprocess(COutput* output, CIntegration**** integration, CGeometry**** geometry,
3232
CSolver***** solver, CNumerics****** numerics, CConfig** config,

‎SU2_CFD/src/iteration/CDiscAdjFEAIteration.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
* License along with SU2. If not, see <http://www.gnu.org/licenses/>.
2626
*/
2727

28-
#include "../include/iteration/CDiscAdjFEAIteration.hpp"
29-
#include "../include/iteration/CFEAIteration.hpp"
30-
#include "../include/solvers/CFEASolver.hpp"
31-
#include "../include/output/COutput.hpp"
28+
#include "../../include/iteration/CDiscAdjFEAIteration.hpp"
29+
#include "../../include/iteration/CFEAIteration.hpp"
30+
#include "../../include/solvers/CFEASolver.hpp"
31+
#include "../../include/output/COutput.hpp"
3232

3333
CDiscAdjFEAIteration::CDiscAdjFEAIteration(const CConfig *config) : CIteration(config), CurrentRecording(NONE) {
3434
fem_iteration = new CFEAIteration(config);

‎SU2_CFD/src/iteration/CDiscAdjFluidIteration.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@
2525
* License along with SU2. If not, see <http://www.gnu.org/licenses/>.
2626
*/
2727

28-
#include "../include/iteration/CDiscAdjFluidIteration.hpp"
29-
#include "../include/output/COutput.hpp"
30-
31-
CDiscAdjFluidIteration::~CDiscAdjFluidIteration(void) {}
28+
#include "../../include/iteration/CDiscAdjFluidIteration.hpp"
29+
#include "../../include/output/COutput.hpp"
3230

3331
void CDiscAdjFluidIteration::Preprocess(COutput* output, CIntegration**** integration, CGeometry**** geometry,
3432
CSolver***** solver, CNumerics****** numerics, CConfig** config,

‎SU2_CFD/src/iteration/CDiscAdjHeatIteration.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@
2525
* License along with SU2. If not, see <http://www.gnu.org/licenses/>.
2626
*/
2727

28-
#include "../include/iteration/CDiscAdjHeatIteration.hpp"
29-
#include "../include/output/COutput.hpp"
30-
31-
CDiscAdjHeatIteration::~CDiscAdjHeatIteration(void) {}
28+
#include "../../include/iteration/CDiscAdjHeatIteration.hpp"
29+
#include "../../include/output/COutput.hpp"
3230

3331
void CDiscAdjHeatIteration::Preprocess(COutput* output, CIntegration**** integration, CGeometry**** geometry,
3432
CSolver***** solver, CNumerics****** numerics, CConfig** config,

‎SU2_CFD/src/iteration/CFEAIteration.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
* License along with SU2. If not, see <http://www.gnu.org/licenses/>.
2626
*/
2727

28-
#include "../include/iteration/CFEAIteration.hpp"
29-
#include "../include/output/COutput.hpp"
28+
#include "../../include/iteration/CFEAIteration.hpp"
29+
#include "../../include/output/COutput.hpp"
3030

3131
void CFEAIteration::Iterate(COutput* output, CIntegration**** integration, CGeometry**** geometry, CSolver***** solver,
3232
CNumerics****** numerics, CConfig** config, CSurfaceMovement** surface_movement,

‎SU2_CFD/src/iteration/CFEMFluidIteration.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
* License along with SU2. If not, see <http://www.gnu.org/licenses/>.
2626
*/
2727

28-
#include "../include/iteration/CFEMFluidIteration.hpp"
29-
#include "../include/output/COutput.hpp"
28+
#include "../../include/iteration/CFEMFluidIteration.hpp"
29+
#include "../../include/output/COutput.hpp"
3030

3131
void CFEMFluidIteration::Preprocess(COutput* output, CIntegration**** integration, CGeometry**** geometry,
3232
CSolver***** solver, CNumerics****** numerics, CConfig** config,

0 commit comments

Comments
 (0)