From a952a9873d64e68bfd4a2049eb00d9e48fcf15d4 Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durhama.ac.uk>
Date: Fri, 17 Apr 2015 16:03:26 +0100
Subject: [PATCH] Also corrected the FCC version of the Sedov blast grid and
changed the maximal value of the smoothing length in the run script.
Former-commit-id: ddc3c793b6961d23b243cc6155d66f6d2606b765
---
examples/SedovBlast/makeIC_fcc.py | 26 ++++++++++----------------
examples/runs.sh | 4 ++--
2 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/examples/SedovBlast/makeIC_fcc.py b/examples/SedovBlast/makeIC_fcc.py
index aba88802a5..7e68450409 100644
--- a/examples/SedovBlast/makeIC_fcc.py
+++ b/examples/SedovBlast/makeIC_fcc.py
@@ -50,10 +50,10 @@ hbox = boxSize / L
#Generate particles
coords = zeros((numPart, 3))
v = zeros((numPart, 3))
-m = zeros((numPart, 1))
-h = zeros((numPart, 1))
-u = zeros((numPart, 1))
-ids = zeros((numPart, 1), dtype='L')
+m = zeros(numPart)
+h = zeros(numPart)
+u = zeros(numPart)
+ids = zeros(numPart, dtype='L')
for i in range(L):
for j in range(L):
@@ -103,17 +103,11 @@ grp.attrs["PeriodicBoundariesOn"] = periodic
#Particle group
grp = file.create_group("/PartType0")
-ds = grp.create_dataset('Coordinates', (numPart, 3), 'd')
-ds[()] = coords
-ds = grp.create_dataset('Velocities', (numPart, 3), 'f')
-ds[()] = v
-ds = grp.create_dataset('Masses', (numPart,1), 'f')
-ds[()] = m
-ds = grp.create_dataset('SmoothingLength', (numPart,1), 'f')
-ds[()] = h
-ds = grp.create_dataset('InternalEnergy', (numPart,1), 'f')
-ds[()] = u
-ds = grp.create_dataset('ParticleIDs', (numPart, 1), 'L')
-ds[()] = ids
+grp.create_dataset('Coordinates', data=coords, dtype='d')
+grp.create_dataset('Velocities', data=v, dtype='f')
+grp.create_dataset('Masses', data=m, dtype='f')
+grp.create_dataset('SmoothingLength', data=h, dtype='f')
+grp.create_dataset('InternalEnergy', data=u, dtype='f')
+grp.create_dataset('ParticleIDs', data=ids, dtype='L')
file.close()
diff --git a/examples/runs.sh b/examples/runs.sh
index 04adb84311..ff8e3339d6 100755
--- a/examples/runs.sh
+++ b/examples/runs.sh
@@ -44,11 +44,11 @@ do
# Sedov blast
if [ ! -e SedovBlast_mindt_${cpu}.dump ]
then
- ./test_mindt -c 0.2 -t $cpu -f SedovBlast/sedov.hdf5 -m 0.1 -w 5000 -d 1e-10 > SedovBlast_${cpu}.dump
+ ./test_mindt -c 0.2 -t $cpu -f SedovBlast/sedov.hdf5 -m 0.02 -w 5000 -d 1e-10 > SedovBlast_${cpu}.dump
fi
if [ ! -e SedovBlast_fixed_${cpu}.dump ]
then
- ./test_fixdt -r 4096 -t $cpu -f SedovBlast/sedov.hdf5 -m 0.1 -w 5000 -d 5e-5 > SedovBlast_fixed_${cpu}.dump
+ ./test_fixdt -r 4096 -t $cpu -f SedovBlast/sedov.hdf5 -m 0.02 -w 5000 -d 5e-5 > SedovBlast_fixed_${cpu}.dump
fi
# Cosmological volume
--
GitLab