Changeset 9242

Timestamp:

08/10/11 08:24:22 (14 years ago)

Author:

Mathieu Morlighem

Message:

replaced cornereast by xmin and cornernorth by ymax (too confusing otherwise)

Location:

issm/trunk/src

Files:

• c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp (modified) (4 diffs)
• c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.h (modified) (1 diff)
• m/model/plot/plot_overlay.m (modified) (2 diffs)
• mex/InterpFromMeshToGrid/InterpFromMeshToGrid.cpp (modified) (4 diffs)
• mex/InterpFromMeshToGrid/InterpFromMeshToGrid.h (modified) (1 diff)

issm/trunk/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp

@@ -7 +7 @@
 #include "../../include/include.h"
 
-void InterpFromMeshToGridx(double** px_m,double** py_m,double** pgriddata,double* index_mesh, double* x_mesh, double* y_mesh, int nods,int nels, double* data_mesh, int data_length, double cornereast,double cornernorth,double xposting,double yposting,int nlines,int ncols,double default_value) {
+void InterpFromMeshToGridx(double** px_m,double** py_m,double** pgriddata,double* index_mesh, double* x_mesh, double* y_mesh, int nods,int nels, double* data_mesh, int data_length, double xmin,double ymax,double xposting,double yposting,int nlines,int ncols,double default_value) {
 
         /*Output*/
@@ -20 +20 @@
         bool   debug;
         int    xflip,yflip;
-        double area;
+        double area,ymin;
         double area_1,area_2,area_3;
         double x_tria_min,y_tria_min;
@@ -27 +27 @@
         double x_grid_max,y_grid_max;
         double data_value;
-        double cornersouth;
 
         /*some checks*/
@@ -60 +59 @@
 
         /*Compute coordinates lists*/
-        // EAST = ACTUAL WEST !!!!!!!!!!!!!!!
-        cornersouth=cornernorth-(nlines-1)*yposting;
-        for(i=0;i<nlines;i++)   y_grid[i]= cornersouth + yposting*i;
-        for(i=0;i<ncols; i++)   x_grid[i]= cornereast  + xposting*i;
+        ymin=ymax-(nlines-1)*yposting;
+        for(i=0;i<nlines;i++)   y_grid[i]= ymin + yposting*i;
+        for(i=0;i<ncols; i++)   x_grid[i]= xmin + xposting*i;
 
         /*Initialize coordintes and griddata*/

issm/trunk/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.h

@@ -8 +8 @@
 #include "../../toolkits/toolkits.h"
 
-void InterpFromMeshToGridx(double** px_m,double** py_m,double** pgriddata,double* index_mesh, double* x_mesh, double* y_mesh, int nods,int nels, double* data_mesh, int data_length, double cornereast,double cornernorth,double xposting,double yposting,int nlines,int ncols,double default_value);
+void InterpFromMeshToGridx(double** px_m,double** py_m,double** pgriddata,double* index_mesh, double* x_mesh, double* y_mesh, int nods,int nels, double* data_mesh, int data_length, double xmin,double ymax,double xposting,double yposting,int nlines,int ncols,double default_value);
 
 #endif /* _INTERPFROMMESHTOGRIDX_H */

issm/trunk/src/m/model/plot/plot_overlay.m

@@ -43 +43 @@
 
 %InterpFromMeshToGrid
-cornereast=min(md.sarxm); cornernorth=max(md.sarym);
+xmin=min(md.sarxm);
+ymax=max(md.sarym);
 xspacing=(max(md.sarxm)-min(md.sarxm))/(length(md.sarxm));
 yspacing=(max(md.sarym)-min(md.sarym))/(length(md.sarym));
@@ -49 +50 @@
 ncols =length(md.sarxm);
 disp('Interpolating data on grid...');
-[x_m y_m data_grid]=InterpFromMeshToGrid(elements,x,y,data,cornereast,cornernorth,xspacing,yspacing,nlines,ncols,NaN);
+[x_m y_m data_grid]=InterpFromMeshToGrid(elements,x,y,data,xmin,ymax,xspacing,yspacing,nlines,ncols,NaN);
 
 %Process data_grid

issm/trunk/src/mex/InterpFromMeshToGrid/InterpFromMeshToGrid.cpp

@@ -15 +15 @@
         double* meshdata=NULL;
         int     meshdata_length;
-        double  cornereast;
-        double  cornernorth;
+        double  xmin;
+        double  ymax;
         double  xposting;
         double  yposting;
@@ -39 +39 @@
         FetchMatlabData(&y,NULL,NULL,Y);
         FetchMatlabData(&meshdata,&meshdata_length,NULL,MESHDATA);
-        FetchMatlabData(&cornereast,CORNEREAST);
-        FetchMatlabData(&cornernorth,CORNERNORTH);
+        FetchMatlabData(&xmin,XMIN);
+        FetchMatlabData(&ymax,YMAX);
         FetchMatlabData(&xposting,XPOSTING);
         FetchMatlabData(&yposting,YPOSTING);
@@ -48 +48 @@
 
         /*Call core of computation: */
-        InterpFromMeshToGridx(&x_m,&y_m,&griddata,index,x,y,nods,nel,meshdata,meshdata_length,cornereast,cornernorth,xposting,yposting,nlines,ncols,default_value);
+        InterpFromMeshToGridx(&x_m,&y_m,&griddata,index,x,y,nods,nel,meshdata,meshdata_length,xmin,ymax,xposting,yposting,nlines,ncols,default_value);
 
         /*Write results: */
@@ -70 +70 @@
         _printf_(true,"\n");
         _printf_(true,"   Usage:\n");
-        _printf_(true,"      [x_m,y_m,griddata]=InterpFromMeshToGrid(index,x,y,data,cornereast,cornernorth,xposting,yposting,nlines,ncols,default_value)\n");
+        _printf_(true,"      [x_m,y_m,griddata]=InterpFromMeshToGrid(index,x,y,data,xmin,ymax,xposting,yposting,nlines,ncols,default_value)\n");
         _printf_(true,"\n");
         _printf_(true,"      index,x,y: delaunay triangulation defining the mesh.\n");
         _printf_(true,"      meshdata: vertex values of data to be interpolated.\n");
-        _printf_(true,"      cornereast,cornernorth,posting,nlines,ncols: parameters that define the grid\n");
+        _printf_(true,"      xmin,ymax,posting,nlines,ncols: parameters that define the grid\n");
         _printf_(true,"      default_value: value of points located out of the mesh.\n");
         _printf_(true,"\n");

issm/trunk/src/mex/InterpFromMeshToGrid/InterpFromMeshToGrid.h

@@ -23 +23 @@
 #define Y (mxArray*)prhs[2]
 #define MESHDATA (mxArray*)prhs[3]
-#define CORNEREAST (mxArray*)prhs[4]
-#define CORNERNORTH (mxArray*)prhs[5]
+#define XMIN (mxArray*)prhs[4]
+#define YMAX (mxArray*)prhs[5]
 #define XPOSTING (mxArray*)prhs[6]
 #define YPOSTING (mxArray*)prhs[7]