Changeset 15396 for issm/trunk/src/wrappers/InterpFromGridToMesh

Timestamp:

07/02/13 09:24:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 15394

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.cpp (modified) (2 diffs)
• src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.h (modified) (1 diff)

issm/trunk

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

issm/trunk/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.cpp

@@ -2 +2 @@
  * \brief: data interpolation from a list of (x,y,values) into mesh vertices
 */
-        
+
 #include "./InterpFromGridToMesh.h"
 
 void InterpFromGridToMeshUsage(void){/*{{{*/
-        _pprintLine_("INTERPFROMGRIDTOMESH - interpolation from a grid onto a list of points");
-        _pprintLine_("");
-        _pprintLine_("   This function is a multi-threaded mex file that interpolates a field");
-        _pprintLine_("   defined on a grid onto a list of points");
-        _pprintLine_("");
-        _pprintLine_("   Usage:");
-        _pprintLine_("      data_mesh=InterpFromGridToMesh(x,y,data,x_mesh,y_mesh,default_value);");
-        _pprintLine_("");
-        _pprintLine_("      data: matrix holding the data to be interpolated onto the mesh.");
-        _pprintLine_("      x,y: coordinates of matrix data. (x and y must be in increasing order)");
-        _pprintLine_("      x_mesh,y_mesh: coordinates of the points onto which we interpolate.");
-        _pprintLine_("      default_value: default value if no data is found (holes).");
-        _pprintLine_("      data_mesh: vector of mesh interpolated data.");
-        _pprintLine_("");
-        _pprintLine_("   Example:");
-        _pprintLine_("      load('velocities.mat');");
-        _pprintLine_("      md.inversion.vx_obs=InterpFromGridToMesh(x_n,y_m,vx,md.mesh.x,md.mesh.y,0);");
-        _pprintLine_("");
+        _printf0_("INTERPFROMGRIDTOMESH - interpolation from a grid onto a list of points\n");
+        _printf0_("\n");
+        _printf0_("   This function is a multi-threaded mex file that interpolates a field\n");
+        _printf0_("   defined on a grid onto a list of points\n");
+        _printf0_("\n");
+        _printf0_("   Usage:\n");
+        _printf0_("      data_mesh=InterpFromGridToMesh(x,y,data,x_mesh,y_mesh,default_value);\n");
+        _printf0_("\n");
+        _printf0_("      data: matrix holding the data to be interpolated onto the mesh.\n");
+        _printf0_("      x,y: coordinates of matrix data. (x and y must be in increasing order)\n");
+        _printf0_("      x_mesh,y_mesh: coordinates of the points onto which we interpolate.\n");
+        _printf0_("      default_value: default value if no data is found (holes).\n");
+        _printf0_("      data_mesh: vector of mesh interpolated data.\n");
+        _printf0_("\n");
+        _printf0_("   Example:\n");
+        _printf0_("      load('velocities.mat');\n");
+        _printf0_("      md.inversion.vx_obs=InterpFromGridToMesh(x_n,y_m,vx,md.mesh.x,md.mesh.y,0);\n");
+        _printf0_("\n");
 }/*}}}*/
 WRAPPER(InterpFromGridToMesh){
@@ -42 +42 @@
 
         /* output: */
-        SeqVec<double>*  data_mesh=NULL;
+        IssmSeqVec<double>*  data_mesh=NULL;
 
         /*Boot module: */

issm/trunk/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.h

@@ -17 +17 @@
 #endif
 
-#include "../../c/include/globals.h"
+#include "../bindings.h"
+#include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache