Commit 952e370d authored by steffen.schotthoefer's avatar steffen.schotthoefer
Browse files

code restructuring

parent 971beab9
Pipeline #91202 failed with stages
in 5 minutes and 32 seconds
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#define LAXFRIEDRICHSFLUX_H #define LAXFRIEDRICHSFLUX_H
#include "numericalflux.h" #include "numericalflux.h"
#include "typedef.h"
class LaxFriedrichsFlux : public NumericalFlux class LaxFriedrichsFlux : public NumericalFlux
{ {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define NUMERICALFLUX_H #define NUMERICALFLUX_H
#include "settings/config.h" #include "settings/config.h"
#include "typedef.h" #include "settings/typedef.h"
class NumericalFlux class NumericalFlux
{ {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#define UPWINDFLUX_H #define UPWINDFLUX_H
#include "numericalflux.h" #include "numericalflux.h"
#include "typedef.h"
class UpwindFlux : public NumericalFlux class UpwindFlux : public NumericalFlux
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "quadratures/quadraturebase.h" #include "quadratures/quadraturebase.h"
#include "settings/globalconstants.h" #include "settings/globalconstants.h"
#include "typedef.h" #include "settings/typedef.h"
class ScatteringKernel class ScatteringKernel
{ {
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
#include "spdlog/spdlog.h" #include "spdlog/spdlog.h"
#include "settings/globalconstants.h" #include "settings/globalconstants.h"
#include "settings/typedef.h"
#include "toolboxes/errormessages.h" #include "toolboxes/errormessages.h"
#include "typedef.h"
class Mesh class Mesh
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// include Matrix, Vector definitions // include Matrix, Vector definitions
#include "settings/config.h" #include "settings/config.h"
#include "typedef.h" #include "settings/typedef.h"
class Physics class Physics
{ {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include "mesh.h" #include "mesh.h"
#include "physics.h" #include "physics.h"
#include "settings/config.h" #include "settings/config.h"
#include "typedef.h" #include "settings/typedef.h"
class ProblemBase class ProblemBase
{ {
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
#define QUADRATURE_H #define QUADRATURE_H
#include "settings/globalconstants.h" #include "settings/globalconstants.h"
#include "settings/typedef.h"
#include "toolboxes/errormessages.h" #include "toolboxes/errormessages.h"
#include "typedef.h"
#include <iostream> #include <iostream>
#include <string> #include <string>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define RECONSTRUCTOR_H #define RECONSTRUCTOR_H
#include "settings/config.h" #include "settings/config.h"
#include "typedef.h" #include "settings/typedef.h"
class Reconstructor class Reconstructor
{ {
......
...@@ -51,11 +51,13 @@ class Config ...@@ -51,11 +51,13 @@ class Config
unsigned _nCells; unsigned _nCells;
// Solver // Solver
double _CFL; /*!< @brief CFL Number for Solver*/ double _CFL; /*!< @brief CFL Number for Solver*/
double _tEnd; /*!< @brief Final Time for Simulation */ double _tEnd; /*!< @brief Final Time for Simulation */
PROBLEM_NAME _problemName; PROBLEM_NAME _problemName; /*!< @brief Name of predefined Problem */
SOLVER_NAME _solverName; SOLVER_NAME _solverName; /*!< @brief Name of the used Solver */
/*!< @brief If true, very low entries (10^-10 or smaller) of the flux matrices will be set to zero,
* to improve floating point accuracy */
bool _cleanFluxMat; bool _cleanFluxMat;
// Boundary Conditions // Boundary Conditions
...@@ -204,7 +206,7 @@ class Config ...@@ -204,7 +206,7 @@ class Config
double inline GetTEnd() const { return _tEnd; } double inline GetTEnd() const { return _tEnd; }
PROBLEM_NAME inline GetProblemName() const { return _problemName; } PROBLEM_NAME inline GetProblemName() const { return _problemName; }
SOLVER_NAME inline GetSolverName() const { return _solverName; } SOLVER_NAME inline GetSolverName() const { return _solverName; }
bool inline GetCleanFluxMat() const { return _cleanFluxMat; }
// Boundary Conditions // Boundary Conditions
BOUNDARY_TYPE GetBoundaryType( std::string nameMarker ) const; /*! @brief Get Boundary Type of given marker */ BOUNDARY_TYPE GetBoundaryType( std::string nameMarker ) const; /*! @brief Get Boundary Type of given marker */
......
/*!
* \file advectionsolver.h
* \brief solver for entropy closure of advection equation.
* \author S. Schotthöfer
*/
//#ifndef ADVECTIONSOLVER_H
//#define ADVECTIONSOLVER_H
//
//#include "settings/config.h"
//#include <vector>
//
// class AdvectionSolver
//{
// public:
// AdvectionSolver( Config* settings );
//
// /*! \brief: Solves the advection problem for given lambda */
// void Solve( std::vector<std::vector<double>>* lambda );
//
// /*! \brief: Reconstructs kintec density from given lambda and legendre dual of the entropy functional */
// std::vector<double>* ReconstructKineticDensity( std::vector<std::vector<double>>* lambda );
//
// /* ---- Getter ---- */
// /*! \brief Get pointer to solution vector for each cell (moments) */
// std::vector<std::vector<double>>* GetSolution( void ) { return &_moments; }
//
// protected:
// std::vector<std::vector<double>> _moments; /*! \brief: Solution of the moment advection problem */
// std::vector<std::vector<double>> _kineticDensity; /*! \brief: Reconstructed kinetic Density from given lamnda */
//};
//
//#endif // ADVECTIONSOLVER_H_H
#ifndef ENTROPYSOLVER_H
#define ENTROPYSOLVER_H
class EntropySolver
{
public:
EntropySolver();
};
#endif // ENTROPYSOLVER_H
...@@ -3,10 +3,7 @@ ...@@ -3,10 +3,7 @@
#include <cmath> #include <cmath>
#include "solver.h" #include "solvers/solver.h"
#include "typedef.h"
#include "settings/config.h"
class PNSolver : public Solver class PNSolver : public Solver
{ {
......
...@@ -3,10 +3,7 @@ ...@@ -3,10 +3,7 @@
#include <mpi.h> #include <mpi.h>
#include "solver.h" #include "solvers/solver.h"
#include "typedef.h"
#include "settings/config.h"
class SNSolver : public Solver class SNSolver : public Solver
{ {
......
...@@ -3,10 +3,7 @@ ...@@ -3,10 +3,7 @@
#include <mpi.h> #include <mpi.h>
#include "solver.h" #include "solvers/solver.h"
#include "typedef.h"
#include "settings/config.h"
class SNSolverMPI : public Solver class SNSolverMPI : public Solver
{ {
......
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
#include <string> #include <string>
// include Matrix, Vector definitions // include Matrix, Vector definitions
#include "fluxes/numericalflux.h"
#include "io.h" #include "io.h"
#include "kernels/scatteringkernelbase.h" #include "kernels/scatteringkernelbase.h"
#include "numericalflux.h"
#include "problems/problembase.h" #include "problems/problembase.h"
#include "quadratures/quadraturebase.h" #include "quadratures/quadraturebase.h"
#include "settings/config.h" #include "settings/config.h"
#include "typedef.h" #include "settings/typedef.h"
class Solver class Solver
{ {
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "typedef.h" #include "settings/typedef.h"
namespace TextProcessingToolbox { namespace TextProcessingToolbox {
......
...@@ -23,6 +23,8 @@ SOLVER = PN_SOLVER ...@@ -23,6 +23,8 @@ SOLVER = PN_SOLVER
CFL_NUMBER = 0.8 CFL_NUMBER = 0.8
% Final time for simulation % Final time for simulation
TIME_FINAL = 0.3 TIME_FINAL = 0.3
%
CLEAN_FLUX_MATRICES = NO
% ---- Boundary Conditions ---- % ---- Boundary Conditions ----
% Example: BC_DIRICLET = (dummyMarker1, dummyMarker2) % Example: BC_DIRICLET = (dummyMarker1, dummyMarker2)
...@@ -33,4 +35,4 @@ BC_DIRICHLET = ( void ) ...@@ -33,4 +35,4 @@ BC_DIRICHLET = ( void )
% Quadrature Type % Quadrature Type
QUAD_TYPE = MONTE_CARLO QUAD_TYPE = MONTE_CARLO
% Quadrature Order % Quadrature Order
QUAD_ORDER = 4 QUAD_ORDER = 1
#include "laxfriedrichsflux.h" #include "fluxes/laxfriedrichsflux.h"
LaxFriedrichsFlux::LaxFriedrichsFlux( Config* settings ) : NumericalFlux( settings ) {} LaxFriedrichsFlux::LaxFriedrichsFlux( Config* settings ) : NumericalFlux( settings ) {}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment