gkowal/amun-code
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into reconnection

Browse Source
This commit is contained in:
Grzegorz Kowal 2017-09-05 12:15:38 -03:00
commit 615af23c06
5 changed files with 348 additions and 1150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver.F90
View File

@ -47,7 +47,7 @@ program amun
use integrals , only : initialize_integrals, finalize_integrals
use integrals , only : store_integrals
use interpolations, only : initialize_interpolations, finalize_interpolations
use io , only : initialize_io
use io , only : initialize_io, finalize_io
use io , only : restart_from_snapshot
use io , only : read_restart_snapshot, write_restart_snapshot
use io , only : write_snapshot, next_tout
@ -705,6 +705,10 @@ program amun
!
call finalize_integrals()
! finalize I/O module
!
call finalize_io(iret)
! finalize module PROBLEMS
!
call finalize_problems(iret)

1469
src/io.F90
View File

File diff suppressed because it is too large Load Diff

3
src/make.default
View File

@ -23,11 +23,8 @@ MPI = N
# output data format
#
# OUTPUT - the format of output data; so far only HDF5
# COMPRESS - the compression algorithm of the output data; DEFLATE or SZIP
# in the case of HDF5 or NONE for uncompressed data
#
OUTPUT = HDF5
COMPRESS = NONE
#-------------------------------------------------------------------------------
#

6
src/makefile
View File

@ -61,12 +61,6 @@ FFLAGS += ${CPPPREFIX}-DNDIMS=${NDIMS}
#
FFLAGS += ${CPPPREFIX}-D${OUTPUT}
# compression
#
ifneq ($(COMPRESS),NONE)
FFLAGS += ${CPPPREFIX}-DCOMPRESS ${CPPPREFIX}-D${COMPRESS}
endif
#-------------------------------------------------------------------------------
.SUFFIXES:

14
src/schemes.F90
View File

@ -3642,13 +3642,13 @@ module schemes
sl = min(clm(i), crm(i))
sr = max(clp(i), crp(i))
! calculate the HLLC flux
! calculate the HLLD flux
!
if (sl >= 0.0d+00) then
if (sl >= 0.0d+00) then ! sl ≥ 0
f(:,i) = fl(:,i)
else if (sr <= 0.0d+00) then
else if (sr <= 0.0d+00) then ! sr ≤ 0
f(:,i) = fr(:,i)
@ -3837,7 +3837,7 @@ module schemes
ui(iby) = by
ui(ibz) = bz
ui(ibp) = ul(ibp,i)
ui(ien) = (wcl(ien) + sm * pt - bx * vb) / (sml - sm)
ui(ien) = - (wcl(ien) + sm * pt - bx * vb) / cal
! the inmost left intermediate flux
!
@ -3855,7 +3855,7 @@ module schemes
ui(iby) = by
ui(ibz) = bz
ui(ibp) = ur(ibp,i)
ui(ien) = (wcr(ien) + sm * pt - bx * vb) / (smr - sm)
ui(ien) = (wcr(ien) + sm * pt - bx * vb) / car
! the inmost right intermediate flux
!
@ -3932,7 +3932,7 @@ module schemes
ui(iby) = by
ui(ibz) = bz
ui(ibp) = ul(ibp,i)
ui(ien) = (wcl(ien) + sm * pt - bx * vb) / (sml - sm)
ui(ien) = - (wcl(ien) + sm * pt - bx * vb) / cal
! choose the correct state depending on the sign of contact discontinuity
! advection speed
@ -4013,7 +4013,7 @@ module schemes
ui(iby) = by
ui(ibz) = bz
ui(ibp) = ur(ibp,i)
ui(ien) = (wcr(ien) + sm * pt - bx * vb) / (smr - sm)
ui(ien) = (wcr(ien) + sm * pt - bx * vb) / car
! choose the correct state depending on the sign of contact discontinuity
! advection speed