Changeset 9074

Timestamp:

07/19/11 16:28:29 (14 years ago)

Author:

Mathieu Morlighem

Message:

size of x_m and y_m are now the same as matric size

Location:

issm/trunk/src

Files:

• c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp (modified) (5 diffs)
• m/model/kmlimagesc.m (modified) (1 diff)
• mex/InterpFromMeshToGrid/InterpFromMeshToGrid.cpp (modified) (1 diff)

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

@@ -11 +11 @@
         /*Output*/
         double* griddata=NULL;
-        double* x_m=NULL;
-        double* y_m=NULL;
+        double* x_grid=NULL;
+        double* y_grid=NULL;
 
         /*Intermediary*/
@@ -28 +28 @@
         double data_value;
         double cornersouth;
-        double* x_grid=NULL;
-        double* y_grid=NULL;
 
         /*some checks*/
@@ -49 +47 @@
         /*First, allocate pointers: */
         griddata=(double*)xcalloc(nlines*ncols,sizeof(double));
-        x_m=(double*)xcalloc(ncols+1,sizeof(double));
-        y_m=(double*)xcalloc(nlines+1,sizeof(double));
         x_grid=(double*)xcalloc(ncols,sizeof(double));
         y_grid=(double*)xcalloc(nlines,sizeof(double));
@@ -65 +61 @@
         /*Compute coordinates lists*/
         // EAST = ACTUAL WEST !!!!!!!!!!!!!!!
-        cornersouth=cornernorth-nlines*yposting;
-        for(i=0;i<nlines;i++) y_grid[i]= cornersouth + yposting/2 + yposting*i;
-        for(i=0;i<ncols; i++) x_grid[i]= cornereast  + xposting/2 + xposting*i;
-        for(i=0;i<=nlines;i++)   y_m[i]= cornersouth + yposting*i;
-        for(i=0;i<=ncols; i++)   x_m[i]= cornereast  + xposting*i;
+        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;
 
         /*Initialize coordintes and griddata*/
@@ -180 +174 @@
         /*Assign output pointers:*/
         *pgriddata=griddata;
-        *px_m=x_m;
-        *py_m=y_m;
+        *px_m=x_grid;
+        *py_m=y_grid;
 }

issm/trunk/src/m/model/kmlimagesc.m

@@ -51 +51 @@
 [x_m,y_m,field]=InterpFromMeshToGrid(md.elements,md.long,md.lat,field,minlong,maxlat,posting,posting,nlines,ncols,NaN);
 field=flipud(field);
-x_m=(x_m(1:end-1)+x_m(2:end))/2;
-y_m=(y_m(1:end-1)+y_m(2:end))/2;
 
 %massage  and log:

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

@@ -51 +51 @@
 
         /*Write results: */
-        WriteMatlabData(XM,x_m,ncols+1);
-        WriteMatlabData(YM,y_m,nlines+1);
+        WriteMatlabData(XM,x_m,ncols);
+        WriteMatlabData(YM,y_m,nlines);
         WriteMatlabData(GRIDDATA,griddata,nlines,ncols);