Merge branch 'main' of gitlab.com:oceanbox/Oceanbox.FvcomKit

.version

@@ -1 +1 @@
-5.5.1
+5.5.4

RELEASE_NOTES.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [5.5.4](https://gitlab.com/oceanbox/Oceanbox.FvcomKit/compare/v5.5.3...v5.5.4) (2024-05-01)
+
+
+### Bug Fixes
+
+* Norshelf filenames changed due to changes in Thredds ([0f5de91](https://gitlab.com/oceanbox/Oceanbox.FvcomKit/commit/0f5de91d39e7fae82b17bfc5fd014f731c7d2b9d))
+
+## [5.5.3](https://gitlab.com/oceanbox/Oceanbox.FvcomKit/compare/v5.5.2...v5.5.3) (2024-02-23)
+
+
+### Bug Fixes
+
+* bug in isInsideTriangle ([8d7ab41](https://gitlab.com/oceanbox/Oceanbox.FvcomKit/commit/8d7ab4164c2817906c539b1c632c9ea820de7e5d))
+
+## [5.5.2](https://gitlab.com/oceanbox/Oceanbox.FvcomKit/compare/v5.5.1...v5.5.2) (2024-01-04)
+
+
+### Bug Fixes
+
+* fix ci/cd deploy name ([35e1f43](https://gitlab.com/oceanbox/Oceanbox.FvcomKit/commit/35e1f43fc00dd31c2ec442a3e81d6b715011e66e))
+* update ci/cd setup to v2 ([3f61f1d](https://gitlab.com/oceanbox/Oceanbox.FvcomKit/commit/3f61f1d1a9c98dfc6be98540cfbc65e90b50cc36))
+
 ## [5.5.1](https://gitlab.com/oceanbox/Oceanbox.FvcomKit/compare/v5.5.0...v5.5.1) (2024-01-03)
 
 

src/Grid.fs

@@ -442,7 +442,7 @@ module Util =
         let neg = (d1 <= 0.) || (d2 <= 0.) || (d3 <= 0.)
         let pos = (d1 >= 0.) || (d2 >= 0.) || (d3 >= 0.)
 
-        neg && pos |> not
+        (neg && pos) |> not
 
     let inline isInsideTriangle_dbl (x, y, z) p =
         let sign (p1x, p1y) (p2x, p2y) (p3x, p3y) =
@@ -456,7 +456,7 @@ module Util =
         let neg = (d1 <= 0.0) || (d2 <= 0.0) || (d3 <= 0.0)
         let pos = (d1 >= 0.0) || (d2 >= 0.0) || (d3 >= 0.0)
 
-        neg && pos |> not
+        (neg && pos) |> not
 
     // make a kd-tree for looking up nearest node
     let buildNearestNodeTree (grid: IGrid) =

src/NorShelf.fs

@@ -10,7 +10,7 @@ let private getNorshelfUrl (threddsUrl: string) (kind: Kind) (mode: Mode) (date:
     let fmt (d: DateTime) =
         $"{d.Year}%02d{d.Month}%02d{d.Day}T00Z.nc"
     let url = threddsUrl + "/sea_norshelf_files"
-    $"{url}/norshelf_{kind}_{mode}_{fmt date}"
+    $"{url}/{date.Year}/%02d{date.Month}/norshelf_{kind}_{mode}_{fmt date}"
 
 let private getArchiveUrls urlf (t: DateTime) =
     let t = t.ToUniversalTime()

src/Oceanbox.FvcomKit.fsproj

@@ -7,7 +7,7 @@
     <PackageId>Oceanbox.FvcomKit</PackageId>
     <Authors/>
     <Company/>
-    <Version>5.5.1</Version>
+    <Version>5.5.4</Version>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
   <ItemGroup>