feat: Add more debug outputs

Author: tgross03

src/radiosim/ppdisks/setup.py

@@ -54,8 +54,13 @@ def compile(
                 )
                 print("Cleaning up make process ...")
 
+            clean_cmd = ["make mrproper"]
+
+            if verbose:
+                print(f"CMD @ {Variables.get('FARGO_ROOT')}  $ " + " ".join(clean_cmd))
+
             subprocess.run(
-                ["make mrproper"],
+                clean_cmd,
                 cwd=Variables.get("FARGO_ROOT"),
                 stdout=subprocess.DEVNULL if not show_fargo_output else None,
                 stderr=subprocess.DEVNULL if not show_fargo_output else None,
@@ -65,14 +70,18 @@ def compile(
             if verbose:
                 print("Starting compilation ...")
 
+            run_cmd = [
+                f"make SETUP={self._name} "
+                f"GPU={1 if gpu else 0} "
+                f"PARALLEL={1 if parallel else 0} "
+                f"UNITS={unit_system.key} "
+                f"RESCALE={1 if rescale else 0}"
+            ]
+            if verbose:
+                print(f"CMD @ {Variables.get('FARGO_ROOT')}  $ " + " ".join(run_cmd))
+
             subprocess.run(
-                [
-                    f"make SETUP={self._name} "
-                    f"GPU={1 if gpu else 0} "
-                    f"PARALLEL={1 if parallel else 0} "
-                    f"UNITS={unit_system.key} "
-                    f"RESCALE={1 if rescale else 0}"
-                ],
+                run_cmd,
                 cwd=Variables.get("FARGO_ROOT"),
                 stdout=subprocess.DEVNULL if not show_fargo_output else None,
                 stderr=subprocess.DEVNULL if not show_fargo_output else None,
@@ -93,6 +102,7 @@ def run(
         parallel: bool = False,
         num_nodes: int = 1,
         cuda_device_id: int = 0,
+        verbose: bool = False,
     ) -> None:
         total_steps = self._param_config["output_parameters.ntot"].value
         steps_between_outputs = self._param_config["output_parameters.ninterm"].value
@@ -111,6 +121,9 @@ def run(
             ]
         )
 
+        if verbose:
+            print(f"CMD @ {Variables.get('FARGO_ROOT')}  $ " + " ".join(processes))
+
         # >>> BEGIN
         with (
             tqdm(
@@ -121,7 +134,7 @@ def run(
             subprocess.Popen(
                 processes,
                 stdout=subprocess.PIPE,
-                stderr=subprocess.DEVNULL,
+                stderr=None if verbose else subprocess.DEVNULL,
                 bufsize=1,
                 universal_newlines=True,
                 shell=True,

src/radiosim/ppdisks/simulation.py

@@ -120,6 +120,9 @@ def get_runs(self) -> list["SimulationRun"]:
         run_ids = [int(str(d.name).removeprefix("run_")) for d in dirs]
         return [SimulationRun(id=run_id, sim=self) for run_id in run_ids]
 
+    def get_run(self, run_id: int) -> "SimulationRun":
+        return SimulationRun(id=run_id, sim=self)
+
     def simulate(
         self,
         num_models: int,
@@ -133,7 +136,6 @@ def simulate(
         parallel: bool = False,
         num_nodes: int = 1,
         show_progress: bool = True,
-        show_fargo_output: bool = False,
         verbose: bool = False,
         overwrite: bool = False,
     ) -> None:
@@ -148,6 +150,8 @@ def simulate(
         else:
             run = SimulationRun(id=run_id, sim=self, resume_rng=resume)
 
+        print(f"------ STARTING RUN {run._id} ------")
+
         start_idx = 0 if not resume else run.get_next_model_id()
         for i in np.arange(start_idx, num_models):
             try:
@@ -278,8 +282,7 @@ def simulate(
 
             max_orbit_radius = distances.max()
             param_config["mesh_parameters.ymax"] = (
-                mesh_parameters["y_max_ratio"]
-                * max_orbit_radius.to(self._unit_system.length).value
+                mesh_parameters["y_max_ratio"] * max_orbit_radius
             )
 
             param_config["mesh_parameters.nx"] = run.get_polar_img_size()[1]
@@ -295,7 +298,9 @@ def orbital_period(mass, radius, G):
                 return np.sqrt((4 * np.pi**2 * radius**3) / (mass * G))
 
             period = orbital_period(
-                mass=m_star, radius=max_orbit_radius, G=self._constants["G"]
+                mass=m_star,
+                radius=max_orbit_radius * self._unit_system.length,
+                G=self._constants["G"],
             )
 
             total_time = num_orbits * period
@@ -364,7 +369,7 @@ def toml_serialize_dict(read_dict):
                 model_id=model._id,
                 show_progress=show_progress,
                 verbose=verbose,
-                show_fargo_output=show_fargo_output,
+                show_fargo_output=verbose,
             )
 
             self._setup.run(
@@ -373,14 +378,18 @@ def toml_serialize_dict(read_dict):
                 parallel=parallel,
                 show_progress=show_progress,
                 cuda_device_id=cuda_device_id,
+                verbose=verbose,
             )
 
             # Move the data files to the correct directory
             model.get_data_directory().mkdir()
-            shutil.move(
-                src=Variables.get("FARGO_ROOT") / model.get_fargo_output_path(),
-                dst=model.get_data_directory(),
-            )
+            for file in (
+                Variables.get("FARGO_ROOT") / model.get_fargo_output_path()
+            ).glob("*.*"):
+                shutil.move(
+                    src=file,
+                    dst=model.get_data_directory(),
+                )
             shutil.rmtree(
                 path=Variables.get("FARGO_ROOT") / model.get_fargo_output_path()
             )