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

Merge branch 'swash'

Browse source
This commit is contained in:
Edgar P. Burkhart 2022-03-30 09:55:47 +02:00
commit 5538f9fee8
Signed by: edpibu
GPG key ID: 9833D3C5A25BD227
6 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
swash/config-nb.ini
View file

@ -3,18 +3,15 @@ out=../data/out_nb
[swash] [swash]
input=sws/SPEC_buoy_nb.sws input=sws/SPEC_buoy_nb.sws
path=/opt/swash path=/data/code/swash
out=out/spec_nb out=out/spec_nb
mpi=8 mpi=8
[post] [post]
inp=inp_post inp=inp_post/spec_nb
compare=inp_post_nb compare=inp_post_nb
out=out_post out=out_post
#nperseg=1024 #nperseg=1024
dt=0.25 dt=0.25
x0=-1250 x0=-1250
t0=180 t0=180
[plot]
out=out_plt

7
swash/config.ini
View file

@ -3,18 +3,15 @@ out=../data/out
[swash] [swash]
input=sws/SPEC_buoy.sws input=sws/SPEC_buoy.sws
path=/opt/swash path=/data/code/swash
out=out/spec out=out/spec
mpi=8 mpi=8
[post] [post]
inp=inp_post inp=inp_post/spec
compare=inp_post_nb compare=inp_post_nb
out=out_post out=out_post
#nperseg=1024 #nperseg=1024
dt=0.25 dt=0.25
x0=-1250 x0=-1250
t0=180 t0=180
[plot]
out=out_plt

4
swash/processing/animate.py
View file

@ -21,8 +21,8 @@ config.read(args.config)
inp = pathlib.Path(config.get("post", "inp")) inp = pathlib.Path(config.get("post", "inp"))
root = pathlib.Path(config.get("swash", "out")) root = pathlib.Path(config.get("swash", "out"))
out = pathlib.Path(config.get("plot", "out")) out = pathlib.Path(config.get("post", "out"))
out.mkdir(exist_ok=True) out.mkdir(parents=True, exist_ok=True)
def data(var): def data(var):

4
swash/processing/layers.py
View file

@ -21,8 +21,8 @@ config.read(args.config)
inp = pathlib.Path(config.get("post", "inp")) inp = pathlib.Path(config.get("post", "inp"))
root = pathlib.Path(config.get("swash", "out")) root = pathlib.Path(config.get("swash", "out"))
out = pathlib.Path(config.get("plot", "out")) out = pathlib.Path(config.get("post", "out"))
out.mkdir(exist_ok=True) out.mkdir(parents=True, exist_ok=True)
def data(var): def data(var):

2
swash/processing/read_swash.py
View file

@ -13,7 +13,7 @@ class ReadSwash:
@classmethod @classmethod
def read_nohead(cls, path): def read_nohead(cls, path):
subprocess.run(("sed", "-i", r"s/ /\n/g", path)) subprocess.run(("sed", "-i", r"s/\s\+/\n/g", path))
return np.loadtxt(path) return np.loadtxt(path)
def read_time(self, path): def read_time(self, path):

8
swash/processing/sws_npz.py
View file

@ -22,6 +22,7 @@ config.read(args.config)
sws_out = pathlib.Path(config.get("swash", "out")) sws_out = pathlib.Path(config.get("swash", "out"))
inp = pathlib.Path(config.get("post", "inp")) inp = pathlib.Path(config.get("post", "inp"))
inp.mkdir(parents=True, exist_ok=True)
log.info(f"Reading swash output from '{sws_out}'") log.info(f"Reading swash output from '{sws_out}'")
rsws = ReadSwash() rsws = ReadSwash()
@ -32,15 +33,14 @@ var = {
"dep": rsws.read_scalar, "dep": rsws.read_scalar,
"botl": rsws.read_const, "botl": rsws.read_const,
"watl": rsws.read_scalar, "watl": rsws.read_scalar,
"vel": rsws.read_vector, "pressk": rsws.read_scalar_lay,
"press": rsws.read_scalar, "nhprsk": rsws.read_scalar_lay,
"zk": rsws.read_scalar_lay, "zk": rsws.read_scalar_lay,
"velk": rsws.read_vector_lay, "velk": rsws.read_vector_lay,
"vz": rsws.read_scalar_lay, "vz": rsws.read_scalar_lay,
} }
inp.mkdir(exist_ok=True) with ThreadPool(len(var)) as pool:
with ThreadPool() as pool:
log.info("Converting all data") log.info("Converting all data")
pool.map( pool.map(
lambda x: np.save( lambda x: np.save(