From bfb22c25246e18aaf1d60b8cc65fd69c29a6d730 Mon Sep 17 00:00:00 2001
From: brey <breyiannis@gmail.com>
Date: Mon, 26 Sep 2022 14:10:42 +0200
Subject: [PATCH] address #120

---
 pyposeidon/utils/cast.py       |  5 +++++
 pyposeidon/utils/post.py       | 23 ++++++++++++++---------
 pyposeidon/utils/statistics.py |  5 +++--
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/pyposeidon/utils/cast.py b/pyposeidon/utils/cast.py
index 2e10b1f9..eded9002 100644
--- a/pyposeidon/utils/cast.py
+++ b/pyposeidon/utils/cast.py
@@ -290,6 +290,11 @@ def run(self, **kwargs):
         except:
             pass
 
+        # add optional additional kwargs
+        for attr in kwargs.keys():
+            if attr not in info.keys():
+                info[attr] = kwargs[attr]
+
         info["config_file"] = ppath + "param.nml"
 
         # update the properties
diff --git a/pyposeidon/utils/post.py b/pyposeidon/utils/post.py
index a5e9561e..d62ddff8 100644
--- a/pyposeidon/utils/post.py
+++ b/pyposeidon/utils/post.py
@@ -46,12 +46,12 @@ def to_thalassa(folders, freq=None, **kwargs):
 
     cc = xr.concat(c, dim="time")
 
-    cf = cc.rename({"elev": "forecast", "time": "ftime"})
+    cf = cc.rename({"elev": "elev_fct", "time": "ftime"})
 
     # Observation/Stats
     logger.info("Retrieve observation data for station points\n")
-    stations = gp.GeoDataFrame(b.obs)
-    odata = get_obs_data(stations=stations, start_date=b.date, end_date=b.end_date)
+    stations = gp.GeoDataFrame.from_file(b.obs)
+    odata = get_obs_data(stations=stations, start_time=b.rdate, end_time=b.end_date)
 
     logger.info("Compute general statistics for station points\n")
     sts = []
@@ -74,9 +74,10 @@ def to_thalassa(folders, freq=None, **kwargs):
 
     stp = stations.to_xarray().rename({"index": "node"})
 
-    od = odata.rename({"prs": "observations"}).swap_dims({"ioc_code": "node"})
+    od = odata.rename({"prs": "elev_obs"}).swap_dims({"ioc_code": "node"})
+    od["elev_obs"] = od.elev_obs.transpose()
 
-    sd = st.rename({"elev": "elevation"})
+    sd = st.rename({"elev": "elev_sim", "time": "stime"})
 
     vdata = xr.merge([od, stats.to_xarray(), cf, sd])
 
@@ -91,16 +92,20 @@ def to_thalassa(folders, freq=None, **kwargs):
     logger.info("..done\n")
 
 
-def fskill(dset, var, node):
+def fskill(dset, var, node=None):
+
+    if not node:
+        logger.error("Specify node\n")
+        return
 
     lstat = []
 
     for l in dset.lead.values:
 
-        obs_ = dset.sel(node=node).observation  # Get observational data
-        obs_ = obs_.to_dataframe().drop("node", axis=1)
+        obs_ = dset.sel(node=node).elev_obs  # Get observational data
+        obs_ = obs_.dropna(dim="time").to_dataframe().drop("node", axis=1)
 
-        sim = dset.isel(node=node).forecast.sel(lead=l).to_dataframe().drop("node", axis=1)
+        sim = dset.isel(node=node).elev_fct.sel(lead=l).to_dataframe().drop("node", axis=1).dropna()
 
         stable = get_stats(sim, obs_)  # Do general statitics
 
diff --git a/pyposeidon/utils/statistics.py b/pyposeidon/utils/statistics.py
index 09b49984..fd59ae20 100755
--- a/pyposeidon/utils/statistics.py
+++ b/pyposeidon/utils/statistics.py
@@ -12,9 +12,10 @@ def get_stats(sim_, obs_):
 
     # match time frames
     try:
+        start = max(obs_.index[0], sim_.index[0])
         end = min(obs_.index[-1], sim_.index[-1])
-        obs_ = obs_.loc[:end]
-        sim_ = sim_.loc[:end]
+        obs_ = obs_.loc[start:end]
+        sim_ = sim_.loc[start:end]
         obs_ = obs_.reindex(sim_.index, method="nearest")  # sample on simulation times
         return vtable(obs_.values, sim_.values)
     except: