m2cce/internship
m2cce/internship
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

isort + black reformat

Browse source
This commit is contained in:
Edgar P. Burkhart 2022-03-29 09:47:45 +02:00
parent cf54c91fa8
commit 81f7a1299b
Signed by: edpibu
GPG key ID: 9833D3C5A25BD227
7 changed files with 32 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
olaflow/processing/bathy.py
View file

@ -7,9 +7,7 @@ import numpy as np
from .stl import stl_from_1d
parser = argparse.ArgumentParser(
description="Convert swash output to olaFlow input"
)
parser = argparse.ArgumentParser(description="Convert swash output to olaFlow input")
parser.add_argument("-v", "--verbose", action="count", default=0)
parser.add_argument("-c", "--config", default="config.ini")
args = parser.parse_args()

13
olaflow/processing/sws_ola.py
View file

@ -3,15 +3,13 @@ import configparser
import logging
import pathlib
import matplotlib.pyplot as plt
import numpy as np
from scipy import interpolate
import matplotlib.pyplot as plt
from .olaflow import OFModel
parser = argparse.ArgumentParser(
description="Convert swash output to olaFlow input"
)
parser = argparse.ArgumentParser(description="Convert swash output to olaFlow input")
parser.add_argument("-v", "--verbose", action="count", default=0)
parser.add_argument("-c", "--config", default="config.ini")
args = parser.parse_args()
@ -24,9 +22,12 @@ config = configparser.ConfigParser()
config.read(args.config)
sws_out = pathlib.Path(config.get("swash", "np_out"))
def data(var):
return np.load(sws_out.joinpath(f"{var}.npy"))
x = data("xp")
t = data("tsec")
@ -43,7 +44,7 @@ watl_t = interpolate.interp1d(x, watl[680])
alpha_water = np.where(model.z < watl_t(model.x), 1, 0)
zk_t = interpolate.interp1d(x, zk[680])
velk_t = interpolate.interp1d(x, velk[680,:,0,:])(model.x)
velk_t = interpolate.interp1d(x, velk[680, :, 0, :])(model.x)
vz_t = interpolate.interp1d(x, vz[680])(model.x)
zk_tl = zk_t(model.x)
@ -56,6 +57,6 @@ for zk_l, velk_l, vz_l in zip(zk_tl, velk_t, vz_t):
ux = np.where(model.z < zk_l, velk_l, ux)
uz = np.where(model.z < zk_l, vz_l, uz)
print(np.stack((ux,uy,uz)).T)
print(np.stack((ux, uy, uz)).T)
model.write_field("alpha.water", alpha_water)
model.write_vector_field("U", np.stack((ux, uy, uz)).T)