From e5738a316f140943592a692a6bf38c54a735a30a Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Fri, 3 Aug 2018 13:30:03 +0100
Subject: [PATCH] Use the same definition of G, Mpc and M_sun in all the
examples.
---
examples/AgoraDisk/agora_disk.yml | 4 ++--
examples/AgoraDisk/plot_solution.py | 4 ++--
examples/DiscPatch/GravityOnly/disc-patch.yml | 6 ++---
examples/DiscPatch/GravityOnly/makeIC.py | 9 ++++---
.../DiscPatch/HydroStatic/disc-patch-icc.yml | 6 ++---
examples/DiscPatch/HydroStatic/disc-patch.yml | 6 ++---
examples/DiscPatch/HydroStatic/makeIC.py | 4 ++--
.../HydroStatic_1D/disc-patch-icc.yml | 4 ++--
examples/DiscPatch/HydroStatic_1D/makeIC.py | 4 ++--
examples/EAGLE_100/eagle_100.yml | 4 ++--
examples/EAGLE_12/eagle_12.yml | 4 ++--
examples/EAGLE_25/eagle_25.yml | 4 ++--
examples/EAGLE_50/eagle_50.yml | 4 ++--
examples/EAGLE_6/eagle_6.yml | 4 ++--
examples/EAGLE_DMO_100/eagle_100.yml | 4 ++--
examples/EAGLE_DMO_12/eagle_12.yml | 4 ++--
examples/EAGLE_DMO_25/eagle_25.yml | 4 ++--
examples/EAGLE_DMO_50/eagle_50.yml | 4 ++--
.../ExternalPointMass/externalPointMass.yml | 2 +-
examples/ExternalPointMass/makeIC.py | 2 +-
examples/HydrostaticHalo/hydrostatic.yml | 2 +-
examples/IsothermalPotential/isothermal.yml | 2 +-
examples/IsothermalPotential/makeIC.py | 5 ++--
examples/KeplerianRing/make_movie.py | 2 +-
.../SmallCosmoVolume/small_cosmo_volume.yml | 4 ++--
.../ZeldovichPancake_3D/zeldovichPancake.yml | 24 +++++++++----------
src/gravity/Default/gravity.h | 2 +-
src/physical_constants_cgs.h | 2 +-
28 files changed, 64 insertions(+), 66 deletions(-)
diff --git a/examples/AgoraDisk/agora_disk.yml b/examples/AgoraDisk/agora_disk.yml
index 598f1db285..7368700d8a 100644
--- a/examples/AgoraDisk/agora_disk.yml
+++ b/examples/AgoraDisk/agora_disk.yml
@@ -1,7 +1,7 @@
# Define the system of units to use internally.
InternalUnitSystem:
- UnitMass_in_cgs: 1.989e43 # 10^10 M_sun in grams
- UnitLength_in_cgs: 3.085e21 # kpc in centimeters
+ UnitMass_in_cgs: 1.98848e43 # 10^10 M_sun in grams
+ UnitLength_in_cgs: 3.08567758e21 # kpc in centimeters
UnitVelocity_in_cgs: 1e5 # km/s in centimeters per second
UnitCurrent_in_cgs: 1 # Amperes
UnitTemp_in_cgs: 1 # Kelvin
diff --git a/examples/AgoraDisk/plot_solution.py b/examples/AgoraDisk/plot_solution.py
index 2c3de1728e..fd5ed8a5e9 100644
--- a/examples/AgoraDisk/plot_solution.py
+++ b/examples/AgoraDisk/plot_solution.py
@@ -82,8 +82,8 @@ mean_dispersion_time_range = [50, 500] # in Myr = Used if add_mea
mean_dispersion_density_range = [1e-25, 1e-22]# in g/cm3 = Used if add_mean_fractional_dispersion = 1, for draw_density_DF
disk_normal_vector = [0., 0., 1.]
-gadget_default_unit_base = {'UnitLength_in_cm' : 3.08568e+21,
- 'UnitMass_in_g' : 1.989e+43,
+gadget_default_unit_base = {'UnitLength_in_cm' : 3.08567758e+21,
+ 'UnitMass_in_g' : 1.98848e+43,
'UnitVelocity_in_cm_per_s' : 100000}
color_names = ['red', 'magenta', 'orange', 'gold', 'green', 'cyan', 'blue', 'blueviolet', 'black']
linestyle_names = ['-']
diff --git a/examples/DiscPatch/GravityOnly/disc-patch.yml b/examples/DiscPatch/GravityOnly/disc-patch.yml
index c76e4f6122..4ec061add9 100644
--- a/examples/DiscPatch/GravityOnly/disc-patch.yml
+++ b/examples/DiscPatch/GravityOnly/disc-patch.yml
@@ -1,8 +1,8 @@
# Define the system of units to use internally.
InternalUnitSystem:
- UnitMass_in_cgs: 1.9885e33 # Grams
- UnitLength_in_cgs: 3.0856776e18 # Centimeters
- UnitVelocity_in_cgs: 1e5 # Centimeters per second
+ UnitMass_in_cgs: 1.98848e33 # M_sun in grams
+ UnitLength_in_cgs: 3.08567758e18 # parsec in centimeters
+ UnitVelocity_in_cgs: 1e5 # km/s in cm/s
UnitCurrent_in_cgs: 1 # Amperes
UnitTemp_in_cgs: 1 # Kelvin
diff --git a/examples/DiscPatch/GravityOnly/makeIC.py b/examples/DiscPatch/GravityOnly/makeIC.py
index 6e4e148392..5f9650f442 100644
--- a/examples/DiscPatch/GravityOnly/makeIC.py
+++ b/examples/DiscPatch/GravityOnly/makeIC.py
@@ -38,11 +38,10 @@ import random
# usage: python makeIC.py 1000
# physical constants in cgs
-NEWTON_GRAVITY_CGS = 6.672e-8
-SOLAR_MASS_IN_CGS = 1.9885e33
-PARSEC_IN_CGS = 3.0856776e18
-PROTON_MASS_IN_CGS = 1.6726231e24
-YEAR_IN_CGS = 3.154e+7
+NEWTON_GRAVITY_CGS = 6.67408e-8
+SOLAR_MASS_IN_CGS = 1.98848e33
+PARSEC_IN_CGS = 3.08567758e18
+YEAR_IN_CGS = 3.15569252e7
# choice of units
const_unit_length_in_cgs = (PARSEC_IN_CGS)
diff --git a/examples/DiscPatch/HydroStatic/disc-patch-icc.yml b/examples/DiscPatch/HydroStatic/disc-patch-icc.yml
index 2859599c03..983a7dcc10 100644
--- a/examples/DiscPatch/HydroStatic/disc-patch-icc.yml
+++ b/examples/DiscPatch/HydroStatic/disc-patch-icc.yml
@@ -1,8 +1,8 @@
# Define the system of units to use internally.
InternalUnitSystem:
- UnitMass_in_cgs: 1.9885e33 # Grams
- UnitLength_in_cgs: 3.08567758149e18 # Centimeters
- UnitVelocity_in_cgs: 1e5 # Centimeters per second
+ UnitMass_in_cgs: 1.98848e33 # Grams
+ UnitLength_in_cgs: 3.08567758e18 # Centimeters
+ UnitVelocity_in_cgs: 1e5 # Centimeters per second
UnitCurrent_in_cgs: 1 # Amperes
UnitTemp_in_cgs: 1 # Kelvin
diff --git a/examples/DiscPatch/HydroStatic/disc-patch.yml b/examples/DiscPatch/HydroStatic/disc-patch.yml
index 8816bc17ca..422e1cf910 100644
--- a/examples/DiscPatch/HydroStatic/disc-patch.yml
+++ b/examples/DiscPatch/HydroStatic/disc-patch.yml
@@ -1,8 +1,8 @@
# Define the system of units to use internally.
InternalUnitSystem:
- UnitMass_in_cgs: 1.9885e33 # Grams
- UnitLength_in_cgs: 3.08567758149e18 # Centimeters
- UnitVelocity_in_cgs: 1e5 # Centimeters per second
+ UnitMass_in_cgs: 1.98848e33 # Grams
+ UnitLength_in_cgs: 3.08567758e18 # Centimeters
+ UnitVelocity_in_cgs: 1e5 # Centimeters per second
UnitCurrent_in_cgs: 1 # Amperes
UnitTemp_in_cgs: 1 # Kelvin
diff --git a/examples/DiscPatch/HydroStatic/makeIC.py b/examples/DiscPatch/HydroStatic/makeIC.py
index 83b07e50d5..8b4c55560c 100644
--- a/examples/DiscPatch/HydroStatic/makeIC.py
+++ b/examples/DiscPatch/HydroStatic/makeIC.py
@@ -54,8 +54,8 @@ fileName = "Disc-Patch.hdf5"
# physical constants in cgs
NEWTON_GRAVITY_CGS = 6.67408e-8
-SOLAR_MASS_IN_CGS = 1.9885e33
-PARSEC_IN_CGS = 3.08567758149e18
+SOLAR_MASS_IN_CGS = 1.98848e33
+PARSEC_IN_CGS = 3.08567758e18
PROTON_MASS_IN_CGS = 1.672621898e-24
BOLTZMANN_IN_CGS = 1.38064852e-16
YEAR_IN_CGS = 3.15569252e7
diff --git a/examples/DiscPatch/HydroStatic_1D/disc-patch-icc.yml b/examples/DiscPatch/HydroStatic_1D/disc-patch-icc.yml
index 6f17cfbb1e..450689034f 100644
--- a/examples/DiscPatch/HydroStatic_1D/disc-patch-icc.yml
+++ b/examples/DiscPatch/HydroStatic_1D/disc-patch-icc.yml
@@ -1,7 +1,7 @@
# Define the system of units to use internally.
InternalUnitSystem:
- UnitMass_in_cgs: 1.9885e33 # Grams
- UnitLength_in_cgs: 3.08567758149e18 # Centimeters
+ UnitMass_in_cgs: 1.98848e33 # Grams
+ UnitLength_in_cgs: 3.08567758e18 # Centimeters
UnitVelocity_in_cgs: 1e5 # Centimeters per second
UnitCurrent_in_cgs: 1 # Amperes
UnitTemp_in_cgs: 1 # Kelvin
diff --git a/examples/DiscPatch/HydroStatic_1D/makeIC.py b/examples/DiscPatch/HydroStatic_1D/makeIC.py
index 1589dfc8c7..983a550a34 100644
--- a/examples/DiscPatch/HydroStatic_1D/makeIC.py
+++ b/examples/DiscPatch/HydroStatic_1D/makeIC.py
@@ -55,8 +55,8 @@ fileName = "Disc-Patch.hdf5"
# physical constants in cgs
NEWTON_GRAVITY_CGS = 6.67408e-8
-SOLAR_MASS_IN_CGS = 1.9885e33
-PARSEC_IN_CGS = 3.08567758149e18
+SOLAR_MASS_IN_CGS = 1.98848e33
+PARSEC_IN_CGS = 3.08567758e18
PROTON_MASS_IN_CGS = 1.672621898e-24
BOLTZMANN_IN_CGS = 1.38064852e-16
YEAR_IN_CGS = 3.15569252e7
diff --git a/examples/EAGLE_100/eagle_100.yml b/examples/EAGLE_100/eagle_100.yml
index 3183f40fb1..667bf763e9 100644
--- a/examples/EAGLE_100/eagle_100.yml
+++ b/examples/EAGLE_100/eagle_100.yml
@@ -1,7 +1,7 @@
# Define the system of units to use internally.
InternalUnitSystem:
- UnitMass_in_cgs: 1.989e43 # 10^10 M_sun in grams
- UnitLength_in_cgs: 3.085678e24 # Mpc in centimeters
+ UnitMass_in_cgs: 1.98848e43 # 10^10 M_sun in grams
+ UnitLength_in_cgs: 3.08567758e24 # Mpc in centimeters
UnitVelocity_in_cgs: 1e5 # km/s in centimeters per second
UnitCurrent_in_cgs: 1 # Amperes
UnitTemp_in_cgs: 1 # Kelvin
diff --git a/examples/EAGLE_12/eagle_12.yml b/examples/EAGLE_12/eagle_12.yml
index 321c62cdf7..256f614dc0 100644
--- a/examples/EAGLE_12/eagle_12.yml
+++ b/examples/EAGLE_12/eagle_12.yml
@@ -1,7 +1,7 @@
# Define the system of units to use internally.
InternalUnitSystem:
- UnitMass_in_cgs: 1.989e43 # 10^10 M_sun in grams
- UnitLength_in_cgs: 3.085678e24 # Mpc in centimeters
+ UnitMass_in_cgs: 1.98848e43 # 10^10 M_sun in grams
+ UnitLength_in_cgs: 3.08567758e24 # Mpc in centimeters
UnitVelocity_in_cgs: 1e5 # km/s in centimeters per second
UnitCurrent_in_cgs: 1 # Amperes
UnitTemp_in_cgs: 1 # Kelvin
diff --git a/examples/EAGLE_25/eagle_25.yml b/examples/EAGLE_25/eagle_25.yml
index 682a5485e8..5117852ed7 100644
--- a/examples/EAGLE_25/eagle_25.yml
+++ b/examples/EAGLE_25/eagle_25.yml
@@ -1,7 +1,7 @@
# Define the system of units to use internally.
InternalUnitSystem:
- UnitMass_in_cgs: 1.989e43 # 10^10 M_sun in grams
- UnitLength_in_cgs: 3.085678e24 # Mpc in centimeters
+ UnitMass_in_cgs: 1.98848e43 # 10^10 M_sun in grams
+ UnitLength_in_cgs: 3.08567758e24 # Mpc in centimeters
UnitVelocity_in_cgs: 1e5 # km/s in centimeters per second
UnitCurrent_in_cgs: 1 # Amperes
UnitTemp_in_cgs: 1 # Kelvin
diff --git a/examples/EAGLE_50/eagle_50.yml b/examples/EAGLE_50/eagle_50.yml
index 4f4b2d248e..964b1bd2bb 100644
--- a/examples/EAGLE_50/eagle_50.yml
+++ b/examples/EAGLE_50/eagle_50.yml
@@ -1,7 +1,7 @@
# Define the system of units to use internally.
InternalUnitSystem:
- UnitMass_in_cgs: 1.989e43 # 10^10 M_sun in grams
- UnitLength_in_cgs: 3.085678e24 # Mpc in centimeters
+ UnitMass_in_cgs: 1.98848e43 # 10^10 M_sun in grams
+ UnitLength_in_cgs: 3.08567758e24 # Mpc in centimeters
UnitVelocity_in_cgs: 1e5 # km/s in centimeters per second
UnitCurrent_in_cgs: 1 # Amperes
UnitTemp_in_cgs: 1 # Kelvin
diff --git a/examples/EAGLE_6/eagle_6.yml b/examples/EAGLE_6/eagle_6.yml
index f9329eda7d..ee3fa8e681 100644
--- a/examples/EAGLE_6/eagle_6.yml
+++ b/examples/EAGLE_6/eagle_6.yml
@@ -1,7 +1,7 @@
# Define the system of units to use internally.
InternalUnitSystem:
- UnitMass_in_cgs: 1.989e43 # 10^10 M_sun in grams
- UnitLength_in_cgs: 3.085678e24 # Mpc in centimeters
+ UnitMass_in_cgs: 1.98848e43 # 10^10 M_sun in grams
+ UnitLength_in_cgs: 3.08567758e24 # Mpc in centimeters
UnitVelocity_in_cgs: 1e5 # km/s in centimeters per second
UnitCurrent_in_cgs: 1 # Amperes
UnitTemp_in_cgs: 1 # Kelvin
diff --git a/examples/EAGLE_DMO_100/eagle_100.yml b/examples/EAGLE_DMO_100/eagle_100.yml
index c1bdbc2c38..f04c32c8d0 100644
--- a/examples/EAGLE_DMO_100/eagle_100.yml
+++ b/examples/EAGLE_DMO_100/eagle_100.yml
@@ -1,7 +1,7 @@
# Define the system of units to use internally.
InternalUnitSystem:
- UnitMass_in_cgs: 1.989e43 # 10^10 M_sun in grams
- UnitLength_in_cgs: 3.085678e24 # Mpc in centimeters
+ UnitMass_in_cgs: 1.98848e43 # 10^10 M_sun in grams
+ UnitLength_in_cgs: 3.08567758e24 # Mpc in centimeters
UnitVelocity_in_cgs: 1e5 # km/s in centimeters per second
UnitCurrent_in_cgs: 1 # Amperes
UnitTemp_in_cgs: 1 # Kelvin
diff --git a/examples/EAGLE_DMO_12/eagle_12.yml b/examples/EAGLE_DMO_12/eagle_12.yml
index ae4cfc64f3..2354216a5b 100644
--- a/examples/EAGLE_DMO_12/eagle_12.yml
+++ b/examples/EAGLE_DMO_12/eagle_12.yml
@@ -1,7 +1,7 @@
# Define the system of units to use internally.
InternalUnitSystem:
- UnitMass_in_cgs: 1.989e43 # 10^10 M_sun in grams
- UnitLength_in_cgs: 3.085678e24 # Mpc in centimeters
+ UnitMass_in_cgs: 1.98848e43 # 10^10 M_sun in grams
+ UnitLength_in_cgs: 3.08567758e24 # Mpc in centimeters
UnitVelocity_in_cgs: 1e5 # km/s in centimeters per second
UnitCurrent_in_cgs: 1 # Amperes
UnitTemp_in_cgs: 1 # Kelvin
diff --git a/examples/EAGLE_DMO_25/eagle_25.yml b/examples/EAGLE_DMO_25/eagle_25.yml
index 9036827a02..b02f9742a5 100644
--- a/examples/EAGLE_DMO_25/eagle_25.yml
+++ b/examples/EAGLE_DMO_25/eagle_25.yml
@@ -1,7 +1,7 @@
# Define the system of units to use internally.
InternalUnitSystem:
- UnitMass_in_cgs: 1.989e43 # 10^10 M_sun in grams
- UnitLength_in_cgs: 3.085678e24 # Mpc in centimeters
+ UnitMass_in_cgs: 1.98848e43 # 10^10 M_sun in grams
+ UnitLength_in_cgs: 3.08567758e24 # Mpc in centimeters
UnitVelocity_in_cgs: 1e5 # km/s in centimeters per second
UnitCurrent_in_cgs: 1 # Amperes
UnitTemp_in_cgs: 1 # Kelvin
diff --git a/examples/EAGLE_DMO_50/eagle_50.yml b/examples/EAGLE_DMO_50/eagle_50.yml
index 27bab175db..97299df063 100644
--- a/examples/EAGLE_DMO_50/eagle_50.yml
+++ b/examples/EAGLE_DMO_50/eagle_50.yml
@@ -1,7 +1,7 @@
# Define the system of units to use internally.
InternalUnitSystem:
- UnitMass_in_cgs: 1.989e43 # 10^10 M_sun in grams
- UnitLength_in_cgs: 3.085678e24 # Mpc in centimeters
+ UnitMass_in_cgs: 1.98848e43 # 10^10 M_sun in grams
+ UnitLength_in_cgs: 3.08567758e24 # Mpc in centimeters
UnitVelocity_in_cgs: 1e5 # km/s in centimeters per second
UnitCurrent_in_cgs: 1 # Amperes
UnitTemp_in_cgs: 1 # Kelvin
diff --git a/examples/ExternalPointMass/externalPointMass.yml b/examples/ExternalPointMass/externalPointMass.yml
index 79dcd64584..de05a9ff3c 100644
--- a/examples/ExternalPointMass/externalPointMass.yml
+++ b/examples/ExternalPointMass/externalPointMass.yml
@@ -1,7 +1,7 @@
# Define the system of units to use internally.
InternalUnitSystem:
UnitMass_in_cgs: 1.98848e33 # M_sun
- UnitLength_in_cgs: 3.0856776e21 # kpc
+ UnitLength_in_cgs: 3.08567758e21 # kpc
UnitVelocity_in_cgs: 1e5 # km/s
UnitCurrent_in_cgs: 1 # Amperes
UnitTemp_in_cgs: 1 # Kelvin
diff --git a/examples/ExternalPointMass/makeIC.py b/examples/ExternalPointMass/makeIC.py
index f8310e1c04..fdc5b1fd67 100644
--- a/examples/ExternalPointMass/makeIC.py
+++ b/examples/ExternalPointMass/makeIC.py
@@ -29,7 +29,7 @@ import random
# physical constants in cgs
NEWTON_GRAVITY_CGS = 6.67408e-8
SOLAR_MASS_IN_CGS = 1.98848e33
-PARSEC_IN_CGS = 3.0856776e18
+PARSEC_IN_CGS = 3.08567758e18
# choice of units
const_unit_length_in_cgs = (1000*PARSEC_IN_CGS)
diff --git a/examples/HydrostaticHalo/hydrostatic.yml b/examples/HydrostaticHalo/hydrostatic.yml
index c37a531497..0cc11d0d87 100644
--- a/examples/HydrostaticHalo/hydrostatic.yml
+++ b/examples/HydrostaticHalo/hydrostatic.yml
@@ -1,7 +1,7 @@
# Define the system of units to use internally.
InternalUnitSystem:
UnitMass_in_cgs: 1.98848e39 # 10^6 solar masses
- UnitLength_in_cgs: 3.0856776e21 # Kiloparsecs
+ UnitLength_in_cgs: 3.08567758e21 # Kiloparsecs
UnitVelocity_in_cgs: 1e5 # Kilometres per second
UnitCurrent_in_cgs: 1 # Amperes
UnitTemp_in_cgs: 1 # Kelvin
diff --git a/examples/IsothermalPotential/isothermal.yml b/examples/IsothermalPotential/isothermal.yml
index 5dd0b831c8..5f626ff72e 100644
--- a/examples/IsothermalPotential/isothermal.yml
+++ b/examples/IsothermalPotential/isothermal.yml
@@ -1,7 +1,7 @@
# Define the system of units to use internally.
InternalUnitSystem:
UnitMass_in_cgs: 1.98848e33 # M_sun
- UnitLength_in_cgs: 3.0856776e21 # kpc
+ UnitLength_in_cgs: 3.08567758e21 # kpc
UnitVelocity_in_cgs: 1e5 # km/s
UnitCurrent_in_cgs: 1 # Amperes
UnitTemp_in_cgs: 1 # Kelvin
diff --git a/examples/IsothermalPotential/makeIC.py b/examples/IsothermalPotential/makeIC.py
index 85437442c6..eab16d21e6 100644
--- a/examples/IsothermalPotential/makeIC.py
+++ b/examples/IsothermalPotential/makeIC.py
@@ -32,9 +32,8 @@ import random
# physical constants in cgs
NEWTON_GRAVITY_CGS = 6.67408e-8
SOLAR_MASS_IN_CGS = 1.98848e33
-PARSEC_IN_CGS = 3.0856776e18
-PROTON_MASS_IN_CGS = 1.672621898e24
-YEAR_IN_CGS = 3.154e+7
+PARSEC_IN_CGS = 3.08567758e18
+YEAR_IN_CGS = 3.15569252e7
# choice of units
const_unit_length_in_cgs = (1000*PARSEC_IN_CGS)
diff --git a/examples/KeplerianRing/make_movie.py b/examples/KeplerianRing/make_movie.py
index 83e7839240..2e72cf1438 100644
--- a/examples/KeplerianRing/make_movie.py
+++ b/examples/KeplerianRing/make_movie.py
@@ -109,7 +109,7 @@ def rotation_velocity_at_r(r, params):
)
central_mass = float(params["PointMassPotential:mass"])
- G = 6.674e-8
+ G = 6.67408e-8
v = np.sqrt( G * central_mass / r)
diff --git a/examples/SmallCosmoVolume/small_cosmo_volume.yml b/examples/SmallCosmoVolume/small_cosmo_volume.yml
index 3d32e0f062..b0057d5366 100644
--- a/examples/SmallCosmoVolume/small_cosmo_volume.yml
+++ b/examples/SmallCosmoVolume/small_cosmo_volume.yml
@@ -1,7 +1,7 @@
# Define the system of units to use internally.
InternalUnitSystem:
- UnitMass_in_cgs: 1.989e43 # 10^10 M_sun in grams
- UnitLength_in_cgs: 3.085678e24 # Mpc in centimeters
+ UnitMass_in_cgs: 1.98848e43 # 10^10 M_sun in grams
+ UnitLength_in_cgs: 3.08567758e24 # Mpc in centimeters
UnitVelocity_in_cgs: 1e5 # km/s in centimeters per second
UnitCurrent_in_cgs: 1 # Amperes
UnitTemp_in_cgs: 1 # Kelvin
diff --git a/examples/ZeldovichPancake_3D/zeldovichPancake.yml b/examples/ZeldovichPancake_3D/zeldovichPancake.yml
index 03445aa666..481432d587 100644
--- a/examples/ZeldovichPancake_3D/zeldovichPancake.yml
+++ b/examples/ZeldovichPancake_3D/zeldovichPancake.yml
@@ -1,11 +1,19 @@
# Define the system of units to use internally.
InternalUnitSystem:
- UnitMass_in_cgs: 1.989e43 # 10^10 M_su in grams
- UnitLength_in_cgs: 3.085678e24 # Mpc in centimeters
+ UnitMass_in_cgs: 1.98848e43 # 10^10 M_sun in grams
+ UnitLength_in_cgs: 3.08567758e24 # Mpc in centimeters
UnitVelocity_in_cgs: 1e5 # km/s in centimeters per second
UnitCurrent_in_cgs: 1 # Amperes
UnitTemp_in_cgs: 1 # Kelvin
+Cosmology:
+ Omega_m: 1.
+ Omega_lambda: 0.
+ Omega_b: 1.
+ h: 1.
+ a_begin: 0.00990099
+ a_end: 1.0
+
# Parameters governing the time integration
TimeIntegration:
dt_min: 1e-7 # The minimal time-step size of the simulation (in internal units).
@@ -20,11 +28,11 @@ Snapshots:
# Parameters governing the conserved quantities statistics
Statistics:
- delta_time: 10. # Time between statistics output
+ delta_time: 1.02 # Time between statistics output
# Parameters for the hydrodynamics scheme
SPH:
- resolution_eta: 1.2348 # Target smoothing length in units of the mean inter-particle separation (1.2348 == 48Ngbs with the cubic spline kernel).
+ resolution_eta: 1.2348 # Target smoothing length in units of the mean inter-particle separation
CFL_condition: 0.1 # Courant-Friedrich-Levy condition for time integration.
# Parameters related to the initial conditions
@@ -36,14 +44,6 @@ Scheduler:
cell_split_size: 50
tasks_per_cell: 125
-Cosmology:
- Omega_m: 1.
- Omega_lambda: 0.
- Omega_b: 1.
- h: 1.
- a_begin: 0.00990099
- a_end: 1.0
-
Gravity:
mesh_side_length: 16
eta: 0.025
diff --git a/src/gravity/Default/gravity.h b/src/gravity/Default/gravity.h
index bfd36b6b78..2713c9ee7a 100644
--- a/src/gravity/Default/gravity.h
+++ b/src/gravity/Default/gravity.h
@@ -170,7 +170,7 @@ __attribute__((always_inline)) INLINE static void gravity_init_gpart(
* @param gp The particle to act upon
* @param const_G Newton's constant in internal units.
* @param potential_normalisation Term to be added to all the particles.
- * @param Are we using periodic BCs?
+ * @param periodic Are we using periodic BCs?
*/
__attribute__((always_inline)) INLINE static void gravity_end_force(
struct gpart* gp, float const_G, const float potential_normalisation,
diff --git a/src/physical_constants_cgs.h b/src/physical_constants_cgs.h
index 3eeb664ab0..40eef2c992 100644
--- a/src/physical_constants_cgs.h
+++ b/src/physical_constants_cgs.h
@@ -93,6 +93,6 @@ const double const_solar_mass_cgs = 1.98848e33;
const double const_earth_mass_cgs = 5.9724e27;
/*! Temperature of the CMB at present day [K] */
-const double const_T_CMB_0_cgs = 2.72556;
+const double const_T_CMB_0_cgs = 2.7255;
#endif /* SWIFT_PHYSICAL_CONSTANTS_CGS_H */
--
GitLab