Read Trim files with arbitrary number of layers (#35)

Changes: * Made _trim_to_faces_frame work with any number of layers * Bump to version 0.5.2
Data-Only-Greater · Feb 24, 2022 · e1d5945 · e1d5945
1 parent e29f6d9
commit e1d5945
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/.conda/recipe/meta.yaml b/.conda/recipe/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "0.5.1" %}
+{% set version = "0.5.2" %}
 
 package:
   name: snl-delft3d-cec-verify

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ From a conda prompt create a named environment in which to install the
 for future updates:
 
 ```
-(base) > conda create -y -n snld3d --override-channels -c conda-forge -c dataonlygreater snl-delft3d-cec-verify=0.5.1
+(base) > conda create -y -n snld3d --override-channels -c conda-forge -c dataonlygreater snl-delft3d-cec-verify=0.5.2
 (base) > conda activate snld3d
 (snld3d) > conda config --env --add channels conda-forge --add channels dataonlygreater
 (snld3d) > conda config --env --set channel_priority strict

diff --git a/docs/_assets/gh-pages-redirect.html b/docs/_assets/gh-pages-redirect.html
@@ -3,7 +3,7 @@
   <head>
     <title>Redirecting to latest version</title>
     <meta charset="utf-8">
-    <meta http-equiv="refresh" content="0; url=./v0.5.1/index.html">
-    <link rel="canonical" href="https://data-only-greater.github.io/SNL-Delft3D-CEC-Verify/v0.5.1/index.html">
+    <meta http-equiv="refresh" content="0; url=./v0.5.2/index.html">
+    <link rel="canonical" href="https://data-only-greater.github.io/SNL-Delft3D-CEC-Verify/v0.5.2/index.html">
   </head>
 </html>
diff --git a/docs/conf.py b/docs/conf.py
@@ -25,7 +25,7 @@
 author = 'Mathew Topper'
 
 # The full version, including alpha/beta/rc tags
-release = '0.5.1'
+release = '0.5.2'
 
 
 # -- General configuration ---------------------------------------------------
@@ -57,7 +57,7 @@
 smv_remote_whitelist = r'^(origin)$'
 smv_tag_whitelist = r'^v(\d+\.\d+\.\d+)$' # r'^v(?!0.4.0|0.4.1|0.4.2)\d+\.\d+\.\d+$'
 smv_released_pattern = r'^refs/tags/.*$'
-smv_latest_version = 'v0.5.1'
+smv_latest_version = 'v0.5.2'
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = SNL-Delft3D-CEC-Verify
-version = 0.5.1
+version = 0.5.2
 author = Mathew Topper
 author_email = [email protected]
 description = Automated verification of SNL-Delft3D-CEC based on the 2014 Mycek experiment

diff --git a/src/snl_d3d_cec_verify/result/faces.py b/src/snl_d3d_cec_verify/result/faces.py
@@ -641,24 +641,26 @@ def _trim_to_faces_frame(trim_path: StrOrPath,
         v1 = ds_step.V1.values
         w = ds_step.W.values
 
+    n_layers = len(ik)
+
     x = x[1:-1, 1:-1]
-    x = np.repeat(x[np.newaxis, :, :], 3, axis=0)
+    x = np.repeat(x[np.newaxis, :, :], n_layers, axis=0)
 
     y = y[1:-1, 1:-1]
-    y = np.repeat(y[np.newaxis, :, :], 3, axis=0)
+    y = np.repeat(y[np.newaxis, :, :], n_layers, axis=0)
 
     depth = dp0 + s1
     z = depth[..., None] * sig_lyr
     z = np.rollaxis(z, 2)
     z = z[:, 1:-1, 1:-1]
 
-    ik = np.flip(ik).reshape(3, 1, 1)
+    ik = np.flip(ik).reshape(n_layers, 1, 1)
     k = np.ones(x.shape, dtype=int) * ik
 
     time = np.tile(time, x.shape)
 
     depth = depth[1:-1, 1:-1]
-    depth = np.repeat(depth[np.newaxis, :, :], 3, axis=0)
+    depth = np.repeat(depth[np.newaxis, :, :], n_layers, axis=0)
 
     u1 = u1[:, :-1, 1:-1]
     u = np.nansum([u1[:, :-1, :], u1[:, 1:, :]], axis=0) / 2