Changed swash reading procedure to read time and space data from output

This commit is contained in:
Edgar P. Burkhart 2022-03-04 10:21:02 +01:00
parent 2a2793f92e
commit 868e34777e
Signed by: edpibu
GPG key ID: 9833D3C5A25BD227
2 changed files with 59 additions and 32 deletions

View file

@ -1,12 +1,11 @@
import argparse
import configparser
import pathlib
import logging
import pathlib
import pandas as pd
from .read_swash import *
from .read_swash import ReadSwash
parser = argparse.ArgumentParser(description="Convert swash output to numpy")
parser.add_argument("-v", "--verbose", action="count", default=0)
@ -19,25 +18,26 @@ log.info("Starting sws -> npz converter")
config = configparser.ConfigParser()
config.read("config.ini")
data_out = pathlib.Path(config.get("data", "out"))
sws_out = pathlib.Path(config.get("swash", "out"))
inp = pathlib.Path(config.get("post", "inp"))
log.info(f"Reading bathymetry from '{data_out}'")
bathy = pd.read_hdf(data_out.joinpath("bathy.h5"), "bathy")
n_x = bathy.index.size
log.info(f"Reading swash output from '{sws_out}'")
botl = read_nohead_scalar(sws_out.joinpath("botl.dat"), n_x)
dep = np.maximum(0, read_nohead_scalar(sws_out.joinpath("dep.dat"), n_x))
vel = read_nohead_vect(sws_out.joinpath("vel.dat"), n_x)
rsws = ReadSwash()
rsws.read_time(sws_out.joinpath("tsec.dat"))
rsws.read_x(sws_out.joinpath("xp.dat"))
dt = config.getfloat("post", "dt")
n_t = botl.shape[0]
t = np.arange(0, n_t * dt, dt)
rsws.read_scalar(sws_out.joinpath("dep.dat"))
rsws.read_scalar(sws_out.joinpath("botl.dat"))
rsws.read_scalar(sws_out.joinpath("watl.dat"))
rsws.read_scalar(sws_out.joinpath("press.dat"))
rsws.read_vector(sws_out.joinpath("disch.dat"))
rsws.read_scalar(sws_out.joinpath("ustar.dat"))
rsws.read_vector(sws_out.joinpath("vel.dat"))
rsws.read_scalar_lay(sws_out.joinpath("vz.dat"))
rsws.read_vector_lay(sws_out.joinpath("velk.dat"))
rsws.read_scalar_lay(sws_out.joinpath("zk.dat"))
rsws.read_scalar(sws_out.joinpath("brkp.dat"))
log.info(f"Writing npz file in '{inp}'")
inp.mkdir(exist_ok=True)
np.savez_compressed(
inp.joinpath("sws"), x=bathy.index, t=t, botl=botl[0, :], dep=dep, vel=vel
)
np.savez_compressed(inp.joinpath("sws"), t=rsws.t, x=rsws.x, *rsws.data)