From e97138ced3e13ee1b5bd543bb9de9e0e6f1f5f5f Mon Sep 17 00:00:00 2001
From: "Edgar P. Burkhart" <git@edgarpierre.fr>
Date: Wed, 30 Mar 2022 11:07:25 +0200
Subject: [PATCH] 2 layer config

---
 swash/config.ini            | 10 ++++------
 swash/processing/post.py    | 12 ++++++------
 swash/processing/sws_npz.py | 15 ++++++++-------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/swash/config.ini b/swash/config.ini
index e4b8d3c..dfe967d 100644
--- a/swash/config.ini
+++ b/swash/config.ini
@@ -4,14 +4,12 @@ out=../data/out
 [swash]
 input=sws/SPEC_buoy.sws
 path=/data/code/swash
-out=out/spec_ot
+out=out/spec_ot_2lay
 mpi=8
 
 [post]
-inp=inp_post/spec_ot
-compare=inp_post_nb
-out=out_post
-#nperseg=1024
-dt=0.25
+inp=inp_post/spec_ot_2lay
+compare=inp_post/spec_ot_2lay
+out=out_post/spec_ot_2lay
 x0=-1250
 t0=180
diff --git a/swash/processing/post.py b/swash/processing/post.py
index ca6a785..8ca2e94 100644
--- a/swash/processing/post.py
+++ b/swash/processing/post.py
@@ -88,14 +88,14 @@ if config.has_option("post", "compare"):
     G_ = H_ / U_
     th_eta_u_ = np.angle(phi_eta_u_[1])
 
+    #R_ = np.sqrt(
+    #    (np.abs(phi_eta_[1]) + np.abs(phi_u_[1]) - 2 * np.abs(phi_eta_u_[1]))
+    #    / (np.abs(phi_eta_[1]) + np.abs(phi_u_[1]) + 2 * np.abs(phi_eta_u_[1]))
+    #)
     R_ = np.sqrt(
-        (np.abs(phi_eta_[1]) + np.abs(phi_u_[1]) - 2 * np.abs(phi_eta_u_[1]))
-        / (np.abs(phi_eta_[1]) + np.abs(phi_u_[1]) + 2 * np.abs(phi_eta_u_[1]))
+       (1 + G_**2 - 2 * G_ * np.cos(th_eta_u_))
+       / (1 + G_**2 + 2 * G_ * np.cos(th_eta_u_))
     )
-    # R_ = np.sqrt(
-    #    (1 + G_**2 - 2 * G_ * np.cos(th_eta_u_))
-    #    / (1 + G_**2 + 2 * G_ * np.cos(th_eta_u_))
-    # )
 
 
 # Plotting
diff --git a/swash/processing/sws_npz.py b/swash/processing/sws_npz.py
index 607066b..4030156 100644
--- a/swash/processing/sws_npz.py
+++ b/swash/processing/sws_npz.py
@@ -30,14 +30,15 @@ np.save(inp.joinpath("tsec"), rsws.read_time(sws_out.joinpath("tsec.dat")))
 np.save(inp.joinpath("xp"), rsws.read_x(sws_out.joinpath("xp.dat")))
 
 var = {
-    "dep": rsws.read_scalar,
-    "botl": rsws.read_const,
-    "watl": rsws.read_scalar,
-    "pressk": rsws.read_scalar_lay,
-    "nhprsk": rsws.read_scalar_lay,
+    #"dep": rsws.read_scalar,
+    #"botl": rsws.read_const,
+    #"watl": rsws.read_scalar,
+    #"pressk": rsws.read_scalar_lay,
+    #"nhprsk": rsws.read_scalar_lay,
     "zk": rsws.read_scalar_lay,
-    "velk": rsws.read_vector_lay,
-    "vz": rsws.read_scalar_lay,
+    #"velk": rsws.read_vector_lay,
+    #"vz": rsws.read_scalar_lay,
+    #"vel": rsws.read_vector,
 }
 
 with ThreadPool() as pool: