Merge branch 'develop' into 'master'

Develop See merge request gnome/pygnome!70
NOAA-ORR-ERD · Feb 8, 2021 · fc807fa · fc807fa
2 parents 3be47f5 + 9fae3b6
commit fc807fa
Show file tree

Hide file tree

Showing 55 changed files with 2,414 additions and 686 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -16,6 +16,7 @@ test:
 
     # install the requirements
     - conda install --file conda_requirements.txt
+    - pip install mapbox-earcut
 
     - cd ./py_gnome
     - python ./setup.py install

diff --git a/conda_requirements.txt b/conda_requirements.txt
@@ -38,6 +38,11 @@ regex
 unidecode>=0.04.19
 pyshp=1.2.12
 
+#for SpatialRelease
+trimesh
+shapely
+pyproj
+mapbox_earcut # from NOAA_ORR_ERD channel
 
 # NOAA maintained packages
 gridded=0.2.5

diff --git a/experiments/gnome_weathering/viscosity_with_temp.ipynb b/experiments/gnome_weathering/viscosity_with_temp.ipynb
diff --git a/lib_gnome/ComponentMover_c.h b/lib_gnome/ComponentMover_c.h
@@ -13,6 +13,7 @@
 #include "Basics.h"
 #include "TypeDefs.h"
 #include "CurrentMover_c.h"
+#include "CATSMover_c.h"
 #ifdef pyGNOME
 #include "GridVel_c.h"
 #else
@@ -95,6 +96,7 @@ class DLL_API ComponentMover_c : virtual public CurrentMover_c {
 
 	virtual WorldPoint3D       GetMove(const Seconds& model_time, Seconds timeStep,long setIndex,long leIndex,LERec *theLE,LETYPE leType);
 	virtual	Boolean 		VelocityStrAtPoint(WorldPoint3D wp, char *diagnosticStr);	
+	virtual WorldRect	GetGridBounds(){return pattern1->GetGridBounds();}	
 
 	//void				SetRefPosition (WorldPoint p) { refP = p;}
 	//void				GetRefPosition (WorldPoint *p) { (*p) = refP;}

diff --git a/lib_gnome/CurrentCycleMover_c.h b/lib_gnome/CurrentCycleMover_c.h
@@ -64,6 +64,7 @@ class DLL_API CurrentCycleMover_c : virtual public GridCurrentMover_c {
 	VelocityRec			GetPatValue (WorldPoint p);
 	VelocityRec 		GetScaledPatValue(const Seconds& model_time, WorldPoint p,Boolean * useEddyUncertainty);//JLM 5/12/99
 
+	virtual WorldRect	GetGridBounds(){return timeGrid->GetGridBounds();}	
 	/*virtual OSErr		GetStartTime(Seconds *startTime);
 	 virtual OSErr		GetEndTime(Seconds *endTime);*/
 	//virtual double		GetStartUVelocity(long index);