Merge branch 'master' into reconnection
This commit is contained in:
commit
a86e1d49c1
@ -4,7 +4,6 @@ problem = "tearing"
|
||||
resistivity = 1.00d-05
|
||||
viscosity = 1.00d-05
|
||||
kper = 1.00d+00
|
||||
alpha = 1.00d+01
|
||||
beta = 1.60d+00
|
||||
vper = 0.00d+00
|
||||
bper = 1.00d-02
|
||||
@ -17,10 +16,12 @@ equation_of_state = "adi"
|
||||
|
||||
# methods
|
||||
#
|
||||
time_advance = "ssprk(4,3)"
|
||||
riemann_solver = "hll"
|
||||
time_advance = "ssprk(m,3)"
|
||||
stages = 4
|
||||
riemann_solver = "hlld"
|
||||
reconstruction = "crmp7"
|
||||
limiter = "mc"
|
||||
prolongation_limiter = "mc"
|
||||
fix_positivity = "off"
|
||||
|
||||
# mesh parameters
|
||||
@ -53,13 +54,12 @@ zubndry = "periodic"
|
||||
|
||||
# runtime control parameters
|
||||
#
|
||||
tmax = 1.0d+01
|
||||
tmax = 1.0d+00
|
||||
cfl = 3.0d-01
|
||||
|
||||
# data output control
|
||||
#
|
||||
precise_snapshots = "on"
|
||||
snapshot_type = "p"
|
||||
snapshot_interval = 1.0d-01
|
||||
restart_number = -1
|
||||
integrals_interval = 10
|
||||
compression_format = "lz4"
|
||||
compression_level = 30
|
||||
integrals_interval = 1
|
||||
|
1458
python/amunpy.py
1458
python/amunpy.py
File diff suppressed because it is too large
Load Diff
@ -1,18 +1,18 @@
|
||||
from setuptools import setup
|
||||
|
||||
setup(
|
||||
name='amunpy',
|
||||
description='Python Interface fo AMUN snapshots',
|
||||
version='0.4',
|
||||
author='Grzegorz Kowal',
|
||||
author_email='grzegorz@amuncode.org',
|
||||
url='https://www.amuncode.org/',
|
||||
license='GPLv3',
|
||||
py_modules=['amunpy'],
|
||||
install_requires=['h5py', 'numpy'],
|
||||
extras_require={
|
||||
"digest": ['xxhash'],
|
||||
"interpolation": ['scipy'],
|
||||
"compression": ['lz4', 'zstandard'],
|
||||
}
|
||||
name='amunpy',
|
||||
description='Python Interface fo AMUN snapshots',
|
||||
version='0.5',
|
||||
author='Grzegorz Kowal',
|
||||
author_email='grzegorz@amuncode.org',
|
||||
url='https://www.amuncode.org/',
|
||||
license='GPLv3',
|
||||
py_modules=['amunpy'],
|
||||
install_requires=['h5py', 'numpy'],
|
||||
extras_require={
|
||||
"digest": ['xxhash'],
|
||||
"interpolation": ['scipy'],
|
||||
"compression": ['lz4', 'zstandard'],
|
||||
}
|
||||
)
|
||||
|
@ -347,7 +347,7 @@ module io
|
||||
|
||||
! check the last available restart snapshot
|
||||
!
|
||||
if (nrest < 0) then
|
||||
if (nrest == 0) then
|
||||
|
||||
test = .true.
|
||||
nrest = 0
|
||||
|
Loading…
x
Reference in New Issue
Block a user