Skip to content

Commit

Permalink
Merge pull request su2code#849 from su2code/restructure_solvers
Browse files Browse the repository at this point in the history 
Restructuring of solver files
  • Loading branch information
@jayantmukho
jayantmukho authored Jan 27, 2020
2 parents 43f01fb + eff6d67 commit 1a64163
Show file tree
Hide file tree
Showing 107 changed files with 39,781 additions and 39,918 deletions.
25 changes: 3 additions & 22 deletions Common/include/config_structure.hpp
View file
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
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

0 comments on commit 1a64163

Please sign in to comment.