m2cce/internship
m2cce
/
internship
1
Fork 0
Code Issues Activity

Revert to single npz archive

This commit is contained in:
Edgar P. Burkhart 2022-03-15 10:25:13 +01:00
parent 009e500d7a
commit 5edc4d7bc8
Signed by: edpibu
GPG Key ID: 9833D3C5A25BD227
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
swash/processing/read_swash.py
View File

@ -31,17 +31,28 @@ class ReadSwash:
def read_scalar(self, path, const=False):
if const:
return self.read_nohead(path).reshape((self._n_t, self._n_x))[0, :]
return self.read_nohead(path).reshape((self._n_t, self._n_x))
self._data[path.stem] = self.read_nohead(path).reshape(
(self._n_t, self._n_x)
)[0, :]
return
self._data[path.stem] = self.read_nohead(path).reshape(
(self._n_t, self._n_x)
)
def read_vector(self, path):
return self.read_nohead(path).reshape((self._n_t, 2, self._n_x))
self._data[path.stem] = self.read_nohead(path).reshape(
(self._n_t, 2, self._n_x)
)
def read_scalar_lay(self, path):
return self.read_nohead(path).reshape((self._n_t, -1, self._n_x))
self._data[path.stem] = self.read_nohead(path).reshape(
(self._n_t, -1, self._n_x)
)
def read_vector_lay(self, path):
return self.read_nohead(path).reshape((self._n_t, 2, -1, self._n_x))
self._data[path.stem] = self.read_nohead(path).reshape(
(self._n_t, 2, -1, self._n_x)
)
@property
def t(self):
@ -50,3 +61,7 @@ class ReadSwash:
@property
def x(self):
return self._x
@property
def data(self):
return self._data

17
swash/processing/sws_npz.py
View File

@ -27,16 +27,15 @@ rsws = ReadSwash()
rsws.read_time(sws_out.joinpath("tsec.dat"))
rsws.read_x(sws_out.joinpath("xp.dat"))
inp.mkdir(exist_ok=True)
log.info(f"Wrinting output in '{inp}'")
log.info("Reading 'dep'")
np.save(inp.joinpath("dep"), rsws.read_scalar(sws_out.joinpath("dep.dat")))
rsws.read_scalar(sws_out.joinpath("dep.dat"))
log.info("Reading 'botl'")
np.save(
inp.joinpath("botl"),
rsws.read_scalar(sws_out.joinpath("botl.dat"), const=True),
)
rsws.read_scalar(sws_out.joinpath("botl.dat"), const=True)
log.info("Reading 'watl'")
np.save(inp.joinpath("watl"), rsws.read_scalar(sws_out.joinpath("watl.dat")))
rsws.read_scalar(sws_out.joinpath("watl.dat"))
log.info("Reading 'vel'")
np.save(inp.joinpath("vel"), rsws.read_vector(sws_out.joinpath("vel.dat")))
rsws.read_vector(sws_out.joinpath("vel.dat"))
log.info(f"Writing npz file in '{inp}'")
inp.mkdir(exist_ok=True)
np.savez_compressed(inp.joinpath("sws"), t=rsws.t, x=rsws.x, **rsws.data)