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

Processing update: fix empty file issue

Browse source
This commit is contained in:
Edgar P. Burkhart 2022-03-15 10:21:09 +01:00
parent 68e8d16f7c
commit 009e500d7a
Signed by: edpibu
GPG key ID: 9833D3C5A25BD227
2 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
swash/processing/read_swash.py
View file

@ -13,8 +13,10 @@ class ReadSwash:
@classmethod @classmethod
def read_nohead(cls, path): def read_nohead(cls, path):
with open(path) as file, tempfile.TemporaryFile() as tmpfile: with tempfile.TemporaryFile() as tmpfile:
with open(path) as file:
subprocess.run(("tr", "-d", "\n"), stdin=file, stdout=tmpfile) subprocess.run(("tr", "-d", "\n"), stdin=file, stdout=tmpfile)
tmpfile.seek(0)
return np.loadtxt(tmpfile) return np.loadtxt(tmpfile)
def read_time(self, path): def read_time(self, path):
@ -29,27 +31,17 @@ class ReadSwash:
def read_scalar(self, path, const=False): def read_scalar(self, path, const=False):
if const: if const:
return self.read_nohead(path).reshape( return self.read_nohead(path).reshape((self._n_t, self._n_x))[0, :]
(self._n_t, self._n_x) 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)
)
def read_vector(self, path): def read_vector(self, path):
return self.read_nohead(path).reshape( return self.read_nohead(path).reshape((self._n_t, 2, self._n_x))
(self._n_t, 2, self._n_x)
)
def read_scalar_lay(self, path): def read_scalar_lay(self, path):
return self.read_nohead(path).reshape( return self.read_nohead(path).reshape((self._n_t, -1, self._n_x))
(self._n_t, -1, self._n_x)
)
def read_vector_lay(self, path): def read_vector_lay(self, path):
return self.read_nohead(path).reshape( return self.read_nohead(path).reshape((self._n_t, 2, -1, self._n_x))
(self._n_t, 2, -1, self._n_x)
)
@property @property
def t(self): def t(self):

6
swash/processing/sws_npz.py
View file

@ -32,8 +32,10 @@ log.info(f"Wrinting output in '{inp}'")
log.info("Reading 'dep'") log.info("Reading 'dep'")
np.save(inp.joinpath("dep"), rsws.read_scalar(sws_out.joinpath("dep.dat"))) np.save(inp.joinpath("dep"), rsws.read_scalar(sws_out.joinpath("dep.dat")))
log.info("Reading 'botl'") log.info("Reading 'botl'")
np.save(inp.joinpath("botl"), rsws.read_scalar(sws_out.joinpath("botl.dat"), np.save(
const=True)) inp.joinpath("botl"),
rsws.read_scalar(sws_out.joinpath("botl.dat"), const=True),
)
log.info("Reading 'watl'") log.info("Reading 'watl'")
np.save(inp.joinpath("watl"), rsws.read_scalar(sws_out.joinpath("watl.dat"))) np.save(inp.joinpath("watl"), rsws.read_scalar(sws_out.joinpath("watl.dat")))
log.info("Reading 'vel'") log.info("Reading 'vel'")