Changeset 14904

Timestamp:

05/05/13 10:12:40 (12 years ago)

Author:

Eric.Larour

Message:

CHG: merged xMemCpy and alloc.h into MemOps.h in the src/c/shared/MemOps/MemOps include file. Easier
to track down, and makes more sense.

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• classes/ToolkitOptions.cpp (modified) (1 diff)
• classes/objects/Bucket.h (modified) (1 diff)
• classes/objects/Contour.h (modified) (1 diff)
• classes/objects/Options/GenericOption.h (modified) (1 diff)
• shared/Alloc (deleted)
• shared/Exceptions/exprintf.cpp (modified) (1 diff)
• shared/Exp/ExpWrite.cpp (modified) (1 diff)
• shared/Matrix/MatrixUtils.cpp (modified) (1 diff)
• shared/MemOps/MemOps.h (copied) (copied from issm/trunk-jpl/src/c/shared/Alloc/alloc.h ) (1 diff)
• shared/MemOps/xMemCpy.h (deleted)
• shared/Numerics/GaussPoints.cpp (modified) (1 diff)
• shared/Numerics/XZvectorsToCoordinateSystem.cpp (modified) (1 diff)
• shared/Threads/LaunchThread.cpp (modified) (1 diff)
• shared/TriMesh/SplitMeshForRifts.cpp (modified) (1 diff)
• shared/TriMesh/TriMeshUtils.cpp (modified) (1 diff)
• shared/shared.h (modified) (2 diffs)
• toolkits/issm/IssmAbsMat.h (modified) (1 diff)
• toolkits/issm/IssmAbsVec.h (modified) (1 diff)
• toolkits/issm/IssmDenseMat.h (modified) (1 diff)
• toolkits/issm/IssmMat.h (modified) (1 diff)
• toolkits/issm/IssmMpiDenseMat.h (modified) (1 diff)
• toolkits/issm/IssmMpiVec.h (modified) (1 diff)
• toolkits/issm/IssmSeqVec.h (modified) (1 diff)
• toolkits/issm/IssmToolkitUtils.cpp (modified) (1 diff)
• toolkits/issm/IssmVec.h (modified) (1 diff)
• toolkits/mpi/patches/GetOwnershipBoundariesFromRange.cpp (modified) (1 diff)
• toolkits/mumps/MpiDenseMumpsSolve.cpp (modified) (1 diff)
• toolkits/petsc/objects/PetscSolver.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -181 +181 @@
                                         ./Container/Vertices.cpp\
                                         ./shared/shared.h\
-                                        ./shared/Alloc/alloc.h\
-                                        ./shared/MemOps/xMemCpy.h\
+                                        ./shared/MemOps/MemOps.h\
                                         ./shared/Matrix/matrix.h\
                                         ./shared/Matrix/MatrixUtils.cpp\

issm/trunk-jpl/src/c/classes/ToolkitOptions.cpp

@@ -14 +14 @@
 #include "../include/macros.h"
 #include "../shared/Exceptions/exceptions.h"
-#include "../shared/Alloc/alloc.h"
+#include "../shared/MemOps/MemOps.h"
 
 void ToolkitOptions::Init(char* options){ /*{{{*/

issm/trunk-jpl/src/c/classes/objects/Bucket.h

@@ -9 +9 @@
 /*{{{*/
 #include "./Object.h"
-#include "../../shared/Alloc/alloc.h"
+#include "../../shared/MemOps/MemOps.h"
 #include "../../include/macros.h"
 #include "../../Container/DataSet.h"

issm/trunk-jpl/src/c/classes/objects/Contour.h

@@ -10 +10 @@
 #include "../../include/include.h"
 #include "../../shared/Exceptions/exceptions.h"
-#include "../../shared/Alloc/alloc.h"
-#include "../../shared/MemOps/xMemCpy.h"
+#include "../../shared/MemOps/MemOps.h"
 #include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/c/classes/objects/Options/GenericOption.h

@@ -17 +17 @@
 #include "../../../include/include.h"
 #include "../../../shared/Exceptions/exceptions.h"
-#include "../../../shared/Alloc/alloc.h"
-#include "../../../shared/MemOps/xMemCpy.h"
+#include "../../../shared/MemOps/MemOps.h"
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/c/shared/Exceptions/exprintf.cpp

@@ -8 +8 @@
 #include <stdarg.h>
 #include <stdio.h>
-#include "../Alloc/alloc.h"
+#include "../MemOps/MemOps.h"
 
 char* exprintf(const char* format,...){

issm/trunk-jpl/src/c/shared/Exp/ExpWrite.cpp

@@ -5 +5 @@
  */
 #include <stdio.h>
-#include "../Alloc/alloc.h"
+#include "../MemOps/MemOps.h"
 #include "../../include/include.h"
 #include "../Exceptions/exceptions.h"

issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp

@@ -7 +7 @@
 #include "./matrix.h"
 #include "../Exceptions/exceptions.h"
-#include "../Alloc/alloc.h"
+#include "../MemOps/MemOps.h"
 #include <stdio.h>
 #include <sys/types.h>

issm/trunk-jpl/src/c/shared/MemOps/MemOps.h

@@ -135 +135 @@
 #endif 
 }/*}}}*/
+template <class T>  T* xMemCpy(T* dest, const T* src, unsigned int size) {/*{{{*/
+  assert(dest); assert(src);
+  for (int i=0; i<size;++i) 
+    dest[i]=src[i];
+  return dest;
+};
+/*}}}*/
+
 
 #endif

issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp

@@ -3 +3 @@
 #include "../../include/include.h"
 #include "./GaussPoints.h"
-#include "../Alloc/alloc.h"
+#include "../MemOps/MemOps.h"
 #include "../Exceptions/exceptions.h"
 #include <math.h>

issm/trunk-jpl/src/c/shared/Numerics/XZvectorsToCoordinateSystem.cpp

@@ -1 @@
-#include "../Alloc/alloc.h"
+#include "../MemOps/MemOps.h"
 #include "../../include/include.h"
 #include "../Exceptions/exceptions.h"

issm/trunk-jpl/src/c/shared/Threads/LaunchThread.cpp

@@ -20 +20 @@
 
 #include "./issm_threads.h"
-#include "../Alloc/alloc.h"
+#include "../MemOps/MemOps.h"
 #include "../Exceptions/exceptions.h"
 #include "../../include/include.h"

issm/trunk-jpl/src/c/shared/TriMesh/SplitMeshForRifts.cpp

@@ -3 +3 @@
  */
 #include "./trimesh.h"
-#include "../Alloc/alloc.h"
+#include "../MemOps/MemOps.h"
 
 int SplitMeshForRifts(int* pnel,int** pindex,int* pnods,double** px,double** py,int* pnsegs,int** psegments,int** psegmentmarkerlist){

issm/trunk-jpl/src/c/shared/TriMesh/TriMeshUtils.cpp

@@ -7 +7 @@
 #include "./trimesh.h"
 #include "../Exceptions/exceptions.h"
-#include "../Alloc/alloc.h"
+#include "../MemOps/MemOps.h"
 #include "../../include/include.h"
 

issm/trunk-jpl/src/c/shared/shared.h

@@ -6 +6 @@
 #define _SHARED_H_
 
-#include "./Alloc/alloc.h"
+#include "./MemOps/MemOps.h"
 #include "./Bamg/shared.h"
 #include "./Elements/elements.h"
@@ -12 +12 @@
 #include "./Exp/exp.h"
 #include "./Matrix/matrix.h"
-#include "./MemOps/xMemCpy.h"
 #include "./Numerics/numerics.h"
 #include "./Sorting/sorting.h"

issm/trunk-jpl/src/c/toolkits/issm/IssmAbsMat.h

@@ -20 +20 @@
 
 #include "../../shared/Exceptions/exceptions.h"
-#include "../../shared/MemOps/xMemCpy.h"
-#include "../../shared/Alloc/alloc.h"
+#include "../../shared/MemOps/MemOps.h"
 #include "../../include/macros.h"
 #include "./IssmAbsVec.h"

issm/trunk-jpl/src/c/toolkits/issm/IssmAbsVec.h

@@ -20 +20 @@
 
 #include "../../shared/Exceptions/exceptions.h"
-#include "../../shared/MemOps/xMemCpy.h"
-#include "../../shared/Alloc/alloc.h"
+#include "../../shared/MemOps/MemOps.h"
 #include "../../include/macros.h"
 #include <math.h>

issm/trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h

@@ -19 +19 @@
 #include "./IssmSeqVec.h"
 #include "../../shared/Exceptions/exceptions.h"
-#include "../../shared/MemOps/xMemCpy.h"
-#include "../../shared/Alloc/alloc.h"
+#include "../../shared/MemOps/MemOps.h"
 #include "../../include/macros.h"
 #include "../../toolkits/gsl/gslincludes.h"

issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h

@@ -15 +15 @@
 
 #include "../../shared/Exceptions/exceptions.h"
-#include "../../shared/MemOps/xMemCpy.h"
-#include "../../shared/Alloc/alloc.h"
+#include "../../shared/MemOps/MemOps.h"
 #include "../../include/macros.h"
 #include "../../classes/ToolkitOptions.h"

issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h

@@ -19 +19 @@
 
 #include "../../shared/Exceptions/exceptions.h"
-#include "../../shared/MemOps/xMemCpy.h"
-#include "../../shared/Alloc/alloc.h"
+#include "../../shared/MemOps/MemOps.h"
 #include "../../include/macros.h"
 #include "../../Container/DataSet.h"

issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h

@@ -19 +19 @@
 
 #include "../../shared/Exceptions/exceptions.h"
-#include "../../shared/MemOps/xMemCpy.h"
-#include "../../shared/Alloc/alloc.h"
+#include "../../shared/MemOps/MemOps.h"
 #include "../../include/macros.h"
 #include "../../io/io.h"

issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h

@@ -18 +18 @@
 
 #include "../../shared/Exceptions/exceptions.h"
-#include "../../shared/MemOps/xMemCpy.h"
-#include "../../shared/Alloc/alloc.h"
+#include "../../shared/MemOps/MemOps.h"
 #include "../../include/macros.h"
 #include <math.h>

issm/trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp

@@ -11 +11 @@
 #endif
 
-#include "../../shared/MemOps/xMemCpy.h"
-#include "../../shared/Alloc/alloc.h"
+#include "../../shared/MemOps/MemOps.h"
 #include "../../io/Comm/Comm.h"
 #include "../../include/macros.h"

issm/trunk-jpl/src/c/toolkits/issm/IssmVec.h

@@ -16 +16 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../shared/Exceptions/exceptions.h"
-#include "../../shared/MemOps/xMemCpy.h"
-#include "../../shared/Alloc/alloc.h"
+#include "../../shared/MemOps/MemOps.h"
 #include "../../include/macros.h"
 #include "./IssmToolkitUtils.h"

issm/trunk-jpl/src/c/toolkits/mpi/patches/GetOwnershipBoundariesFromRange.cpp

@@ -11 +11 @@
 
 #include <stdio.h>
-#include "../../../shared/Alloc/alloc.h"
+#include "../../../shared/MemOps/MemOps.h"
 #include "../../../io/Comm/Comm.h"
 

issm/trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp

@@ -13 +13 @@
 #include "../../include/types.h"
 #include "../../include/macros.h"
-#include "../../shared/Alloc/alloc.h"
+#include "../../shared/MemOps/MemOps.h"
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../io/Comm/Comm.h"

issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscSolver.cpp

@@ -11 +11 @@
 #include "./PetscSolver.h"
 #include "../../../shared/Numerics/Verbosity.h"
-#include "../../../shared/Alloc/alloc.h"
+#include "../../../shared/MemOps/MemOps.h"
 #include "../../../shared/Exceptions/exceptions.h"
 #include "../../../io/Comm/Comm.h"