Merge branch 'olaflow'
This commit is contained in:
commit
6f3425ae94
32 changed files with 311505 additions and 55 deletions
0
swash/data/Hstru.dat
Executable file → Normal file
0
swash/data/Hstru.dat
Executable file → Normal file
0
swash/data/Poro.dat
Executable file → Normal file
0
swash/data/Poro.dat
Executable file → Normal file
0
swash/data/Psize.dat
Executable file → Normal file
0
swash/data/Psize.dat
Executable file → Normal file
0
swash/data/bathyhires.dat
Executable file → Normal file
0
swash/data/bathyhires.dat
Executable file → Normal file
0
swash/data/buoyarthabathy.dat
Executable file → Normal file
0
swash/data/buoyarthabathy.dat
Executable file → Normal file
|
@ -23,11 +23,9 @@ root = pathlib.Path(config.get("swash", "out"))
|
|||
out = pathlib.Path(config.get("plot", "out"))
|
||||
out.mkdir(exist_ok=True)
|
||||
|
||||
|
||||
def data(var):
|
||||
return np.load(inp.joinpath(f"{var}.npy"))
|
||||
|
||||
|
||||
x = data("xp")
|
||||
t = data("tsec")
|
||||
|
||||
|
|
|
@ -6,6 +6,10 @@ import pathlib
|
|||
import matplotlib.animation as animation
|
||||
import matplotlib.pyplot as plt
|
||||
import numpy as np
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
import pandas as pd
|
||||
>>>>>>> olaflow
|
||||
|
||||
parser = argparse.ArgumentParser(description="Animate swash output")
|
||||
parser.add_argument("-v", "--verbose", action="count", default=0)
|
||||
|
@ -23,7 +27,6 @@ root = pathlib.Path(config.get("swash", "out"))
|
|||
out = pathlib.Path(config.get("plot", "out"))
|
||||
out.mkdir(exist_ok=True)
|
||||
|
||||
|
||||
def data(var):
|
||||
return np.load(inp.joinpath(f"{var}.npy"))
|
||||
|
||||
|
|
|
@ -1,19 +1,19 @@
|
|||
$************************* GENERAL ***************************************
|
||||
PROJ 'GW' 'T1'
|
||||
SET NAUT
|
||||
SET LEVEL 4.5
|
||||
SET LEVEL 0.5
|
||||
SET MAXERR 1
|
||||
SET DEPMIN 0.001
|
||||
MODE DYN ONED
|
||||
$************************ GRIDS ***************************************
|
||||
CGRID REG -1250 0 0 1250 0 1250 0
|
||||
INPGRID BOT REG -1250 0 0 1250 0 1 0 $x0 y0 theta nx-1 ny-1 dx dy
|
||||
CGRID REG -1450 0 0 1450 0 1450 0
|
||||
INPGRID BOT REG -1450 0 0 1450 0 1 0 $x0 y0 theta nx-1 ny-1 dx dy
|
||||
VERT 10 $nb couches
|
||||
READ BOTTOM -1 'bathy.dat' 3 0 FREE
|
||||
|
||||
INPGRID PORO REG -1251 0 0 1250 0 1 0
|
||||
INPGRID PSIZ REG -1251 0 0 1250 0 1 0
|
||||
INPGRID HSTRUC REG -1251 0 0 1250 0 1 0
|
||||
INPGRID PORO REG -1450 0 0 1450 0 1 0
|
||||
INPGRID PSIZ REG -1450 0 0 1450 0 1 0
|
||||
INPGRID HSTRUC REG -1450 0 0 1450 0 1 0
|
||||
|
||||
READINP PORO 1 'poro.dat' 3 0 FREE
|
||||
READINP PSIZ 1 'psize.dat' 3 0 FREE
|
||||
|
@ -47,6 +47,8 @@ BLOCK 'COMPGRID' NOHEAD 'dep.dat' DEP OUTPUT 000000.00 0.25 SEC
|
|||
BLOCK 'COMPGRID' NOHEAD 'botl.dat' BOTL OUTPUT 000000.00 0.25 SEC
|
||||
BLOCK 'COMPGRID' NOHEAD 'watl.dat' WATL OUTPUT 000000.00 0.25 SEC
|
||||
BLOCK 'COMPGRID' NOHEAD 'press.dat' PRESS OUTPUT 000000.00 0.25 SEC
|
||||
BLOCK 'COMPGRID' NOHEAD 'nhprsk.dat' NHPRSK OUTPUT 000000.00 0.25 SEC
|
||||
BLOCK 'COMPGRID' NOHEAD 'pressk.dat' PRESSK OUTPUT 000000.00 0.25 SEC
|
||||
BLOCK 'COMPGRID' NOHEAD 'disch.dat' DISCH OUTPUT 000000.00 0.25 SEC
|
||||
BLOCK 'COMPGRID' NOHEAD 'ustar.dat' USTAR OUTPUT 000000.00 0.25 SEC
|
||||
BLOCK 'COMPGRID' NOHEAD 'vel.dat' VEL OUTPUT 000000.00 0.25 SEC
|
||||
|
|
|
@ -1,19 +1,19 @@
|
|||
$************************* GENERAL ***************************************
|
||||
PROJ 'GW' 'T1'
|
||||
SET NAUT
|
||||
SET LEVEL 4.5
|
||||
SET LEVEL 0.5
|
||||
SET MAXERR 1
|
||||
SET DEPMIN 0.001
|
||||
MODE DYN ONED
|
||||
$************************ GRIDS ***************************************
|
||||
CGRID REG -1250 0 0 1250 0 1250 0
|
||||
INPGRID BOT REG -1250 0 0 1250 0 1 0 $x0 y0 theta nx-1 ny-1 dx dy
|
||||
CGRID REG -1450 0 0 1450 0 1450 0
|
||||
INPGRID BOT REG -1450 0 0 1450 0 1 0 $x0 y0 theta nx-1 ny-1 dx dy
|
||||
VERT 10 $nb couches
|
||||
READ BOTTOM -1 'bathy.dat' 3 0 FREE
|
||||
|
||||
INPGRID PORO REG -1251 0 0 1250 0 1 0
|
||||
INPGRID PSIZ REG -1251 0 0 1250 0 1 0
|
||||
INPGRID HSTRUC REG -1251 0 0 1250 0 1 0
|
||||
INPGRID PORO REG -1450 0 0 1450 0 1 0
|
||||
INPGRID PSIZ REG -1450 0 0 1450 0 1 0
|
||||
INPGRID HSTRUC REG -1450 0 0 1450 0 1 0
|
||||
|
||||
READINP PORO 1 'poro.dat' 3 0 FREE
|
||||
READINP PSIZ 1 'psize.dat' 3 0 FREE
|
||||
|
@ -48,6 +48,8 @@ BLOCK 'COMPGRID' NOHEAD 'dep.dat' DEP OUTPUT 000000.00 0.25 SEC
|
|||
BLOCK 'COMPGRID' NOHEAD 'botl.dat' BOTL OUTPUT 000000.00 0.25 SEC
|
||||
BLOCK 'COMPGRID' NOHEAD 'watl.dat' WATL OUTPUT 000000.00 0.25 SEC
|
||||
BLOCK 'COMPGRID' NOHEAD 'press.dat' PRESS OUTPUT 000000.00 0.25 SEC
|
||||
BLOCK 'COMPGRID' NOHEAD 'nhprsk.dat' NHPRSK OUTPUT 000000.00 0.25 SEC
|
||||
BLOCK 'COMPGRID' NOHEAD 'pressk.dat' PRESSK OUTPUT 000000.00 0.25 SEC
|
||||
BLOCK 'COMPGRID' NOHEAD 'disch.dat' DISCH OUTPUT 000000.00 0.25 SEC
|
||||
BLOCK 'COMPGRID' NOHEAD 'ustar.dat' USTAR OUTPUT 000000.00 0.25 SEC
|
||||
BLOCK 'COMPGRID' NOHEAD 'vel.dat' VEL OUTPUT 000000.00 0.25 SEC
|
||||
|
|
Reference in a new issue