Changeset 2290


Ignore:
Timestamp:
09/23/09 14:45:01 (15 years ago)
Author:
Mathieu Morlighem
Message:

renaming

Location:
issm/trunk/src/mex
Files:
6 moved

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.cpp

    r2289 r2290  
    1 /*!\file InterpFromGrid.c
     1/*!\file InterpFromGridToMesh.c
    22 * \brief: data interpolation from a list of (x,y,values) into mesh grids
    33 
    4         InterpFromGrid.c
     4        InterpFromGridToMesh.c
    55
    66        usage:
    7         data_mesh=InterpFromGrid(x,y,data,x_mesh,y_mesh);
     7        data_mesh=InterpFromGridToMesh(x,y,data,x_mesh,y_mesh);
    88       
    99        where:
     
    1919*/
    2020       
    21 #include "./InterpFromGrid.h"
     21#include "./InterpFromGridToMesh.h"
    2222
    2323void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) {
     
    5050
    5151        /*checks on arguments on the matlab side: */
    52         CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InterpFromGridUsage);
     52        CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InterpFromGridToMeshUsage);
    5353
    5454        /*Input datasets: */
     
    6161
    6262        /* Run core computations: */
    63         InterpFromGridx( &data_mesh, x, x_rows,  y, y_rows, data, data_rows,data_cols, x_mesh, y_mesh, x_mesh_rows,default_value);
     63        InterpFromGridToMeshx( &data_mesh, x, x_rows,  y, y_rows, data, data_rows,data_cols, x_mesh, y_mesh, x_mesh_rows,default_value);
    6464
    6565        /*Write data: */
     
    7070}
    7171
    72 void InterpFromGridUsage(void)
     72void InterpFromGridToMeshUsage(void)
    7373{
    7474        _printf_("   usage:\n");
    75         _printf_("   data_mesh=InterpFromGrid(x,y,data,x_mesh,y_mesh,defult_value);\n\n");
     75        _printf_("   data_mesh=InterpFromGridToMesh(x,y,data,x_mesh,y_mesh,defult_value);\n\n");
    7676        _printf_("   where:\n");
    7777        _printf_("      x,y: coordinates of matrix data\n");
  • issm/trunk/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.h

    r2289 r2290  
    1 /*!\file InterpFromGrid.h
     1/*!\file InterpFromGridToMesh.h
    22 * \brief: prototype for Data Interpolation mex module.
    33 */
    44
    5 #ifndef _InterpFromGrid_H
    6 #define _InterpFromGrid_H
     5#ifndef _InterpFromGridToMesh_H
     6#define _InterpFromGridToMesh_H
    77
    88/* local prototypes: */
    9 void InterpFromGridUsage(void);
     9void InterpFromGridToMeshUsage(void);
    1010
    1111#include "../../c/issm.h"
    1212
    1313#undef __FUNCT__
    14 #define __FUNCT__  "InterpFromGrid"
     14#define __FUNCT__  "InterpFromGridToMesh"
    1515
    1616#undef CLEANUP
    17 #define CLEANUP InterpFromGridLocalCleanup();
     17#define CLEANUP InterpFromGridToMeshLocalCleanup();
    1818
    1919
     
    3535#define NRHS  6
    3636
    37 #endif  /* _INTERPFROMGRId_H */
     37#endif  /* _INTERPFROMGRIDTOMESH_H */
  • issm/trunk/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp

    r2288 r2290  
    1 /*!\file InterpFromMesh2d.c
     1/*!\file InterpFromMeshToMesh2d.c
    22 * \brief: data interpolation from a list of (x,y,values) into mesh grids
    33 
    4         InterpFromMesh2d.c
     4        InterpFromMeshToMesh2d.c
    55
    66        usage:
    7         data_mesh=InterpFromMesh2d(index,x,y,data,x_mesh,y_mesh);
     7        data_mesh=InterpFromMeshToMesh2d(index,x,y,data,x_mesh,y_mesh);
    88       
    99        where:
     
    1919*/
    2020       
    21 #include "./InterpFromMesh2d.h"
     21#include "./InterpFromMeshToMesh2d.h"
    2222
    2323void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) {
     
    5757
    5858        /*checks on arguments on the matlab side: */
    59         CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InterpFromMesh2dUsage);
     59        CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InterpFromMeshToMesh2dUsage);
    6060
    6161        /*Input datasets: */
     
    8282
    8383        /* Run core computations: */
    84         InterpFromMesh2dx(&data_prime,index_data,x_data,y_data,nods_data,nels_data,data,data_rows,x_prime,y_prime,nods_prime,default_value);
     84        InterpFromMeshToMesh2dx(&data_prime,index_data,x_data,y_data,nods_data,nels_data,data,data_rows,x_prime,y_prime,nods_prime,default_value);
    8585
    8686        /*Write data: */
     
    9191}
    9292
    93 void InterpFromMesh2dUsage(void)
     93void InterpFromMeshToMesh2dUsage(void)
    9494{
    9595        _printf_("   usage:\n");
    96         _printf_("      data_prime=InterpFromMesh2d(index,x,y,data,x_prime,y_prime,default_value);\n\n");
     96        _printf_("      data_prime=InterpFromMeshToMesh2d(index,x,y,data,x_prime,y_prime,default_value);\n\n");
    9797        _printf_("   where:\n");
    9898        _printf_("      x,y: coordinates of the nodes where data is defined\n");
  • issm/trunk/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h

    r2288 r2290  
    1 /*!\file InterpFromMesh2d.h
     1/*!\file InterpFromMeshToMesh2d.h
    22 * \brief: prototype for Data Interpolation mex module.
    33 */
     
    77
    88/* local prototypes: */
    9 void InterpFromMesh2dUsage(void);
     9void InterpFromMeshToMesh2dUsage(void);
    1010
    1111#include "../../c/issm.h"
    1212
    1313#undef __FUNCT__
    14 #define __FUNCT__  "InterpFromMesh2d"
     14#define __FUNCT__  "InterpFromMeshToMesh2d"
    1515
    1616#undef CLEANUP
    17 #define CLEANUP InterpFromMesh2dLocalCleanup();
     17#define CLEANUP InterpFromMeshToMesh2dLocalCleanup();
    1818
    1919
     
    3636#define NRHS  7
    3737
    38 #endif  /* _INTERPFROMMESH2D_H */
     38#endif  /* _INTERPFROMMESHTOMESH2D_H */
  • issm/trunk/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp

    r2288 r2290  
    1 /*!\file InterpFromMesh3d.c
     1/*!\file InterpFromMeshToMesh3d.c
    22 * \brief: data interpolation from a list of (x,y,values) into mesh grids
    33 
    4         InterpFromMesh3d.c
     4        InterpFromMeshToMesh3d.c
    55
    66        usage:
    7         data_mesh=InterpFromMesh3d(index,x,y,z,data,x_mesh,y_mesh,z_mesh);
     7        data_mesh=InterpFromMeshToMesh3d(index,x,y,z,data,x_mesh,y_mesh,z_mesh);
    88       
    99        where:
     
    1919*/
    2020       
    21 #include "./InterpFromMesh3d.h"
     21#include "./InterpFromMeshToMesh3d.h"
    2222
    2323void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) {
     
    6161
    6262        /*checks on arguments on the matlab side: */
    63         CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InterpFromMesh3dUsage);
     63        CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InterpFromMeshToMesh3dUsage);
    6464
    6565        /*Input datasets: */
     
    8787
    8888        /* Run core computations: */
    89         InterpFromMesh3dx(&data_prime,index_data,x_data,y_data,z_data,nods_data,nels_data,data,data_rows,x_prime,y_prime,z_prime,nods_prime,default_value);
     89        InterpFromMeshToMesh3dx(&data_prime,index_data,x_data,y_data,z_data,nods_data,nels_data,data,data_rows,x_prime,y_prime,z_prime,nods_prime,default_value);
    9090
    9191        /*Write data: */
     
    9696}
    9797
    98 void InterpFromMesh3dUsage(void)
     98void InterpFromMeshToMesh3dUsage(void)
    9999{
    100100        _printf_("   usage:\n");
    101         _printf_("      data_prime=InterpFromMesh3d(index,x,y,z,data,x_prime,y_prime,z_prime,default_value);\n\n");
     101        _printf_("      data_prime=InterpFromMeshToMesh3d(index,x,y,z,data,x_prime,y_prime,z_prime,default_value);\n\n");
    102102        _printf_("   where:\n");
    103103        _printf_("      x,y,z: coordinates of the nodes where data is defined\n");
  • issm/trunk/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h

    r2288 r2290  
    1 /*!\file InterpFromMesh3d.h
     1/*!\file InterpFromMeshToMesh3d.h
    22 * \brief: prototype for Data Interpolation mex module.
    33 */
     
    77
    88/* local prototypes: */
    9 void InterpFromMesh3dUsage(void);
     9void InterpFromMeshToMesh3dUsage(void);
    1010
    1111#include "../../c/issm.h"
    1212
    1313#undef __FUNCT__
    14 #define __FUNCT__  "InterpFromMesh3d"
     14#define __FUNCT__  "InterpFromMeshToMesh3d"
    1515
    1616#undef CLEANUP
    17 #define CLEANUP InterpFromMesh3dLocalCleanup();
     17#define CLEANUP InterpFromMeshToMesh3dLocalCleanup();
    1818
    1919
     
    3838#define NRHS  9
    3939
    40 #endif  /* _INTERPFROMMESH3D_H */
     40#endif  /* _INTERPFROMMESHTOMESH3D_H */
Note: See TracChangeset for help on using the changeset viewer.