Changeset 20847

Timestamp:

07/03/16 13:18:10 (9 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing ContourToMesh

Location:

issm/trunk-jpl/src

Files:

• m/modules/ContourToMesh.m (modified) (1 diff)
• wrappers/ContourToMesh/ContourToMesh.cpp (modified) (1 diff)

issm/trunk-jpl/src/m/modules/ContourToMesh.m

@@ -27 +27 @@
 %Call mex module
 [in_nod,in_elem] = ContourToMesh_matlab(index,x,y,contourname,interptype,edgevalue);
+
+switch(interptype)
+        case 'element'
+                varargout{1} = in_elem;
+        case 'node'
+                varargout{1} = in_nod;
+        case 'node and element'
+                varargout{1} = in_nod;
+                varargout{2} = in_elem;
+        otherwise
+                error(['interpolation type ''' interptype ''' not supported yet']);
+end

issm/trunk-jpl/src/wrappers/ContourToMesh/ContourToMesh.cpp

@@ -70 +70 @@
 
         /* output: */
-        if (strcmp(interptype,"node")==0){
-                WriteData(PLHS0,in_nod,nods);
-                WriteData(PLHS1);
-        }
-        else if (strcmp(interptype,"element")==0){
-                WriteData(PLHS0,in_elem,nel);
-                WriteData(PLHS1);
-        }
-        else if (strcmp(interptype,"element and node")==0){
-                WriteData(PLHS0,in_nod,nods);
-                WriteData(PLHS1,in_elem,nel);
-        }
-        else _error_("wrong interpolation type");
+        WriteData(PLHS0,in_nod,nods);
+        WriteData(PLHS1,in_elem,nel);
 
         /*Clean up*/