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.

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

Feature hb #311

Merged
merged 57 commits into from
Oct 5, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
da38a7e
Changes to SU2 made
sravya91 Aug 8, 2015
619a8df
Working SU2_TS
sravya91 Aug 8, 2015
6c53041
Merged into develop
sravya91 Aug 18, 2015
eea9805
Added Harmonic Balance Method
sravya91 Sep 22, 2015
a580809
Fixed line endings
sravya91 Jan 12, 2016
a6e8461
Updated to Version 4.1
sravya91 Jan 30, 2016
cc00631
Must provide Time period for all spectral method computation
sravya91 Jan 30, 2016
463eed2
Added HB,TS Spectral Method type options to config file
sravya91 Jan 30, 2016
925f9ff
resolve conflicts with develop
arubino May 19, 2016
7f86b56
Resolve conflicts
arubino Jul 18, 2016
2d49194
Non-dimensionalization of spectral methods
arubino Jul 25, 2016
c96a1f6
Merge branch 'develop' into feature_HB
arubino Jul 26, 2016
6fda7b0
Change double to su2double
arubino Sep 8, 2016
19f504f
Added regression test for HB flow solution, SetSpectralMethod(iZone)
sravya91 Sep 16, 2016
c437f7f
Fix conflicts with new develop
arubino Sep 20, 2016
84297e9
Small change indentation of travis config
arubino Sep 20, 2016
279ec29
Some changes for new HB names
arubino Sep 20, 2016
0655ecb
Change residuals for spectral method regression test
arubino Sep 20, 2016
9606ee0
Change residuals for turbomachinery due to a different definition
arubino Sep 20, 2016
e065419
Move TS_file to COutput
arubino Sep 20, 2016
bf301b5
Clean output and rename in view of turbomachinery merge
arubino Sep 20, 2016
22d13ea
Change the way the spectral operator is computed to improve the perfo…
arubino Sep 20, 2016
a830ba4
Some comments
arubino Sep 20, 2016
1c76f7a
Clean CSpectralDriver::Run
arubino Sep 20, 2016
2c44f54
Update residuals in regression test for spectral testcase
arubino Sep 20, 2016
ebe24dc
Remove wrong residula list
arubino Sep 20, 2016
8f96a1d
Remove SetTimeSpectral_Velocities()
arubino Sep 21, 2016
ae77f07
Implement the spectral operator using complex numbers
arubino Sep 21, 2016
ea86ed5
Clean old structure
arubino Sep 21, 2016
2ac7ddc
Remove print
arubino Sep 21, 2016
145c26b
Corrected EInverse operator, minor changes to input variables of spec…
sravya91 Sep 21, 2016
5500ff5
Changed inputs of spectral operators, corrected the regression test c…
sravya91 Sep 21, 2016
2c3d230
Convert vectors into pointers to fix issue with codi compilation
arubino Sep 22, 2016
2c24078
Fix small bug in deallocation of dynamic memory. Code not working in …
arubino Sep 22, 2016
ce70d3e
Clean driver_structure.hpp file from unused methods
arubino Sep 22, 2016
a0c2d48
Clean to prepare pull request
arubino Sep 22, 2016
ce67f31
Merge branch 'develop' of https://github.com/su2code/SU2 into feature_HB
arubino Sep 26, 2016
da5f1fd
Remove Time Spectral
arubino Sep 26, 2016
c0c6329
Remove Time Spectral and change serial_regression.py
arubino Sep 26, 2016
2622722
Change output format for spectral methods and multizone
arubino Sep 27, 2016
11c522f
Add GetnZone in config and modify the SU2 accordignly
arubino Sep 27, 2016
c7cea03
Move GetnZone and and GetnDim into CConfig
arubino Sep 27, 2016
e75b55d
Merge branch 'develop' of https://github.com/su2code/SU2 into feature_HB
arubino Sep 29, 2016
9543e59
Rename spectral method for harmonic balance only and change .cfg file
arubino Sep 29, 2016
d3042d2
Rename for HB
arubino Sep 29, 2016
7ce3563
Change regression test names and folder
arubino Sep 29, 2016
1cea431
Add new config file for HB
arubino Sep 29, 2016
f33d988
Change travis config for pull request
arubino Sep 29, 2016
4a68b65
Delete old files
arubino Sep 29, 2016
392d1f0
Terminology edits to HB config file
sravya91 Sep 29, 2016
d4bffb9
Fixed minor bug in the MultiZone Dynamic mesh update
sravya91 Sep 29, 2016
3d19b61
Fix unsteady .csv output issue
arubino Sep 30, 2016
e7d9229
Revert to old centrifugal_stage residuals
arubino Sep 30, 2016
a5fe9db
Merge branch 'develop' into feature_HB
talbring Sep 30, 2016
e56b39f
Change parallel regrassion test .su2_exec to parallel_computation.py
arubino Sep 30, 2016
38f52cc
Merge branch 'feature_HB' of https://github.com/su2code/SU2 into feat…
arubino Sep 30, 2016
91c7dd0
Change CSpectralDriver into CHBDriver, rename for consistency and cha…
arubino Oct 4, 2016
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
214 changes: 122 additions & 92 deletions Common/include/config_structure.hpp

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion Common/include/config_structure.inl
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ inline unsigned long CConfig::GetnExtIter(void) { return nExtIter; }

inline unsigned short CConfig::GetnTimeInstances(void) { return nTimeInstances; }

inline su2double CConfig::GetTimeSpectral_Period(void) { return TimeSpectral_Period; }
inline su2double CConfig::GetHarmonicBalance_Period(void) { return HarmonicBalance_Period; }

inline void CConfig::SetExtIter(unsigned long val_iter) { ExtIter = val_iter; }

Expand Down Expand Up @@ -561,6 +561,8 @@ inline su2double CConfig::GetPlunging_Ampl_Y(unsigned short val_iZone) { return

inline su2double CConfig::GetPlunging_Ampl_Z(unsigned short val_iZone) { return Plunging_Ampl_Z[val_iZone]; }

inline su2double* CConfig::GetOmega_HB(void) { return Omega_HB; }

inline unsigned short CConfig::GetMoveMotion_Origin(unsigned short val_marker) {return MoveMotion_Origin[val_marker]; }

inline su2double CConfig::GetminTurkelBeta() { return Min_Beta_RoeTurkel; }
Expand Down
6 changes: 3 additions & 3 deletions Common/include/dual_grid_structure.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -651,18 +651,18 @@ class CPoint : public CDualGrid {
*/
su2double **GetGridVel_Grad(void);

/*!
/*!
* \brief Add the value of the coordinates to the <i>Coord_Sum</i> vector for implicit smoothing.
* \param[in] val_coord_sum - Value of the coordinates to add.
*/
void AddCoord_Sum(su2double *val_coord_sum);

/*!
/*!
* \brief Initialize the vector <i>Coord_Sum</i>.
*/
void SetCoord_SumZero(void);

/*!
/*!
* \brief Set the value of the vector <i>Coord_Old</i> for implicit smoothing.
* \param[in] val_coord_old - Value of the coordinates.
*/
Expand Down
12 changes: 6 additions & 6 deletions Common/include/dual_grid_structure.inl
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,17 @@ inline su2double **CPoint::GetGridVel_Grad(void) { return GridVel_Grad; }

inline void CPoint::SetCoord_Old(su2double *val_coord_old) {
for (unsigned short iDim = 0; iDim < nDim; iDim++)
Coord_Old[iDim] = val_coord_old[iDim];
Coord_Old[iDim] = val_coord_old[iDim];
}

inline void CPoint::SetCoord_SumZero(void) {
for (unsigned short iDim = 0; iDim < nDim; iDim++)
Coord_Sum[iDim] = 0.0;
Coord_Sum[iDim] = 0.0;
}

inline void CPoint::AddCoord_Sum(su2double *val_coord_sum) {
for (unsigned short iDim = 0; iDim < nDim; iDim++)
Coord_Sum[iDim] += val_coord_sum[iDim];
for (unsigned short iDim = 0; iDim < nDim; iDim++)
Coord_Sum[iDim] += val_coord_sum[iDim];
}

inline void CPoint::SetGridVel(unsigned short val_dim, su2double val_gridvel) { GridVel[val_dim] = val_gridvel; }
Expand All @@ -140,13 +140,13 @@ inline bool CPoint::GetAgglomerate_Indirect (void) { return Agglomerate_Indirect

inline void CPoint::SetAgglomerate_Indirect(bool val_agglomerate) { Agglomerate_Indirect = val_agglomerate; };

inline void CPoint::SetVertex(long val_vertex, unsigned short val_nmarker) {
inline void CPoint::SetVertex(long val_vertex, unsigned short val_nmarker) {
if (Boundary) Vertex[val_nmarker] = val_vertex;
}

inline unsigned short CPoint::GetnChildren_CV (void) { return nChildren_CV; }

inline long CPoint::GetVertex(unsigned short val_marker) {
inline long CPoint::GetVertex(unsigned short val_marker) {
if (Boundary) return Vertex[val_marker];
else return -1;
}
Expand Down
2 changes: 1 addition & 1 deletion Common/include/grid_adaptation_structure.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class CGridAdaptation {
*/
void GetAdjResidual(CGeometry *geometry, CConfig *config);

/*!
/*!
* \brief Do a complete adaptation of the computational grid.
* \param[in] geometry - Geometrical definition of the problem.
* \param[in] strength - Adaptation Strength.
Expand Down
3 changes: 1 addition & 2 deletions Common/include/grid_movement_structure.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
#include <cstdlib>
#include <fstream>
#include <cmath>

#include <ctime>

#include "geometry_structure.hpp"
Expand Down Expand Up @@ -530,7 +529,7 @@ class CFreeFormDefBox : public CGridMovement {
* \param[in] n - Upper coefficient.
* \param[in] m - Lower coefficient.
* \return Value of the binomial coefficient n over m.
*/
*/
su2double Binomial(unsigned short n, unsigned short m);

/*!
Expand Down
14 changes: 7 additions & 7 deletions Common/include/option_structure.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1237,20 +1237,20 @@ static const map<string, ENUM_AXIS_ORIENTATION> Axis_Orientation_Map = CCreateMa
* \brief types of schemes for unsteady computations
*/
enum ENUM_UNSTEADY {
STEADY = 0, /*!< \brief A steady computation. */
TIME_STEPPING = 1, /*!< \brief Use a time stepping strategy for unsteady computations. */
DT_STEPPING_1ST = 2, /*!< \brief Use a dual time stepping strategy for unsteady computations (1st order). */
DT_STEPPING_2ND = 3, /*!< \brief Use a dual time stepping strategy for unsteady computations (2nd order). */
ROTATIONAL_FRAME = 4, /*!< \brief Use a rotational source term. */
TIME_SPECTRAL = 5 /*!< \brief Use a time spectral source term. */
STEADY = 0, /*!< \brief A steady computation. */
TIME_STEPPING = 1, /*!< \brief Use a time stepping strategy for unsteady computations. */
DT_STEPPING_1ST = 2, /*!< \brief Use a dual time stepping strategy for unsteady computations (1st order). */
DT_STEPPING_2ND = 3, /*!< \brief Use a dual time stepping strategy for unsteady computations (2nd order). */
ROTATIONAL_FRAME = 4, /*!< \brief Use a rotational source term. */
HARMONIC_BALANCE = 5 /*!< \brief Use a harmonic balance source term. */

};
static const map<string, ENUM_UNSTEADY> Unsteady_Map = CCreateMap<string, ENUM_UNSTEADY>
("NO", STEADY)
("TIME_STEPPING", TIME_STEPPING)
("DUAL_TIME_STEPPING-1ST_ORDER", DT_STEPPING_1ST)
("DUAL_TIME_STEPPING-2ND_ORDER", DT_STEPPING_2ND)
("TIME_SPECTRAL", TIME_SPECTRAL)
("HARMONIC_BALANCE", HARMONIC_BALANCE)
("ROTATIONAL_FRAME", ROTATIONAL_FRAME);

/*!
Expand Down
1 change: 0 additions & 1 deletion Common/include/primal_grid_structure.inl
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ inline unsigned short CTriangle::GetnNeighbor_Elements(void) { return nNeighbor_
inline void CTriangle::SetDomainElement(unsigned long val_domainelement) { DomainElement = val_domainelement; }

inline unsigned long CTriangle::GetDomainElement(void) { return DomainElement; }

inline unsigned short CQuadrilateral::GetFaces(unsigned short val_face, unsigned short val_index) { return Faces[val_face][val_index]; }

inline unsigned short CQuadrilateral::GetNeighbor_Nodes(unsigned short val_node, unsigned short val_index) { return Neighbor_Nodes[val_node][val_index]; }
Expand Down
Loading