Merge branch 'master' into darwin/gear_preSN_feedback

1cc9b265 · Darwin · e9c2b391 · 413bdbfa · 1cc9b265 · 1cc9b265
Commit 1cc9b265 authored 4 months ago by Darwin
--- a/examples/Planetary/SodShock_3D/README.md
+++ b/examples/Planetary/SodShock_3D/README.md
--- a/examples/Planetary/SodShock_3D/makeIC.py
+++ b/examples/Planetary/SodShock_3D/makeIC.py
--- a/examples/Planetary/SodShock_3D/plotSolution.py
+++ b/examples/Planetary/SodShock_3D/plotSolution.py
--- a/examples/Planetary/SodShock_3D/run.sh
+++ b/examples/Planetary/SodShock_3D/run.sh
@@ -15,4 +15,4 @@ fi
 # Run SWIFT
 ../../../swift --hydro --threads=4 sodShock.yml 2>&1 | tee output.log
-python3 ../../HydroTests/SodShock_3D/plotSolution.py 1
+python3 ./plotSolution.py 1
--- a/examples/Planetary/SodShock_3D/sodShock.yml
+++ b/examples/Planetary/SodShock_3D/sodShock.yml
--- a/examples/Planetary/SquareTest_2D/README.md
+++ b/examples/Planetary/SquareTest_2D/README.md
--- a/examples/Planetary/SquareTest_2D/makeIC.py
+++ b/examples/Planetary/SquareTest_2D/makeIC.py
--- a/examples/Planetary/SquareTest_2D/makeICDifferentMasses.py
+++ b/examples/Planetary/SquareTest_2D/makeICDifferentMasses.py
--- a/examples/Planetary/SquareTest_2D/run.sh
+++ b/examples/Planetary/SquareTest_2D/run.sh
--- a/examples/Planetary/SquareTest_3D/README.md
+++ b/examples/Planetary/SquareTest_3D/README.md
--- a/examples/Planetary/SquareTest_3D/makeICEqualMass.py
+++ b/examples/Planetary/SquareTest_3D/makeICEqualMass.py
--- a/examples/Planetary/SquareTest_3D/makeICEqualSpacing.py
+++ b/examples/Planetary/SquareTest_3D/makeICEqualSpacing.py
--- a/examples/Planetary/SquareTest_3D/plotSolution.py
+++ b/examples/Planetary/SquareTest_3D/plotSolution.py
--- a/examples/Planetary/SquareTest_3D/run.sh
+++ b/examples/Planetary/SquareTest_3D/run.sh
--- a/examples/Planetary/SquareTest_3D/square_equal_mass.yml
+++ b/examples/Planetary/SquareTest_3D/square_equal_mass.yml
--- a/examples/Planetary/SquareTest_3D/square_equal_spacing.yml
+++ b/examples/Planetary/SquareTest_3D/square_equal_spacing.yml
--- a/examples/SantaBarbara/SantaBarbara-256/velociraptor_cfg.cfg
+++ b/examples/SantaBarbara/SantaBarbara-256/velociraptor_cfg.cfg
--- a/examples/SinkParticles/HomogeneousBoxSinkParticles/makeIC.py
+++ b/examples/SinkParticles/HomogeneousBoxSinkParticles/makeIC.py
@@ -214,7 +214,7 @@ else:
    np.zeros([N_sink, 3])
 mass_sink = np.ones(N_sink) * m_sink
-h_sink =  np.ones(N_sink) * 3 * L / (N + N_sink) ** (1 / 3.0)
+h_sink = np.ones(N_sink) * 3 * L / (N + N_sink) ** (1 / 3.0)
 ids_sink = np.arange(N, N + N_sink)
 #####################