diff --git a/snapshotprocessor.py b/snapshotprocessor.py index 089483b..7fe37bb 100644 --- a/snapshotprocessor.py +++ b/snapshotprocessor.py @@ -412,8 +412,13 @@ class SnapshotProcessor(HDF5Container): self.def_rules() def init_pymses(self): + # If ratarmount was used + if os.path.exists(f"{self.path}/output_{self.num:05}/output_{self.num:05}"): + path = f"{self.path}/output_{self.num:05}" + else: + path = self.path self._ro = pymses.RamsesOutput( - self.path, + path, self.num, order=self.params.pymses.order, verbose=self.params.pymses.verbose, @@ -1399,6 +1404,8 @@ class SnapshotProcessor(HDF5Container): def _sinks(self): csv_name = f"{self.path}/output_{self.num:05}/sink_{self.num:05}.csv" + if not os.path.exists(csv_name): # If ratarmount was used + csv_name = f"{self.path}/output_{self.num:05}/output_{self.num:05}/sink_{self.num:05}.csv" f = open(csv_name) first_line = f.readline() diff --git a/utils/runselector.py b/utils/runselector.py index 48ea984..112417f 100644 --- a/utils/runselector.py +++ b/utils/runselector.py @@ -282,9 +282,14 @@ class RunSelector: def load_info(self, run, num): info_filename_output = f"{self.path_in}/{run}/output_{num:05}/info_{num:05}.txt" + # Path of the filename if ratarmount was used + info_filename_tarmount_output = f"{self.path_in}/{run}/output_{num:05}/output_{num:05}/info_{num:05}.txt" + info_filename_folder = f"{self.path_in}/{run}/info/info_{num:05}.txt" if os.path.exists(info_filename_output): info = read_ramses_info_file(info_filename_output) + elif os.path.exists(info_filename_tarmount_output): + info = read_ramses_info_file(info_filename_tarmount_output) elif self.allow_nodata: info = read_ramses_info_file(info_filename_folder) else: @@ -479,7 +484,10 @@ class RunSelector: paths = [] for run in self.nums: for num in self.nums[run]: - paths.append(f"{prefix}/{run}/output_{num:05}\n") + if os.path.exists("{prefix}/{run}/output_{num:05}/output_{num:05}\n"): + paths.append(f"{prefix}/{run}/output_{num:05}/output_{num:05}\n") + else: + paths.append(f"{prefix}/{run}/output_{num:05}\n") f = open(os.path.expanduser(filename), "w") f.writelines(paths) f.close() diff --git a/utils/snapshotselector.py b/utils/snapshotselector.py index b808942..fa60cf8 100644 --- a/utils/snapshotselector.py +++ b/utils/snapshotselector.py @@ -41,8 +41,11 @@ def find_nums(study, prep_function, time_function, time_min=0): def write_paths(nums, path_from_home, filename="~/list_file"): paths = [] for key in nums: - for num in nums[key]: - paths.append(f"{path_from_home}/{key}/output_{num:05}\n") + for num in self.nums[run]: + if os.path.exists("{prefix}/{run}/output_{num:05}/output_{num:05}\n"): + paths.append(f"{prefix}/{run}/output_{num:05}/output_{num:05}\n") + else: + paths.append(f"{prefix}/{run}/output_{num:05}\n") f = open(os.path.expanduser(filename), "w") f.writelines(paths) f.close()