Changeset 2287

Timestamp:

09/23/09 14:29:48 (15 years ago)

Author:

Mathieu Morlighem

Message:

renaming

Location:

issm/trunk/src/c

Files:

• InterpFromMeshToMesh2dx/InterpFromMesh2dToMeshx.cpp (moved) (moved from issm/trunk/src/c/InterpFromMeshToMesh2dx/InterpFromMesh2dx.cpp ) (1 diff)
• InterpFromMeshToMesh2dx/InterpFromMesh2dToMeshx.h (moved) (moved from issm/trunk/src/c/InterpFromMeshToMesh2dx/InterpFromMesh2dx.h ) (1 diff)
• InterpFromMeshToMesh3dx/InterpFromMesh3dToMeshx.cpp (moved) (moved from issm/trunk/src/c/InterpFromMeshToMesh3dx/InterpFromMesh3dx.cpp ) (1 diff)
• InterpFromMeshToMesh3dx/InterpFromMesh3dToMeshx.h (moved) (moved from issm/trunk/src/c/InterpFromMeshToMesh3dx/InterpFromMesh3dx.h ) (1 diff)
• Makefile.am (modified) (2 diffs)
• issm.h (modified) (1 diff)

issm/trunk/src/c/InterpFromMeshToMesh2dx/InterpFromMesh2dToMeshx.cpp

@@ -1 @@
-/*!\file:  InterpFromMesh2dx.cpp
+/*!\file:  InterpFromMeshToMesh2dx.cpp
  * \brief  "c" core code for interpolating values from a structured grid.
  */ 
 
-#include "./InterpFromMesh2dx.h"
+#include "./InterpFromMeshToMesh2dx.h"
 #include "../shared/shared.h"
 
 #undef __FUNCT__ 
-#define __FUNCT__ "InterpFromMesh2dx"
+#define __FUNCT__ "InterpFromMeshToMesh2dx"
 
-int InterpFromMesh2dx( Vec* pdata_prime,double* index_data, double* x_data, double* y_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, int nods_prime,double default_value) {
+int InterpFromMeshToMesh2dx( Vec* pdata_prime,double* index_data, double* x_data, double* y_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, int nods_prime,double default_value) {
 
         /*Output*/

issm/trunk/src/c/InterpFromMeshToMesh2dx/InterpFromMesh2dToMeshx.h

@@ -1 @@
-/*!\file InterpFromMesh2dx.h
+/*!\file InterpFromMeshToMesh2dx.h
  * \brief: header file for Data interpolation routines.
  */
 
-#ifndef _INTERPFROMMESH2DX_H
-#define _INTERPFROMMESH2DX_H
+#ifndef _INTERPFROMMESHTOMESH2DX_H
+#define _INTERPFROMMESHTOMESH2DX_H
 
 #include "../toolkits/toolkits.h"
 
-int InterpFromMesh2dx( Vec* pdata_prime,double* index_data, double* x_data, double* y_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, int nods_prime,double default_value);
+int InterpFromMeshToMesh2dx( Vec* pdata_prime,double* index_data, double* x_data, double* y_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, int nods_prime,double default_value);
 
-#endif /* _INTERPFROMMESH2DX_H */
+#endif /* _INTERPFROMMESHTOMESH2DX_H */
 

issm/trunk/src/c/InterpFromMeshToMesh3dx/InterpFromMesh3dToMeshx.cpp

@@ -1 @@
-/*!\file:  InterpFromMesh3dx.cpp
+/*!\file:  InterpFromMeshToMesh3dx.cpp
  * \brief  "c" core code for interpolating values from a structured grid.
  */ 
 
-#include "./InterpFromMesh3dx.h"
+#include "./InterpFromMeshToMesh3dx.h"
 #include "../shared/shared.h"
 
 #undef __FUNCT__ 
-#define __FUNCT__ "InterpFromMesh3dx"
+#define __FUNCT__ "InterpFromMeshToMesh3dx"
 
-int InterpFromMesh3dx( Vec* pdata_prime,double* index_data, double* x_data, double* y_data, double* z_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, double* z_prime, int nods_prime,double default_value) {
+int InterpFromMeshToMesh3dx( Vec* pdata_prime,double* index_data, double* x_data, double* y_data, double* z_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, double* z_prime, int nods_prime,double default_value) {
 
         /*Output*/

issm/trunk/src/c/InterpFromMeshToMesh3dx/InterpFromMesh3dToMeshx.h

@@ -1 @@
-/*!\file InterpFromMesh3dx.h
+/*!\file InterpFromMeshToMesh3dx.h
  * \brief: header file for Data interpolation routines.
  */
 
-#ifndef _INTERPFROMMESH3DX_H
-#define _INTERPFROMMESH3DX_H
+#ifndef _INTERPFROMMESHTOMESH3DX_H
+#define _INTERPFROMMESHTOMESH3DX_H
 
 #include "../toolkits/toolkits.h"
 
-int InterpFromMesh3dx( Vec* pdata_prime,double* index_data, double* x_data, double* y_data, double* z_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, double* z_prime, int nods_prime,double default_value);
+int InterpFromMeshToMesh3dx( Vec* pdata_prime,double* index_data, double* x_data, double* y_data, double* z_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, double* z_prime, int nods_prime,double default_value);
 
-#endif /* _INTERPFROMMESH3DX_H */
+#endif /* _INTERPFROMMESHTOMESH3DX_H */
 

issm/trunk/src/c/Makefile.am

@@ -249 +249 @@
                                         ./MpcNodesx/MpcNodesx.h\
                                         ./MpcNodesx/MpcNodesx.cpp\
-                                        ./InterpFromGridx/InterpFromGridx.cpp\
-                                        ./InterpFromGridx/InterpFromGridx.h\
-                                        ./InterpFromMesh2dx/InterpFromMesh2dx.cpp\
-                                        ./InterpFromMesh2dx/InterpFromMesh2dx.h\
-                                        ./InterpFromMesh3dx/InterpFromMesh3dx.cpp\
-                                        ./InterpFromMesh3dx/InterpFromMesh3dx.h\
+                                        ./InterpFromGridToMeshx/InterpFromGridToMeshx.cpp\
+                                        ./InterpFromGridToMeshx/InterpFromGridToMeshx.h\
+                                        ./InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp\
+                                        ./InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h\
+                                        ./InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp\
+                                        ./InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.h\
+                                        ./InterpFromMeshToGridx/InterpFromMeshToGridx.cpp\
+                                        ./InterpFromMeshToGridx/InterpFromMeshToGridx.h\
                                         ./HoleFillerx/HoleFillerx.cpp\
                                         ./HoleFillerx/HoleFillerx.h\
@@ -551 +553 @@
                                         ./InterpFromMesh3dx/InterpFromMesh3dx.cpp\
                                         ./InterpFromMesh3dx/InterpFromMesh3dx.h\
+                                        ./InterpFromMeshToGridx/InterpFromMeshToGridx.cpp\
+                                        ./InterpFromMeshToGridx/InterpFromMeshToGridx.h\
                                         ./HoleFillerx/HoleFillerx.cpp\
                                         ./HoleFillerx/HoleFillerx.h\

issm/trunk/src/c/issm.h

@@ -26 +26 @@
 #include "./ContourToMeshx/ContourToMeshx.h"
 #include "./ContourToNodesx/ContourToNodesx.h"
-#include "./InterpFromGridx/InterpFromGridx.h"
-#include "./InterpFromMesh2dx/InterpFromMesh2dx.h"
-#include "./InterpFromMesh3dx/InterpFromMesh3dx.h"
+#include "./InterpFromGridToMeshx/InterpFromGridToMeshx.h"
+#include "./InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h"
+#include "./InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.h"
+#include "./InterpFromMeshToGridx/InterpFromMeshToGridx.h"
 #include "./HoleFillerx/HoleFillerx.h"
 #include "./MeshPartitionx/MeshPartitionx.h"