Changeset 25516

Timestamp:

09/02/20 16:11:49 (5 years ago)

Author:

jdquinn

Message:

CHG: Using BamgTriangulate instead of delaunayn.

Location:

issm/trunk-jpl

Files:

• src/m/modules/BamgTriangulate.py (modified) (1 diff)
• test/Archives/Archive2004.arch (modified) ( previous)
• test/NightlyRun/test2004.m (modified) (3 diffs)

issm/trunk-jpl/src/m/modules/BamgTriangulate.py

@@ -3 +3 @@
 
 def BamgTriangulate(x, y):
-    """
-    BAMGTRIANGULATE
+    """BAMGTRIANGULATE
 
     Usage:
         index = BamgTriangulate(x, y)
 
-    index: index of the triangulation
-    x, y: coordinates of the nodes
+        index   : index of the triangulation
+        x, y    : coordinates of the nodes
     """
 
-    # Call mex module
+    # Call Python module
     index = BamgTriangulate_python(x, y)
-    # return
-    return index
+
+    return index[0]

issm/trunk-jpl/test/NightlyRun/test2004.m

@@ -154 +154 @@
                         latAIS=delH{:,2};
                         delHAIS=delH{:,3};
-                        points=[longAIS,latAIS];
-                        index=delaunayn(points);
+                        % points=[longAIS,latAIS];
+                        % index=delaunayn(points);
+                        index=BamgTriangulate(longAIS, latAIS);
                         lat=md.mesh.lat; 
                         long=md.mesh.long+360;
@@ -263 +264 @@
                 latGIS=delH(:,2);
                 delHGIS=delH(:,3);
-                points=[longGIS,latGIS];
-                index=delaunayn(points);
+                % points=[longGIS,latGIS];
+                % index=delaunayn(points);
+                index=BamgTriangulate(longGIS, latGIS);
                 lat=md.mesh.lat;
                 long=md.mesh.long+360;
@@ -276 +278 @@
                 latGLA=delH(:,2);
                 delHGLA=sum(delH(:,3:end),2);
-                points=[longGLA,latGLA];
-                index=delaunayn(points);
+                % points=[longGLA,latGLA];
+                % index=delaunayn(points);
+                index=BamgTriangulate(longGLA, latGLA);
                 lat=md.mesh.lat; 
                 long=md.mesh.long+360;