Skip to content

Restructuring of solver files #849

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

Merged
jayantmukho merged 51 commits into from
Jan 27, 2020
Merged

Restructuring of solver files #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
3702fbe
split hpp files up
jayantmukho Dec 19, 2019
0d82d4e
split the header files completely
jayantmukho Dec 20, 2019
50a5928
split the header files completely
jayantmukho Dec 20, 2019
026f227
split into inidividual inline files for solvers
jayantmukho Jan 6, 2020
c94466d
added .inl includes in the header files
jayantmukho Jan 6, 2020
df79c41
.cpp .hpp and .inl files are seperated and it builds!
jayantmukho Jan 10, 2020
8cbac15
fixing typo in meson build
jayantmukho Jan 10, 2020
03b03cf
added some filenames to the meson.build files
jayantmukho Jan 10, 2020
8bab2b5
removed old solver.cpp files
jayantmukho Jan 10, 2020
a073a13
removing old solver header files
jayantmukho Jan 10, 2020
8b9cbdc
testing splitting scripts
jayantmukho Jan 10, 2020
aa673d7
added inline functions to .hpp files
jayantmukho Jan 11, 2020
21692ad
removed references to solver inline files
jayantmukho Jan 11, 2020
0f44cb2
fix some of the inline functions
jayantmukho Jan 11, 2020
6c216c9
removed solver.inl files
jayantmukho Jan 11, 2020
2c13bbd
fixing indenting and removing some includes
jayantmukho Jan 13, 2020
92d3776
more indentation fixes
jayantmukho Jan 13, 2020
8a61bde
Merge remote-tracking branch 'origin/develop' into restructure_solvers
jayantmukho Jan 13, 2020
55103ac
more indentation fixes
jayantmukho Jan 13, 2020
c0da336
merged with develop
jayantmukho Jan 14, 2020
d2fa8c1
trimmed tabs and whitespaces
jayantmukho Jan 14, 2020
a5ac836
fix in CTurbSolver
jayantmukho Jan 14, 2020
b6170c6
merge with develop
jayantmukho Jan 21, 2020
cf20251
Su2_DOT meson build update
jayantmukho Jan 21, 2020
bbe633a
merge with develop
jayantmukho Jan 21, 2020
1c33dfd
Merge remote-tracking branch 'upstream/restructure_solvers' into feat…
pcarruscag Jan 21, 2020
70e5989
re-apply some cleanup
pcarruscag Jan 21, 2020
ea05f13
update legacy build system
pcarruscag Jan 21, 2020
1e611a5
solve one TODO
pcarruscag Jan 21, 2020
b74f3bf
first round of final, override, and const specifiers
jayantmukho Jan 22, 2020
a5275fd
Merge branch 'hybrid_parallel_fea_solver' into feature_hybrid_paralle…
pcarruscag Jan 22, 2020
cfdeb35
missed a spot
pcarruscag Jan 22, 2020
5551620
Merge branch 'hybrid_parallel_fea_solver' into feature_hybrid_paralle…
pcarruscag Jan 22, 2020
2be35de
small cleanup
pcarruscag Jan 22, 2020
63d4be8
add cli option for MPI_THREAD_MULTIPLE
pcarruscag Jan 22, 2020
185547a
two thirds of the way done with virtual specifiers
jayantmukho Jan 23, 2020
89f2dcd
adding const to fix segfault on transonic cases
jayantmukho Jan 23, 2020
bdc6a17
Merge branch 'hybrid_parallel_fea_solver' into feature_hybrid_paralle…
pcarruscag Jan 23, 2020
016860d
Merge remote-tracking branch 'upstream/restructure_solvers' into feat…
pcarruscag Jan 23, 2020
3e31a20
finished the virtual and const specifications
jayantmukho Jan 23, 2020
4df3980
declaring classes as final
jayantmukho Jan 23, 2020
b29fb48
minor fixes
jayantmukho Jan 23, 2020
a82d0cb
Merge remote-tracking branch 'upstream/restructure_solvers' into feat…
pcarruscag Jan 24, 2020
ad5a4a7
merge
pcarruscag Jan 24, 2020
ba9e218
Merge remote-tracking branch 'upstream/develop' into feature_hybrid_p…
pcarruscag Jan 24, 2020
7642268
remove dirichlet and neumann BCs:
jayantmukho Jan 24, 2020
ad84b85
merged with develop
jayantmukho Jan 24, 2020
8cd8260
formatting of CFEASolver and CMeshSolver
jayantmukho Jan 24, 2020
ff0f049
getting rid of some compiler warnings
jayantmukho Jan 24, 2020
f8e862f
moved some includes, added some overrides, removed a const
jayantmukho Jan 27, 2020
eff6d67
reverting parentheses fix in CConjugateHeatInterface
jayantmukho Jan 27, 2020
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
25 changes: 3 additions & 22 deletions Common/include/config_structure.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ class CConfig {
nMarker_Fluid_Load, /*!< \brief Number of markers in which the flow load is computed/employed. */
nMarker_Fluid_InterfaceBound, /*!< \brief Number of fluid interface markers. */
nMarker_CHTInterface, /*!< \brief Number of conjugate heat transfer interface markers. */
nMarker_Dirichlet, /*!< \brief Number of interface boundary markers. */
nMarker_Inlet, /*!< \brief Number of inlet flow markers. */
nMarker_Riemann, /*!< \brief Number of Riemann flow markers. */
nMarker_Giles, /*!< \brief Number of Giles flow markers. */
Expand All @@ -220,8 +219,7 @@ class CConfig {
nMarker_Disp_Dir, /*!< \brief Number of load surface markers defined by magnitude and direction. */
nMarker_Load_Sine, /*!< \brief Number of load surface markers defined by magnitude and direction. */
nMarker_FlowLoad, /*!< \brief Number of load surface markers. */
nMarker_Neumann, /*!< \brief Number of Neumann flow markers. */
nMarker_Internal, /*!< \brief Number of Neumann flow markers. */
nMarker_Internal, /*!< \brief Number of internal flow markers. */
nMarker_All, /*!< \brief Total number of markers using the grid information. */
nMarker_Max, /*!< \brief Max number of number of markers using the grid information. */
nMarker_CfgFile; /*!< \brief Total number of markers using the config file
Expand All @@ -248,7 +246,6 @@ class CConfig {
*Marker_CHTInterface, /*!< \brief Conjugate heat transfer interface markers. */
*Marker_ActDiskInlet, /*!< \brief Actuator disk inlet markers. */
*Marker_ActDiskOutlet, /*!< \brief Actuator disk outlet markers. */
*Marker_Dirichlet, /*!< \brief Interface boundaries markers. */
*Marker_Inlet, /*!< \brief Inlet flow markers. */
*Marker_Riemann, /*!< \brief Riemann markers. */
*Marker_Giles, /*!< \brief Giles markers. */
Expand All @@ -268,11 +265,9 @@ class CConfig {
*Marker_Disp_Dir, /*!< \brief Load markers defined in cartesian coordinates. */
*Marker_Load_Sine, /*!< \brief Sine-wave loaded markers defined in cartesian coordinates. */
*Marker_FlowLoad, /*!< \brief Flow Load markers. */
*Marker_Neumann, /*!< \brief Neumann flow markers. */
*Marker_Internal, /*!< \brief Neumann flow markers. */
*Marker_Internal, /*!< \brief Internal flow markers. */
*Marker_All_TagBound; /*!< \brief Global index for markers using grid information. */

su2double *Dirichlet_Value; /*!< \brief Specified Dirichlet value at the boundaries. */
su2double *Exhaust_Temperature_Target; /*!< \brief Specified total temperatures for nacelle boundaries. */
su2double *Exhaust_Pressure_Target; /*!< \brief Specified total pressures for nacelle boundaries. */
su2double *Inlet_Ttotal; /*!< \brief Specified total temperatures for inlet boundaries. */
Expand Down Expand Up @@ -6554,21 +6549,7 @@ class CConfig {
* \return The inlet velocity vector.
*/
su2double* GetInlet_Velocity(string val_index);

/*!
* \brief Get the fixed value at the Dirichlet boundary.
* \param[in] val_index - Index corresponding to the Dirichlet boundary.
* \return The total temperature.
*/
su2double GetDirichlet_Value(string val_index);

/*!
* \brief Get whether this is a Dirichlet or a Neumann boundary.
* \param[in] val_index - Index corresponding to the Dirichlet boundary.
* \return Yes or No.
*/
bool GetDirichlet_Boundary(string val_index);


/*!
* \brief Get the total pressure at an inlet boundary.
* \param[in] val_index - Index corresponding to the inlet boundary.
Expand Down
94 changes: 21 additions & 73 deletions Common/lib/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,91 +45,19 @@ noinst_LIBRARIES += libSU2_AD.a
endif

lib_sources = \
../include/datatypes/primitive_structure.hpp \
../include/datatypes/primitive_structure.inl \
../include/datatypes/complex_structure.hpp \
../include/datatypes/complex_structure.inl \
../include/ad_structure.hpp \
../include/ad_structure.inl \
../include/fem_cgns_elements.hpp \
../include/config_structure.hpp \
../include/config_structure.hpp \
../include/config_structure.inl \
../include/blas_structure.hpp \
../include/dual_grid_structure.hpp \
../include/dual_grid_structure.inl \
../include/fem_geometry_structure.hpp \
../include/fem_geometry_structure.inl \
../include/fem_standard_element.hpp \
../include/fem_standard_element.inl \
../include/CMultiGridQueue.hpp \
../include/CMeshReaderFVM.hpp \
../include/CSU2ASCIIMeshReaderFVM.hpp \
../include/CCGNSMeshReaderFVM.hpp \
../include/CRectangularMeshReaderFVM.hpp \
../include/CBoxMeshReaderFVM.hpp \
../include/graph_coloring_structure.hpp \
../include/grid_adaptation_structure.hpp \
../include/grid_adaptation_structure.inl \
../include/grid_movement_structure.hpp \
../include/grid_movement_structure.inl \
../include/option_structure.hpp \
../include/primal_grid_structure.hpp \
../include/primal_grid_structure.inl \
../include/mpi_structure.hpp \
../include/mpi_structure.inl \
../include/datatype_structure.hpp \
../include/datatype_structure.inl \
../include/interpolation_structure.hpp \
../include/fem_gauss_jacobi_quadrature.hpp \
../include/fem_gauss_jacobi_quadrature.inl \
../include/adt_structure.hpp \
../include/adt_structure.inl \
../include/wall_model.hpp \
../include/wall_model.inl \
../include/toolboxes/printing_toolbox.hpp \
../include/toolboxes/CLinearPartitioner.hpp \
../include/toolboxes/MMS/CVerificationSolution.hpp \
../include/toolboxes/MMS/CVerificationSolution.inl \
../include/toolboxes/MMS/CIncTGVSolution.hpp \
../include/toolboxes/MMS/CInviscidVortexSolution.hpp \
../include/toolboxes/MMS/CMMSIncEulerSolution.hpp \
../include/toolboxes/MMS/CMMSIncNSSolution.hpp \
../include/toolboxes/MMS/CMMSNSTwoHalfCirclesSolution.hpp \
../include/toolboxes/MMS/CMMSNSTwoHalfSpheresSolution.hpp \
../include/toolboxes/MMS/CMMSNSUnitQuadSolution.hpp \
../include/toolboxes/MMS/CMMSNSUnitQuadSolutionWallBC.hpp \
../include/toolboxes/MMS/CNSUnitQuadSolution.hpp \
../include/toolboxes/MMS/CRinglebSolution.hpp \
../include/toolboxes/MMS/CTGVSolution.hpp \
../include/toolboxes/MMS/CUserDefinedSolution.hpp \
../include/linear_algebra/CSysVector.hpp \
../include/linear_algebra/CSysMatrix.hpp \
../include/linear_algebra/CSysMatrix.inl \
../include/linear_algebra/CMatrixVectorProduct.hpp \
../include/linear_algebra/CPreconditioner.inl \
../include/linear_algebra/CSysSolve.hpp \
../include/linear_algebra/CSysSolve_b.hpp \
../src/fem_cgns_elements.cpp \
../src/config_structure.cpp \
../src/blas_structure.cpp \
../src/dual_grid_structure.cpp \
../src/fem_geometry_structure.cpp \
../src/fem_integration_rules.cpp \
../src/fem_standard_element.cpp \
../src/fem_wall_distance.cpp \
../src/fem_work_estimate_metis.cpp \
../src/CMultiGridQueue.cpp \
../src/CMeshReaderFVM.cpp \
../src/CSU2ASCIIMeshReaderFVM.cpp \
../src/CCGNSMeshReaderFVM.cpp \
../src/CRectangularMeshReaderFVM.cpp \
../src/CBoxMeshReaderFVM.cpp \
../src/geometry_structure_fem_part.cpp \
../src/graph_coloring_structure.cpp \
../src/grid_adaptation_structure.cpp \
../src/grid_movement_structure.cpp \
../src/primal_grid_structure.cpp \
../src/mpi_structure.cpp \
../src/ad_structure.cpp \
../src/fem_gauss_jacobi_quadrature.cpp \
Expand All @@ -144,11 +72,31 @@ lib_sources = \
../src/geometry/elements/CPYRAM5.cpp \
../src/geometry/elements/CPRISM6.cpp \
../src/geometry/elements/CHEXA8.cpp \
../src/geometry/meshreader/CMeshReaderFVM.cpp \
../src/geometry/meshreader/CSU2ASCIIMeshReaderFVM.cpp \
../src/geometry/meshreader/CCGNSMeshReaderFVM.cpp \
../src/geometry/meshreader/CRectangularMeshReaderFVM.cpp \
../src/geometry/meshreader/CBoxMeshReaderFVM.cpp \
../src/geometry/dual_grid/CDualGrid.cpp \
../src/geometry/dual_grid/CEdge.cpp \
../src/geometry/dual_grid/CPoint.cpp \
../src/geometry/dual_grid/CVertex.cpp \
../src/geometry/dual_grid/CTurboVertex.cpp \
../src/geometry/primal_grid/CPrimalGrid.cpp \
../src/geometry/primal_grid/CPrimalGridFEM.cpp \
../src/geometry/primal_grid/CPrimalGridBoundFEM.cpp \
../src/geometry/primal_grid/CLine.cpp \
../src/geometry/primal_grid/CTriangle.cpp \
../src/geometry/primal_grid/CPrism.cpp \
../src/geometry/primal_grid/CPyramid.cpp \
../src/geometry/primal_grid/CHexahedron.cpp \
../src/geometry/primal_grid/CTetrahedron.cpp \
../src/geometry/primal_grid/CQuadrilateral.cpp \
../src/geometry/primal_grid/CVertexMPI.cpp \
../src/interpolation_structure.cpp \
../src/adt_structure.cpp \
../src/wall_model.cpp \
../src/toolboxes/printing_toolbox.cpp \
../src/toolboxes/signal_processing_toolbox.cpp \
../src/toolboxes/CLinearPartitioner.cpp \
../src/toolboxes/MMS/CVerificationSolution.cpp \
../src/toolboxes/MMS/CIncTGVSolution.cpp \
Expand Down
Loading