Fixed issue where file parameters were being overridden by defaults

MintonGroup · Dec 6, 2022 · d7651a5 · d7651a5
1 parent f046b6a
commit d7651a5
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 29 deletions.
diff --git a/examples/Fragmentation/Fragmentation_Movie.py b/examples/Fragmentation/Fragmentation_Movie.py
@@ -155,31 +155,31 @@ def data_stream(self, frame=0):
 
 if __name__ == "__main__":
 
-   print("Select a fragmentation movie to generate.")
-   print("1. Head-on disruption")
-   print("2. Off-axis supercatastrophic")
-   print("3. Hit and run")
-   print("4. All of the above")
-   user_selection = int(input("? "))
-
-   if user_selection > 0 and user_selection < 4:
-      movie_styles = [available_movie_styles[user_selection-1]]
-   else:
-      print("Generating all movie styles")
-      movie_styles = available_movie_styles.copy()
-
-   for style in movie_styles:
-       movie_filename = f"{style}.mp4"
-
-       # Pull in the Swiftest output data from the parameter file and store it as a Xarray dataset.
-       sim = swiftest.Simulation(simdir=style, rotation=True, init_cond_format = "XV", compute_conservation_values=True)
-       sim.add_solar_system_body("Sun")
-       sim.add_body(Gmass=body_Gmass[style], radius=body_radius[style], rh=pos_vectors[style], vh=vel_vectors[style]) #, rot=rot_vectors[style])
-
-       # Set fragmentation parameters
-       minimum_fragment_gmass = 0.2 * body_Gmass[style][1] # Make the minimum fragment mass a fraction of the smallest body
-       gmtiny = 0.99 * body_Gmass[style][1] # Make GMTINY just smaller than the smallest original body. This will prevent runaway collisional cascades
-       sim.set_parameter(fragmentation=True, fragmentation_save="TRAJECTORY", gmtiny=gmtiny, minimum_fragment_gmass=minimum_fragment_gmass, verbose=False)
-       sim.run(dt=1e-4, tstop=2.0e-3, istep_out=1, dump_cadence=0)
-
-       anim = AnimatedScatter(sim,movie_filename,movie_titles[style],nskip=1)
+    print("Select a fragmentation movie to generate.")
+    print("1. Head-on disruption")
+    print("2. Off-axis supercatastrophic")
+    print("3. Hit and run")
+    print("4. All of the above")
+    user_selection = int(input("? "))
+
+    if user_selection > 0 and user_selection < 4:
+       movie_styles = [available_movie_styles[user_selection-1]]
+    else:
+       print("Generating all movie styles")
+       movie_styles = available_movie_styles.copy()
+
+    for style in movie_styles:
+        movie_filename = f"{style}.mp4"
+        sim = swiftest.Simulation(simdir=style, read_old_output_file=True)
+        # Pull in the Swiftest output data from the parameter file and store it as a Xarray dataset.
+        # sim = swiftest.Simulation(simdir=style, rotation=True, init_cond_format = "XV", compute_conservation_values=True)
+        # sim.add_solar_system_body("Sun")
+        # sim.add_body(Gmass=body_Gmass[style], radius=body_radius[style], rh=pos_vectors[style], vh=vel_vectors[style]) #, rot=rot_vectors[style])
+        # #
+        # # Set fragmentation parameters
+        # minimum_fragment_gmass = 0.2 * body_Gmass[style][1] # Make the minimum fragment mass a fraction of the smallest body
+        # gmtiny = 0.99 * body_Gmass[style][1] # Make GMTINY just smaller than the smallest original body. This will prevent runaway collisional cascades
+        # sim.set_parameter(fragmentation=True, fragmentation_save="TRAJECTORY", gmtiny=gmtiny, minimum_fragment_gmass=minimum_fragment_gmass, verbose=False)
+        # sim.run(dt=1e-4, tstop=2.0e-3, istep_out=1, dump_cadence=0)
+        #
+        # anim = AnimatedScatter(sim,movie_filename,movie_titles[style],nskip=1)
diff --git a/python/swiftest/swiftest/simulation_class.py b/python/swiftest/swiftest/simulation_class.py
@@ -362,7 +362,8 @@ def __init__(self,read_param: bool = False, read_old_output_file: bool = False,
         # -----------------------------------------------------------------
         # Highest Priority: Values from arguments passed to Simulation()
         # -----------------------------------------------------------------
-        self.set_parameter(verbose=False, **kwargs)
+        if len(kwargs) > 0 and "param_file" not in kwargs or len(kwargs) > 1 and "param_file" in kwargs:
+            self.set_parameter(verbose=False, **kwargs)
 
         # Let the user know that there was a problem reading an old parameter file and we're going to create a new one
         if read_param and not param_file_found: