[snap] improve sinks

This commit is contained in:
Noe Brucy
2021-07-22 14:25:17 +02:00
parent 293ffc470f
commit 7765ebe64d
+3 -16
View File
@@ -1350,15 +1350,6 @@ class SnapshotProcessor(HDF5Container):
return alpha_g return alpha_g
def _sinks(self): def _sinks(self):
csv_name = (
self.path
+ "/output_"
+ str(self.num).zfill(5)
+ "/sink_"
+ str(self.num).zfill(5)
+ ".csv"
)
sinks = np.loadtxt(csv_name, delimiter=",")
header = [ header = [
"Id", "Id",
"M", "M",
@@ -1379,14 +1370,10 @@ class SnapshotProcessor(HDF5Container):
"int_lum", "int_lum",
"Teff", "Teff",
] ]
if len(sinks) == 0: csv_name = f"{self.path}/output_{self.num:05}/sink_{self.num:05}.csv"
sinks = np.zeros(len(header)) df = pd.read_csv(csv_name, header=None, names=header)
return {key: df[key].values for key in df}
sinks_dict = {}
for key, a in zip(header, sinks):
sinks_dict[key] = a
return sinks_dict
def _pspec(self, **kwargs): def _pspec(self, **kwargs):
outfile = self.pspec_filename outfile = self.pspec_filename