05.03., 9:00 - 11:00: Due to updates GitLab will be unavailable for some minutes between 09:00 and 11:00.

Commit 7a642572 authored by Anne Reinarz's avatar Anne Reinarz

Merge branch 'master' of gitlab.lrz.de:exahype/ExaHyPE-Engine

parents 0f4cbcc1 41f2badb
......@@ -35,5 +35,5 @@ void FOCCZ4::CentralDensity::mapQuantities(
) {
double V[96];
pdecons2prim_(V,Q);
outputQuantities[0] = Q[59];
outputQuantities[0] = V[59];
}
......@@ -131,3 +131,32 @@ void FOCCZ4::FOCCZ4Solver_FV::nonConservativeProduct(const double* const Q,cons
}
double FOCCZ4::FOCCZ4Solver_FV::riemannSolver(double* fL, double *fR, const double* qL, const double* qR, const double* gradQL, const double* gradQR, const double* cellSize, int direction) {
//return kernels::finitevolumes::riemannsolvers::c::rusanov<true, true, false, FOCCZ4Solver_FV>(*static_cast<FOCCZ4Solver_FV*>(this), fL,fR,qL,qR,gradQL, gradQR, cellSize, direction);
constexpr int numberOfVariables = AbstractFOCCZ4Solver_FV::NumberOfVariables;
//printf("SONO QUI IN riemannSolver");
/* HLLEM */
//const int numberOfVariables = GRMHDb::AbstractGRMHDbSolver_FV::NumberOfVariables;
const int numberOfParameters = FOCCZ4::AbstractFOCCZ4Solver_FV::NumberOfParameters;
const int numberOfData = numberOfVariables + numberOfParameters;
const int order = 0; // for finite volume we use one single d.o.f., i.e. the cell average.
const int basisSize = order + 1;
// Compute the average variables and parameters from the left and the right
double QavL[numberOfData] = { 0.0 }; // ~(numberOfVariables+numberOfParameters)
double QavR[numberOfData] = { 0.0 }; // ~(numberOfVariables+numberOfParameters)
#ifdef CCZ4GRHD
double lambda;
hllemfluxfv_(&lambda, fL, fR, qL, qR, &direction);
#else
double lambda = kernels::finitevolumes::riemannsolvers::c::rusanov<true, true, false, FOCCZ4Solver_FV>(*static_cast<FOCCZ4Solver_FV*>(this), fL, fR, qL, qR, gradQL, gradQR, cellSize, direction);
#endif
//std::cout << lambda << std::endl;
//double1 lambda = 10.0;
return lambda;
}
......@@ -142,6 +142,9 @@ class FOCCZ4::FOCCZ4Solver_FV : public FOCCZ4::AbstractFOCCZ4Solver_FV {
*/
void nonConservativeProduct(const double* const Q,const double* const gradQ,double* const BgradQ) override;
double riemannSolver(double* fL, double *fR, const double* qL, const double* qR, const double* gradQL, const double* gradQR, const double* cellSize, int direction) override;
/* pointSource() function not included, as requested in the specification file */
};
......
This diff is collapsed.
......@@ -27,7 +27,9 @@ void pdecritialstress_(double* CS, const double* const Q);
void pderefinecriteria_(int* refine_flag,const double* max_luh,const double* min_luh,const double* x);
//void hllemfluxfv_(double* FL, double* FR, const double* const QL, const double* const QR, const double* const QavL, const double* const QavR, const int* normalNonZeroIndex);
void hllemfluxfv_(double* FL, double* FR, const double* const QL, const double* const QR, const int* normalNonZeroIndex);
//void hllemfluxfv_(double* FL, double* FR, const double* const QL, const double* const QR, const int* normalNonZeroIndex);
void hllemfluxfv_(double* lambda, double* FL, double* FR, const double* const QL, const double* const QR, const int* normalNonZeroIndex);
void hllemriemannsolver_(const int* basisSize, const int* normalNonZeroIndex, double* FL, double* FR, const double* const QL, const double* const QR, const double* const QavL, const double* const QavR);
void admconstraints_(double* constraints, double* Q, double* gradQ);
......
......@@ -828,7 +828,7 @@ SUBROUTINE SetMainParameters(N_in,M_in,basisSize,Ghostlayers)
nElem_max=2000000
nElem_max=50000
nElem_max=100000
nSubPlotElem_max=nElem_max*M**nDim
nRealNodes_max=nElem_max*(M+1)**nDim
! Initialize matries and gauss points
......
Markdown is supported
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