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

Commit cb457961 authored by Michael Dumbser's avatar Michael Dumbser

removed hllem call again

parent 9d2286ac
......@@ -7,7 +7,7 @@ RECURSIVE SUBROUTINE ADMConstraints( Constraints, Q, gradQ )
INTENT(OUT) :: Constraints
INTEGER, PARAMETER :: nConstraints = 6
INTEGER :: i, ip, j, k, l, m, n, iErr, qq, ii, jj, kk, ll, mm, nn
REAL :: xGP(d), Constraints(nConstraints), Q(nVar), gradQ(nVar,nDim)!, gradQT(d,Nvar)
REAL :: xGP(d), Constraints(nConstraints), Q(nVar), gradQ(nVar,d)!, gradQT(d,Nvar)
REAL :: traceK, R, phi, KK2
REAL :: g_contr(3,3), g_cov(3,3), Ricci(3,3)
REAL :: DD(3,3,3), Atilde(3,3), PP(3), GG(3), dP(3,3)
......
......@@ -2115,6 +2115,16 @@ RECURSIVE SUBROUTINE HLLEMFluxFV(smaxout,FL,FR,QL,QR,NormalNonZero)
CALL PDEEigenvalues(LL,QL,nv)
CALL PDEEigenvalues(LR,QR,nv)
smax = MAX( MAXVAL(ABS(LL)), MAXVAL(ABS(LR)) )
smaxout=smax
flux = 0.5*(fL + fR) -0.5*smax*( QR - QL )
!
!
! decoupled Rusanov
!
#ifdef CCZ4GRHD
alpha = EXP(QL(17))
phi = EXP(QL(55))
QL_GRMHD(1:5) = QL(60:64) ! hydro variables
......@@ -2134,18 +2144,12 @@ RECURSIVE SUBROUTINE HLLEMFluxFV(smaxout,FL,FR,QL,QR,NormalNonZero)
QR_GRMHD(14:19) = QR(1:6)/phi**2 ! metric
CALL PDEEigenvaluesGRMHD(LR_GRMHD,QR_GRMHD,nv)
smax = MAX( MAXVAL(ABS(LL)), MAXVAL(ABS(LR)) )
smaxout=smax
flux = 0.5*(fL + fR) -0.5*smax*( QR - QL )
!
!
! decoupled Rusanov
!
smax = MAX( MAXVAL(ABS(LL_GRMHD)), MAXVAL(ABS(LR_GRMHD)) )
flux(60:64) = 0.5*(fL(60:64) + fR(60:64)) -0.5*smax*( QR(60:64) - QL(60:64) )
!
#endif
!
gradQ=0.
gradQ(:,NormalNonZero+1) = QR(:) - QL(:)
......@@ -2159,10 +2163,10 @@ RECURSIVE SUBROUTINE HLLEMFluxFV(smaxout,FL,FR,QL,QR,NormalNonZero)
!
! HLLEM for GRHD
!
CALL HLLEMFluxFVGRMHD(FL_GRMHD,FR_GRMHD,QL_GRMHD,QR_GRMHD,nv)
!CALL HLLEMFluxFVGRMHD(FL_GRMHD,FR_GRMHD,QL_GRMHD,QR_GRMHD,nv)
!
fR(60:64) = FR_GRMHD(1:5)
fL(60:64) = FL_GRMHD(1:5)
!fR(60:64) = FR_GRMHD(1:5)
!fL(60:64) = FL_GRMHD(1:5)
!
!fR(18:nVar) = 0.- 0.5*ncp(18:nVar)
......@@ -3919,7 +3923,7 @@ RECURSIVE SUBROUTINE pderefinecriteria(refine_flag, max_luh,min_luh,x)
! return
!end if
refine_flag = 0
#ifdef CCZ4EINSTEIN
!!#ifdef CCZ4EINSTEIN
! if(abs(max_luh(60)-min_luh(60))>1.e-4 .or. abs(max_luh(54)-min_luh(54))>1.e-3) then
......@@ -3938,7 +3942,8 @@ RECURSIVE SUBROUTINE pderefinecriteria(refine_flag, max_luh,min_luh,x)
end if
end if
#endif
!#endif
END SUBROUTINE pderefinecriteria
......
......@@ -89,12 +89,98 @@
"slope_limiter" : "minmod",
"implementation": "generic"
},
"variables": [
{
"name": "G",
"multiplicity": 6
},
{
"name": "K",
"multiplicity": 6
},
{
"name": "theta",
"multiplicity": 1
},
{
"name": "Z",
"multiplicity": 3
},
{
"name": "lapse",
"multiplicity": 1
},
{
"name": "shift",
"multiplicity": 3
},
{
"name": "b",
"multiplicity": 3
},
{
"name": "dLapse",
"multiplicity": 3
},
{
"name": "dxShift",
"multiplicity": 3
},
{
"name": "dyShift",
"multiplicity": 3
},
{
"name": "dzShift",
"multiplicity": 3
},
{
"name": "dxG",
"multiplicity": 6
},
{
"name": "dyG",
"multiplicity": 6
},
{
"name": "dzG",
"multiplicity": 6
},
{
"name": "traceK",
"multiplicity": 1
},
{
"name": "phi",
"multiplicity": 1
},
{
"name": "P",
"multiplicity": 3
},
{
"name": "K0",
"multiplicity": 1
},
{
"name": "rho",
"multiplicity": 1
},
{
"name": "vel",
"multiplicity": 3
},
{
"name": "pressure",
"multiplicity": 1
},
{
"name": "MYQ",
"multiplicity": 96
"name": "glm",
"multiplicity": 32
}
],
"parameters": {
"reference": "CCZ4MinkowskiSrc"
},
......
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