Move executable out of examples

examples/EAGLE_ICs/EAGLE_100/run.sh

@@ -35,7 +35,7 @@ fi
 # Threading options - run with threads and pinning (latter not required but improves performance)
 # The corresponding parameter file for this run
 
-../../swift \
+../../../swift \
     --cosmology --eagle \
     --threads=16 --pin \
     eagle_100.yml

examples/EAGLE_ICs/EAGLE_12/run.sh

@@ -35,7 +35,7 @@ fi
 # Threading options - run with threads and pinning (latter not required but improves performance)
 # The corresponding parameter file for this run
 
-../../swift \
+../../../swift \
     --cosmology --eagle \
     --threads=16 --pin \
     eagle_12.yml

examples/EAGLE_ICs/EAGLE_25/run.sh

@@ -35,7 +35,7 @@ fi
 # Threading options - run with threads and pinning (latter not required but improves performance)
 # The corresponding parameter file for this run
 
-../../swift \
+../../../swift \
     --cosmology --eagle \
     --threads=16 --pin \
     eagle_25.yml

examples/EAGLE_ICs/EAGLE_25_low_res/run.sh

@@ -35,7 +35,7 @@ fi
 # Threading options - run with threads and pinning (latter not required but improves performance)
 # The corresponding parameter file for this run
 
-../../swift \
+../../../swift \
     --cosmology --eagle \
     --threads=16 --pin \
     eagle_25.yml

examples/EAGLE_ICs/EAGLE_50/run.sh

@@ -35,7 +35,7 @@ fi
 # Threading options - run with threads and pinning (latter not required but improves performance)
 # The corresponding parameter file for this run
 
-../../swift \
+../../../swift \
     --cosmology --eagle \
     --threads=16 --pin \
     eagle_50.yml

examples/EAGLE_ICs/EAGLE_50_low_res/run.sh

@@ -35,7 +35,7 @@ fi
 # Threading options - run with threads and pinning (latter not required but improves performance)
 # The corresponding parameter file for this run
 
-../../swift \
+../../../swift \
     --cosmology --eagle \
     --threads=16 --pin \
     eagle_50.yml

examples/EAGLE_ICs/EAGLE_6/run.sh

@@ -35,7 +35,7 @@ fi
 # Threading options - run with threads and pinning (latter not required but improves performance)
 # The corresponding parameter file for this run
 
-../../swift \
+../../../swift \
     --cosmology --eagle \
     --threads=16 --pin \
     eagle_6.yml

examples/EAGLE_low_z/EAGLE_100/run.sh

@@ -7,5 +7,5 @@ then
     ./getIC.sh
 fi
 
-../../swift --cosmology --hydro --self-gravity --stars --threads=16 eagle_100.yml 2>&1 | tee output.log
+../../../swift --cosmology --hydro --self-gravity --stars --threads=16 eagle_100.yml 2>&1 | tee output.log
 

examples/EAGLE_low_z/EAGLE_12/run.sh

@@ -7,5 +7,5 @@ then
     ./getIC.sh
 fi
 
-../../swift --cosmology --hydro --self-gravity --stars --threads=16 eagle_12.yml 2>&1 | tee output.log
+../../../swift --cosmology --hydro --self-gravity --stars --threads=16 eagle_12.yml 2>&1 | tee output.log
 

examples/EAGLE_low_z/EAGLE_25/run.sh

@@ -7,5 +7,5 @@ then
     ./getIC.sh
 fi
 
-../../swift --cosmology --hydro --self-gravity --stars --threads=16 eagle_25.yml 2>&1 | tee output.log
+../../../swift --cosmology --hydro --self-gravity --stars --threads=16 eagle_25.yml 2>&1 | tee output.log
 

examples/EAGLE_low_z/EAGLE_50/run.sh

@@ -7,5 +7,5 @@ then
     ./getIC.sh
 fi
 
-../../swift --cosmology --hydro --self-gravity --stars --threads=16 eagle_50.yml 2>&1 | tee output.log
+../../../swift --cosmology --hydro --self-gravity --stars --threads=16 eagle_50.yml 2>&1 | tee output.log
 

examples/EAGLE_low_z/EAGLE_6/run.sh

@@ -7,7 +7,5 @@ then
     ./getIC.sh
 fi
 
-../../swift --hydro --threads=4 -n 16 -y 1 eagle_6.yml \
-	-PInitialConditions:metadata_group_name:NoRuntimePars \
-	| tee output.log
+../../../swift -v 1 --interleave --hydro --threads=4 -n 16 -y 1 eagle_6.yml | tee output.log
 

examples/EAGLE_low_z/EAGLE_6/testVELOCIraptor.sh

@@ -36,8 +36,8 @@ if [ "$RUN_DM" = "1" ]; then
     rm $VEL_OUTPUT/vel_$TEST*
 
     # Run test using SWIFT + VELOCIraptor
-    echo "Running: mpirun -np $NUM_MPI_PROC ../swift_mpi --self-gravity --threads=8 eagle_6.yml --velociraptor --steps=5 -P StructureFinding:basename:./$OUTPUT/stf -P StructureFinding:config_file_name:./stf_input_$TEST.cfg -P Snapshots:basename:./eagle_dmonly"
-    mpirun -np $NUM_MPI_PROC ../swift_mpi --self-gravity --threads=8 eagle_6.yml --velociraptor --steps=5 -P StructureFinding:basename:./$OUTPUT/stf -P StructureFinding:config_file_name:./stf_input_$TEST.cfg -P Snapshots:basename:./eagle_dmonly
+    echo "Running: mpirun -np $NUM_MPI_PROC ../../../swift_mpi --self-gravity --threads=8 eagle_6.yml --velociraptor --steps=5 -P StructureFinding:basename:./$OUTPUT/stf -P StructureFinding:config_file_name:./stf_input_$TEST.cfg -P Snapshots:basename:./eagle_dmonly"
+    mpirun -np $NUM_MPI_PROC ../../../swift_mpi --self-gravity --threads=8 eagle_6.yml --velociraptor --steps=5 -P StructureFinding:basename:./$OUTPUT/stf -P StructureFinding:config_file_name:./stf_input_$TEST.cfg -P Snapshots:basename:./eagle_dmonly
 
     # Run test using VELOCIraptor
     echo "Running: mpirun -np $NUM_MPI_PROC $VELOCIRAPTOR_PATH/bin/stf-gas -I 2 -i eagle_dmonly_0000 -C $VELOCIRAPTOR_PATH/stf_input_$TEST.cfg -o ./$VEL_OUTPUT/vel_$TEST"
@@ -80,8 +80,8 @@ if [ "$RUN_GAS" = "1" ]; then
     rm $VEL_OUTPUT/vel_$TEST*
 
     # Run test using SWIFT + VELOCIraptor
-    echo "Running: mpirun -np $NUM_MPI_PROC ../swift_mpi --hydro --self-gravity --threads=8 eagle_6.yml --velociraptor --steps=5 -P StructureFinding:basename:./$OUTPUT/stf -P StructureFinding:config_file_name:./stf_input_$TEST.cfg -P Snapshots:basename:./eagle_gas"
-    mpirun -np $NUM_MPI_PROC ../swift_mpi --hydro --self-gravity --threads=8 eagle_6.yml --velociraptor --steps=5 -P StructureFinding:basename:./$OUTPUT/stf -P StructureFinding:config_file_name:./stf_input_$TEST.cfg -P Snapshots:basename:./eagle_gas
+    echo "Running: mpirun -np $NUM_MPI_PROC ../../../swift_mpi --hydro --self-gravity --threads=8 eagle_6.yml --velociraptor --steps=5 -P StructureFinding:basename:./$OUTPUT/stf -P StructureFinding:config_file_name:./stf_input_$TEST.cfg -P Snapshots:basename:./eagle_gas"
+    mpirun -np $NUM_MPI_PROC ../../../swift_mpi --hydro --self-gravity --threads=8 eagle_6.yml --velociraptor --steps=5 -P StructureFinding:basename:./$OUTPUT/stf -P StructureFinding:config_file_name:./stf_input_$TEST.cfg -P Snapshots:basename:./eagle_gas
 
     # Run test using VELOCIraptor
     echo "Running: mpirun -np $NUM_MPI_PROC $VELOCIRAPTOR_PATH/bin/stf-gas -I 2 -i eagle_gas_0000 -C ./stf_input_$TEST.cfg -o ./$VEL_OUTPUT/vel_$TEST"

examples/GEAR/AgoraCosmo/run.sh

@@ -26,4 +26,4 @@ echo "Converting the initial conditions into a SWIFT compatible format"
 python3 convert_ic.py
 
 echo "Running SWIFT"
-../../swift --cooling --feedback --cosmology  --limiter --sync --self-gravity --hydro --stars --star-formation --threads=24 agora_cosmo.yml 2>&1 | tee output.log
+../../../swift --cooling --feedback --cosmology  --limiter --sync --self-gravity --hydro --stars --star-formation --threads=24 agora_cosmo.yml 2>&1 | tee output.log

examples/GEAR/AgoraDisk/run.sh

@@ -36,7 +36,7 @@ cp $sim.hdf5 agora_disk.hdf5
 python3 changeType.py agora_disk.hdf5
 
 # Run SWIFT
-../../swift --sync --limiter --cooling --hydro --self-gravity --star-formation --feedback --stars --threads=8 agora_disk.yml 2>&1 | tee output.log
+../../../swift --sync --limiter --cooling --hydro --self-gravity --star-formation --feedback --stars --threads=8 agora_disk.yml 2>&1 | tee output.log
 
 
 echo "Changing smoothing length to be Gadget compatible"

examples/GEAR/ZoomIn/run.sh

@@ -3,4 +3,4 @@
 echo "Fetching initial conditions for the zoom in example..."
 ./getIC.sh
 
-../../swift --cooling --feedback --cosmology  --limiter --sync --self-gravity --hydro --stars --star-formation --threads=8 zoom_in.yml 2>&1 | tee output.log
+../../../swift --cooling --feedback --cosmology  --limiter --sync --self-gravity --hydro --stars --star-formation --threads=8 zoom_in.yml 2>&1 | tee output.log

examples/GravityTests/DiscPatch/GravityOnly/run.sh

@@ -8,7 +8,7 @@ then
 fi
 
 # Run SWIFT
-../../../swift --external-gravity --threads=2 disc-patch.yml
+../../../../swift --external-gravity --threads=2 disc-patch.yml
 
 # Verify energy conservation
 python3 test.py

examples/GravityTests/DiscPatch/HydroStatic/run.sh

@@ -13,6 +13,6 @@ then
 fi
 
 # Run SWIFT
-../../../swift --external-gravity --hydro --threads=4 disc-patch-icc.yml 2>&1 | tee output.log
+../../../../swift --external-gravity --hydro --threads=4 disc-patch-icc.yml 2>&1 | tee output.log
 
 python3 plotSolution.py

examples/GravityTests/DiscPatch/HydroStatic_1D/run.sh

@@ -8,6 +8,6 @@ then
 fi
 
 # Run SWIFT
-../../../swift --external-gravity --hydro --threads=4 disc-patch-icc.yml 2>&1 | tee output.log
+../../../../swift --external-gravity --hydro --threads=4 disc-patch-icc.yml 2>&1 | tee output.log
 
 python3 plotSolution.py

examples/GravityTests/ExternalPointMass/run.sh

@@ -8,6 +8,6 @@ then
 fi
 
 rm -rf pointMass_*.hdf5
-../../swift --external-gravity --threads=1 externalPointMass.yml 2>&1 | tee output.log
+../../../swift --external-gravity --threads=1 externalPointMass.yml 2>&1 | tee output.log
 
 python3 energy_plot.py