Changeset 14304

Timestamp:

02/04/13 07:33:56 (12 years ago)

Author:

Eric.Larour

Message:

CHG: updated to new wrapper interface

Location:

issm/trunk-jpl/src/wrappers/InternalFront

Files:

• InternalFront.cpp (modified) (2 diffs)
• InternalFront.h (modified) (3 diffs)

issm/trunk-jpl/src/wrappers/InternalFront/InternalFront.cpp ¶

@@ -14 +14 @@
         bool*   elementonwater=NULL;
         int*    elements=NULL;
-        int*    connectivity=NULL;
         int*    elementconnectivity=NULL;
         int*    front=NULL;
@@ -20 +19 @@
         bool    found;
         int     numberofelements,numberofsegments;
-        int     N,M;
         int     i,j,ii,jj,id;
+        int     dummy;
 
         /*Boot module: */
         MODULEBOOT();
 
-        /*checks on arguments on the matlab side: */
-        CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InternalFrontUsage);
+        /*checks on arguments: */
+        CHECKARGUMENTS(NLHS,NRHS,&InternalFrontUsage);
 
-        /*Fetch required fields*/
-        FetchData(&numberofelements,mxGetAssignedField(MODEL,0,"numberofelements"));
-        if(numberofelements<=0) _error_("No elements found in the model");
-        FetchData(&elements,&M,&N,mxGetAssignedField(MODEL,0,"elements"));
-        if(M!=numberofelements || N!=3) _error_("Field 'elements' should be of size [md.numberofelements 3]");
-        FetchData(&elementonwater,&M,&N,mxGetAssignedField(MODEL,0,"elementonwater"));
-        if(M!=numberofelements || N!=1) _error_("Field 'elementonwater' should be of size [md.numberofelements 1]");
-        FetchData(&elementconnectivity,&M,&N,mxGetAssignedField(MODEL,0,"elementconnectivity"));
-        if(M!=numberofelements || N!=3) _error_("Field 'elementconnectivity' should be of size [md.numberofelements 3]");
+        /*Fetch inputs: */
+        FetchData(&elements,&numberofelements,&dummy,ELEMENTS);
+        FetchData(&elementonwater,&dummy,&dummy,ELEMENTONWATER);
+        FetchData(&elementconnectivity,&dummy,&dummy,ELEMENTCONNECTIVITY);
 
         /*Allocate and initialize all variables*/

issm/trunk-jpl/src/wrappers/InternalFront/InternalFront.h ¶

@@ -27 +27 @@
 #ifdef _HAVE_MATLAB_MODULES_
 /* serial input macros: */
-#define MODEL prhs[0]
+#define ELEMENTS prhs[0]
+#define ELEMENTONWATER prhs[1]
+#define ELEMENTCONNECTIVITY prhs[2]
 /* serial output macros: */
 #define FRONT (mxArray**)&plhs[0]
@@ -34 +36 @@
 #ifdef _HAVE_PYTHON_MODULES_
 /* serial input macros: */
-#define MODEL PyTuple_GetItem(args,0)
+#define ELEMENTS PyTuple_GetItem(args,0)
+#define ELEMENTONWATER PyTuple_GetItem(args,1)
+#define ELEMENTCONNECTIVITY PyTuple_GetItem(args,2)
 /* serial output macros: */
 #define FRONT output,0]
@@ -43 +47 @@
 #define NLHS  1
 #undef NRHS
-#define NRHS  1
+#define NRHS  3
 
 #endif