Changed output directories

swash/.gitignore

@@ -1,3 +1,2 @@
-/cache
 /out*
 /swash_buoytoartha

swash/config.ini

@@ -8,11 +8,9 @@ bathy=buoyarthabathy.dat
 hstru=Hstru.dat
 poro=Poro.dat
 psize=Psize.dat
-
+out=out_data
-[out]
-root=cache
 
 [swash]
 input=sws/INPUT.sws
 swashrun=/opt/swash/swash/swashrun
-out=out
+out=out_swash

swash/processing/bathy.py

@@ -62,8 +62,8 @@ log.info(
     f"n: {bathy.index.size}"
 )
 
-if config.has_section("out"):
+if config.has_option("data", "out"):
-    out = pathlib.Path(config.get("out", "root"))
+    out = pathlib.Path(config.get("data", "out"))
     log.info(f"Writing output data to '{out}'")
     out.mkdir(exist_ok=True)
     np.savetxt(out.joinpath("bathy.dat"), bathy.z, newline=" ")

swash/processing/post.py

@@ -12,7 +12,7 @@ from .read_swash import *
 config = configparser.ConfigParser()
 config.read("config.ini")
 
-cache = pathlib.Path(config.get("out", "root"))
+cache = pathlib.Path(config.get("data", "out"))
 root = pathlib.Path(config.get("swash", "out"))
 
 bathy = pd.read_hdf(cache.joinpath("bathy.h5"), "bathy")

swash/processing/swash.py

@@ -16,7 +16,7 @@ with tempfile.TemporaryDirectory(prefix="swash_", dir=".") as tmp_raw:
 
     shutil.copy2(inp, tmpdir)
     shutil.copytree(
-        pathlib.Path(config.get("out", "root")), tmpdir, dirs_exist_ok=True
+        pathlib.Path(config.get("data", "out")), tmpdir, dirs_exist_ok=True
     )
 
     subprocess.run(