Skip to content
Snippets Groups Projects
Commit 200ef4f7 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Merge branch 'master' into pack_foreign_gpart

parents 171d5513 3224b1a6
No related branches found
No related tags found
1 merge request!1393Slimming down of foreign gpart + reduced comm size
Hide whitespace changes
Inline Side-by-side
Showing
with 35 additions and 49 deletions
examples/GEAR/AgoraCosmo/getIC.sh
+ 1
− 3
View file @ 200ef4f7
#!/bin/bash #!/bin/bash
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/AgoraCosmo/agora_swift.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/AgoraCosmo/agora_swift.hdf5
examples/GEAR/AgoraDisk/getChemistryTable.sh
+ 1
− 1
View file @ 200ef4f7
#!/bin/bash #!/bin/bash
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/FeedbackTables/POPIIsw.h5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/FeedbackTables/POPIIsw.h5
examples/GEAR/AgoraDisk/getGrackleCoolingTable.sh
+ 1
− 1
View file @ 200ef4f7
#!/bin/bash #!/bin/bash
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/CoolingTables/CloudyData_UVB=HM2012.h5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/CoolingTables/CloudyData_UVB=HM2012.h5
examples/GEAR/AgoraDisk/getIC.sh
+ 1
− 2
View file @ 200ef4f7
...@@ -6,6 +6,5 @@ if [ "$#" -ne 1 ]; then ...@@ -6,6 +6,5 @@ if [ "$#" -ne 1 ]; then
exit exit
fi fi
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/AgoraDisk/snap.$1.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/AgoraDisk/snap.$1.hdf5
mv snap.$1.hdf5 agora_disk.hdf5 mv snap.$1.hdf5 agora_disk.hdf5
examples/GEAR/AgoraDisk/getSolution.sh
+ 2
− 2
View file @ 200ef4f7
#!/bin/bash #!/bin/bash
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/AgoraDisk/Gear/snapshot_0000.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/AgoraDisk/Gear/snapshot_0000.hdf5
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/AgoraDisk/Gear/snapshot_0050.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/AgoraDisk/Gear/snapshot_0050.hdf5
examples/GEAR/ZoomIn/getChemistryTable.sh
+ 1
− 1
View file @ 200ef4f7
#!/bin/bash #!/bin/bash
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/FeedbackTables/POPIIsw.h5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/FeedbackTables/POPIIsw.h5
examples/GEAR/ZoomIn/getGrackleCoolingTable.sh
+ 1
− 1
View file @ 200ef4f7
#!/bin/bash #!/bin/bash
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/CoolingTables/CloudyData_UVB=HM2012.h5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/CoolingTables/CloudyData_UVB=HM2012.h5
examples/GEAR/ZoomIn/getIC.sh
+ 1
− 3
View file @ 200ef4f7
#!/bin/bash #!/bin/bash
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/ZoomIn/h050.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/ZoomIn/h050.hdf5
examples/GravityTests/DiscPatch/HydroStatic/getGlass.sh
+ 1
− 1
View file @ 200ef4f7
#!/bin/bash #!/bin/bash
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/glassCube_32.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/glassCube_32.hdf5
examples/GravityTests/MWPotential2014_df/run.sh
+ 8
− 15
View file @ 200ef4f7
#!/bin/bash #!/bin/bash
#Clears the previous figures #Clears the previous figures
echo "Clearing existing figures." echo "Clearing existing figures."
if [ -f "orbits_simulation_kpc.png" ]; if [ -f "orbits_simulation_kpc.png" ]; then
then
rm orbits_simulation_kpc.png rm orbits_simulation_kpc.png
fi fi
if [ -f "orbits_simulation_Mpc.png" ]; if [ -f "orbits_simulation_Mpc.png" ]; then
then
rm orbits_simulation_Mpc.png rm orbits_simulation_Mpc.png
fi fi
if [ ! -e orbit.csv ] if [ ! -e orbit.csv ]; then
then
echo "Fetching solution..." echo "Fetching solution..."
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ReferenceSolutions/MWPotential_2014/orbit.csv wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ReferenceSolutions/MWPotential_2014/orbit.csv
fi fi
#Clears the IC file #Clears the IC file
if [ -f "circular_orbits_MW.hdf5" ]; if [ -f "circular_orbits_MW.hdf5" ]; then
then
rm circular_orbits_MW.hdf5 rm circular_orbits_MW.hdf5
fi fi
#Generates the initial conditions #Generates the initial conditions
echo "Generate initial conditions for circular orbits" echo "Generate initial conditions for circular orbits"
if command -v python3 &>/dev/null; then if command -v python3 &>/dev/null; then
...@@ -38,17 +31,17 @@ fi ...@@ -38,17 +31,17 @@ fi
#Runs the simulation #Runs the simulation
# self gravity G, external potential g, hydro s, threads t and high verbosity v # self gravity G, external potential g, hydro s, threads t and high verbosity v
echo "Starting the simulation with the first type of units (kpc)... Look at output_1.log for the simulation details." echo "Starting the simulation with the first type of units (kpc)... Look at output_1.log for the simulation details."
../../../swift --external-gravity --threads=8 params_unit_1.yml 2>&1 > output_1.log ../../../swift --external-gravity --threads=8 params_unit_1.yml 2>&1 >output_1.log
echo "Simulation ended." echo "Simulation ended."
echo "Starting the simulation with the second type of units (Mpc)... Look at output_2.log for the simulation details." echo "Starting the simulation with the second type of units (Mpc)... Look at output_2.log for the simulation details."
../../../swift --external-gravity --threads=8 params_unit_2.yml 2>&1 > output_2.log ../../../swift --external-gravity --threads=8 params_unit_2.yml 2>&1 >output_2.log
echo "Simulation ended." echo "Simulation ended."
#Saves the plots #Saves the plots
echo "Save plots of orbits." echo "Save plots of orbits."
if command -v python3 &>/dev/null; then if command -v python3 &>/dev/null; then
python3 makePlots.py python3 makePlots.py
else else
python3 makePlots.py python3 makePlots.py
fi fi
examples/HydroTests/BlobTest_Braspenning2022/getICs.sh
+ 8
− 9
View file @ 200ef4f7
#!/bin/bash #!/bin/bash
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/BlobTest_Braspenning22/blob_16_100.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/BlobTest_Braspenning22/blob_16_100.hdf5
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/BlobTest_Braspenning22/blob_16_10.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/BlobTest_Braspenning22/blob_16_10.hdf5
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/BlobTest_Braspenning22/blob_32_100.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/BlobTest_Braspenning22/blob_32_100.hdf5
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/BlobTest_Braspenning22/blob_32_10.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/BlobTest_Braspenning22/blob_32_10.hdf5
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/BlobTest_Braspenning22/blob_64_100.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/BlobTest_Braspenning22/blob_64_100.hdf5
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/BlobTest_Braspenning22/blob_64_10.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/BlobTest_Braspenning22/blob_64_10.hdf5
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/BlobTest_Braspenning22/blob_128_100.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/BlobTest_Braspenning22/blob_128_100.hdf5
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/BlobTest_Braspenning22/blob_128_10.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/BlobTest_Braspenning22/blob_128_10.hdf5
examples/HydroTests/EvrardCollapse_3D/getReference.sh
+ 1
− 1
View file @ 200ef4f7
#! /bin/bash #! /bin/bash
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ReferenceSolutions/evrardCollapse3D_exact.txt wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ReferenceSolutions/evrardCollapse3D_exact.txt
examples/HydroTests/GreshoVortex_2D/getGlass.sh
+ 1
− 1
View file @ 200ef4f7
#!/bin/bash #!/bin/bash
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/glassPlane_128.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/glassPlane_128.hdf5
examples/HydroTests/GreshoVortex_3D/getGlass.sh
+ 1
− 1
View file @ 200ef4f7
#!/bin/bash #!/bin/bash
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/glassCube_64.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/glassCube_64.hdf5
examples/HydroTests/InteractingBlastWaves_1D/getReference.sh
+ 1
− 1
View file @ 200ef4f7
#!/bin/bash #!/bin/bash
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ReferenceSolutions/interactingBlastWaves1D_exact.txt wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ReferenceSolutions/interactingBlastWaves1D_exact.txt
examples/HydroTests/KelvinHelmholtzGrowthRate_2D/getGlass.sh
+ 1
− 1
View file @ 200ef4f7
#!/bin/bash #!/bin/bash
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/glassPlane_128.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/glassPlane_128.hdf5
examples/HydroTests/KelvinHelmholtzGrowthRate_3D/getGlass.sh
+ 1
− 1
View file @ 200ef4f7
#!/bin/bash #!/bin/bash
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/glassCube_64.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/glassCube_64.hdf5
examples/HydroTests/NFW_Hydrostatic/getICs.sh
+ 1
− 2
View file @ 200ef4f7
#!/bin/bash #!/bin/bash
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/NFW_Hydrostatic/nfw.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/NFW_Hydrostatic/nfw.hdf5
examples/HydroTests/Noh_2D/getGlass.sh
+ 1
− 1
View file @ 200ef4f7
#!/bin/bash #!/bin/bash
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/glassPlane_128.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/glassPlane_128.hdf5
examples/HydroTests/Noh_3D/getGlass.sh
+ 1
− 1
View file @ 200ef4f7
#!/bin/bash #!/bin/bash
wget http://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/glassCube_64.hdf5 wget https://virgodb.cosma.dur.ac.uk/swift-webstorage/ICs/glassCube_64.hdf5
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment