Re-added optional setting of G. Removed unused VELOCIraptor units in yaml file.

examples/EAGLE_25/eagle_25.yml

@@ -9,18 +9,12 @@ InternalUnitSystem:
 # Structure finding options
 StructureFinding:
   config_file_name:     stf_input.cfg    # Name of the STF config file.
-  basename:             ./halo_vel_pot/stf       # Common part of the name of output files.
-  output_time_format:   0                # Specifies format of delta_time. 0 for simulation steps and 1 for simulation time intervals.
-  time_first:           0.               # Time of the first structure finding output (in internal units).
-  delta_time:           250                # Time difference between consecutive structure finding outputs (in internal units). Can either be given in simulation steps or simulation time intervals.
-
-# Define the system of units to use int VELOCIraptor. 
-VelociraptorUnitSystem:
-  UnitMass_in_cgs:     1.989e33      # M_sun in grams
-  UnitLength_in_cgs:   3.085678e21   # kpc in centimeters
-  UnitVelocity_in_cgs: 1e5           # km/s in centimeters per second
-  UnitCurrent_in_cgs:  1             # Amperes
-  UnitTemp_in_cgs:     1             # Kelvin
+  basename:             ./stf         # Common part of the name of output files.
+  output_time_format:   0             # Specifies the frequency format of structure finding. 0 for simulation steps (delta_step) and 1 for simulation time intervals (delta_time).
+  scale_factor_first:   0.92          # Scale-factor of the first snaphot (cosmological run)
+  time_first:           0.01        # Time of the first structure finding output (in internal units).
+  delta_step:           1000          # Time difference between consecutive structure finding outputs (in internal units) in simulation steps.
+  delta_time:           1e-4          # Time difference between consecutive structure finding outputs (in internal units) in simulation time intervals.
 
 # Cosmological parameters
 Cosmology:

examples/EAGLE_6/eagle_6.yml

@@ -12,7 +12,7 @@ StructureFinding:
   basename:             ./stf         # Common part of the name of output files.
   output_time_format:   0             # Specifies the frequency format of structure finding. 0 for simulation steps (delta_step) and 1 for simulation time intervals (delta_time).
   scale_factor_first:   0.92          # Scale-factor of the first snaphot (cosmological run)
-  time_first:           1000.0        # Time of the first structure finding output (in internal units).
+  time_first:           0.01        # Time of the first structure finding output (in internal units).
   delta_step:           1000          # Time difference between consecutive structure finding outputs (in internal units) in simulation steps.
   delta_time:           1e-4          # Time difference between consecutive structure finding outputs (in internal units) in simulation time intervals.
 

examples/SmallCosmoVolume/small_cosmo_volume.yml

@@ -12,7 +12,7 @@ StructureFinding:
   basename:             ./stf                           # Common part of the name of output files.
   output_time_format:   0                               # Specifies the frequency format of structure finding. 0 for simulation steps (delta_step) and 1 for simulation time intervals (delta_time).
   scale_factor_first:   0.92                            # Scale-factor of the first snaphot (cosmological run)
-  time_first:           0.                              # Time of the first structure finding output (in internal units).
+  time_first:           0.01                            # Time of the first structure finding output (in internal units).
   delta_step:           1000                            # Time difference between consecutive structure finding outputs (in internal units) in simulation steps.
   delta_time:           1e-4                            # Time difference between consecutive structure finding outputs (in internal units) in simulation time intervals.
 

src/physical_constants.c

@@ -48,8 +48,8 @@ void phys_const_init(const struct unit_system *us, struct swift_params *params,
       const_newton_G_cgs / units_general_cgs_conversion_factor(us, dimension_G);
 
   /* Overwrite G if present in the file */
-  //internal_const->const_newton_G = parser_get_opt_param_double(
-  //    params, "PhysicalConstants:G", internal_const->const_newton_G);
+  internal_const->const_newton_G = parser_get_opt_param_double(
+      params, "PhysicalConstants:G", internal_const->const_newton_G);
 
   const float dimension_c[5] = {0, 1, -1, 0, 0}; /* [cm s^-1] */
   internal_const->const_speed_light_c =