diff --git a/examples/AgoraDisk/agora_disk.yml b/examples/AgoraDisk/agora_disk.yml index 598f1db2858c3e420c55ae31c9ca10d37c2f48b7..7368700d8a2a5ca8de7d677e1da78be51d669835 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 2c3de1728eb6f22bee72361db1e7f0c77613eb25..fd5ed8a5e9fb1a1475202633595699d682edf281 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 c76e4f612250d180f2ba2fccd0c6209878173433..4ec061add978bec82c267660cc343cf0bfa8f4c6 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 6e4e148392eb7ca2fbf8c29c3f737d029916c59b..5f9650f44277cf858021c9b628d68134c47a19b7 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 2859599c03c44ff6a15522164a8e2a407bdde41e..983a7dcc103135ab4db61d6ea77701532226c101 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 8816bc17ca526d01b7abcf55bb43287bbb36224a..422e1cf910202e8f6dc0a9395fc7e36ce80443ed 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 83b07e50d59869c51fd3854a7f15cfd7d476d04d..8b4c55560c34e7bdb538f2b4732369216f91a087 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 6f17cfbb1e0125faf8e47fe4e9e55bfdf4df7b71..450689034f4ae782cc74bf01dac93e723e5d2ce2 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 1589dfc8c73e5b9bf3c2cad4bcf3029654d9e67e..983a550a3442c6470611792081a5884d38023a6a 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 3183f40fb1a727167dad32b2c01f995fea0ae61b..667bf763e9702eae850ebb611eab2c22c27dc471 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 321c62cdf7dca35381541b2c6230260da4b0dbe2..256f614dc0ac97427ad9997c61012962be531258 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 682a5485e8319b9946aac5234075e1f7ba395a48..5117852ed79ca61db5b08db8ec3af017f94a68d9 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 4f4b2d248ebc0c14a8b88db34de75c6f038e2f58..964b1bd2bbd335afd75aa9258c014d34d95bf4bd 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 f9329eda7d8e911983018abab7fc2bda0449259e..ee3fa8e6818c512d37711233d4370aded7f0f864 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 c1bdbc2c3837ffc974c04b46ddcee9fb7bdc18c9..f04c32c8d08b5548c2c710cf8782b39a59c3821e 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 ae4cfc64f3f4e8b046ea7624cc1e30caca23658d..2354216a5b0dcefe139d6e39699b4c67035a4173 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 9036827a028abd25f8afa25219e4186012dec76e..b02f9742a597687d2742b7c2d9eddf836258b06a 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 27bab175db4ad1e9012c9543dab0e66e41c0efbf..97299df063cd1f611f59a56ccd9b091b1217bef3 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 79dcd6458489958622ed7d6167d7f5f214ebd8b9..de05a9ff3c10afa7871ebeafbf4d8d272056d39f 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 f8310e1c04265b80c6dbf6e2b003e78d95d75281..fdc5b1fd67ffcbd85beae3a9d6d1274d3d48c279 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 c37a5314976c3116eb51040b1feeaa9b23ac1326..0cc11d0d8708b518b8b0b3a8df1374b6a5ead7e2 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 5dd0b831c839b3307a1c118d9bd64bda29da487c..5f626ff72e979ad0f3d404e01002be6b6018c758 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 85437442c6271589e3105c9c99477377b75b8d4b..eab16d21e6a4abd077dc0f4a015a4577427a3591 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 83e783924086377a0b2aa384d2c4634bfd40443f..2e72cf143853631800b93d13abfe8633e1197380 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 3d32e0f062450f52161950a80dbf001c73b3c11d..b0057d536677f502c5c1e84a5af923042018a33b 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 03445aa666c4a13f400b2458f6a2fff471248ace..481432d5875470aa464f69d5aa47fb76328cde7d 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 bfd36b6b78eccd505d6e5b81a13a087cfec249f0..2713c9ee7affca4f06b369d038916f76b8c2ee48 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 3eeb664ab095fddf1d3451ddd3451a28fc85bd9b..40eef2c992e819e01980cbcbd7ea7f05721e93cf 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 */