Changeset 14915

Timestamp:

05/05/13 21:12:59 (12 years ago)

Author:

Eric.Larour

Message:

CHG: moved types from include/ to shared/Numerics, where it belongs. The philosophy here is to get the src/include
directory to disappear, and to consolidate the shared/ library.

Location:

issm/trunk-jpl/src/c

Files:

• Container/Inputs.h (modified) (1 diff)
• Container/Observations.h (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• classes/DofIndexing.cpp (modified) (1 diff)
• classes/DofIndexing.h (modified) (1 diff)
• classes/ToolkitOptions.cpp (modified) (1 diff)
• classes/dakota/DakotaPlugin.cpp (modified) (1 diff)
• classes/gauss/GaussPenta.h (modified) (1 diff)
• classes/gauss/GaussTria.h (modified) (1 diff)
• include/globals.h (modified) (1 diff)
• include/include.h (modified) (1 diff)
• io/Comm/IssmComm.cpp (modified) (1 diff)
• shared/Elements/Paterson.cpp (modified) (1 diff)
• shared/Matrix/matrix.h (modified) (1 diff)
• shared/Numerics/GaussPoints.h (modified) (1 diff)
• shared/Numerics/XZvectorsToCoordinateSystem.cpp (modified) (1 diff)
• shared/Numerics/cross.cpp (modified) (1 diff)
• shared/Numerics/extrema.cpp (modified) (1 diff)
• shared/Numerics/numerics.h (modified) (1 diff)
• shared/Numerics/types.h (moved) (moved from issm/trunk-jpl/src/c/include/types.h )
• solutions/solutions.h (modified) (1 diff)
• toolkits/gsl/gslincludes.h (modified) (1 diff)
• toolkits/issm/IssmSolver.h (modified) (1 diff)
• toolkits/mpi/patches/DetermineGlobalSize.cpp (modified) (1 diff)
• toolkits/mpi/patches/DetermineLocalSize.cpp (modified) (1 diff)
• toolkits/mpi/patches/DetermineRowRankFromLocalSize.cpp (modified) (1 diff)
• toolkits/mpi/patches/mpipatches.h (modified) (1 diff)
• toolkits/mumps/MpiDenseMumpsSolve.cpp (modified) (1 diff)
• toolkits/petsc/objects/PetscMat.h (modified) (1 diff)

issm/trunk-jpl/src/c/Container/Inputs.h

@@ -14 +14 @@
 class GaussTria;
 class GaussPenta;
-#include "../include/types.h"
+#include "../shared/Numerics/types.h"
 
 /*! \brief Declaration of Inputs class.

issm/trunk-jpl/src/c/Container/Observations.h

@@ -5 +5 @@
 class Variogram;
 class Options;
-#include "../include/types.h"
+#include "../shared/Numerics/types.h"
 
 /*!\brief Declaration of Observations class.

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

@@ -22 +22 @@
                                         ./issm-binding.h\
                                         ./include/typedefs.h\
-                                        ./include/types.h\
                                         ./include/include.h\
                                         ./classes/classes.h\
@@ -184 +183 @@
                                         ./shared/Matrix/MatrixUtils.cpp\
                                         ./shared/Numerics/numerics.h\
+                                        ./shared/Numerics/types.h\
                                         ./shared/Numerics/Verbosity.h\
                                         ./shared/Numerics/Verbosity.cpp\

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

@@ -12 +12 @@
 
 #include "./DofIndexing.h"
-#include "../include/types.h"
+#include "../shared/Numerics/types.h"
 #include "../include/typedefs.h"
 #include "../io/Print/Print.h"

issm/trunk-jpl/src/c/classes/DofIndexing.h

@@ -6 +6 @@
 #define  _DOFINDEXING_H_
 
-#include "../include/types.h"
+#include "../shared/Numerics/types.h"
 
 class DofIndexing{

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

@@ -11 +11 @@
 #include <string.h>
 #include "./ToolkitOptions.h"
-#include "../include/types.h"
+#include "../shared/Numerics/types.h"
 #include "../shared/Exceptions/exceptions.h"
 #include "../shared/MemOps/MemOps.h"

issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp

@@ -25 +25 @@
 
 /*ISSM includes: */
-#include "../../include/types.h"
+#include "../../shared/Numerics/types.h"
 #include "../../shared/MemOps/MemOps.h"
 #include "../../solutions/DakotaSpawnCore.h"

issm/trunk-jpl/src/c/classes/gauss/GaussPenta.h

@@ -7 +7 @@
 
 /*Headers:*/
-#include "../../include/types.h"
+#include "../../shared/Numerics/types.h"
 class GaussTria;
 

issm/trunk-jpl/src/c/classes/gauss/GaussTria.h

@@ -7 +7 @@
 
 /*Headers:*/
-#include "../../include/types.h"
+#include "../../shared/Numerics/types.h"
 
 class GaussTria{

issm/trunk-jpl/src/c/include/globals.h

@@ -6 +6 @@
 #define _GLOBALS_H_
 
-#include "./types.h"
 #include "../io/Comm/Comm.h"
 #include "../classes/ToolkitOptions.h"

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

@@ -7 +7 @@
 
 #include "./typedefs.h"
-#include "./types.h"
 
 #endif //ifndef _INCLUDE_H_

issm/trunk-jpl/src/c/io/Comm/IssmComm.cpp

@@ -10 +10 @@
 
 #include "./IssmComm.h"
-#include "../../include/types.h"
+#include "../../shared/Numerics/types.h"
 #include "../../shared/Exceptions/exceptions.h"
 

issm/trunk-jpl/src/c/shared/Elements/Paterson.cpp

@@ -7 +7 @@
 #include <math.h>
 
-#include "../../include/include.h"
+#include "../../shared/Numerics/types.h"
 
 IssmDouble Paterson(IssmDouble temperature){

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

@@ -6 +6 @@
 #define _MATRIXUTILS_H_
 
-#include "../../include/include.h"
+#include "../../shared/Numerics/types.h"
 
 int  TripleMultiply( IssmDouble* a, int nrowa, int ncola, int itrna, IssmDouble* b, int nrowb, int ncolb, int itrnb, IssmDouble* c, int nrowc, int ncolc, int itrnc, IssmDouble* d, int iaddd);

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

@@ -3 +3 @@
  */ 
 
-#include "../../include/types.h"
+#include "../../shared/Numerics/types.h"
 #ifndef _GAUSSPOINTS_H
 #define _GAUSSPOINTS_H

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

@@ -2 +2 @@
 #include "../../include/include.h"
 #include "../Exceptions/exceptions.h"
+#include "../Numerics/types.h"
 #include "./isnan.h"
 #include <math.h>

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

@@ -9 +9 @@
 #endif
 
-#include "../../include/include.h"
+#include "../../shared/Numerics/types.h"
 
 void cross(IssmDouble* result,IssmDouble* vector1,IssmDouble* vector2){

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

@@ -9 +9 @@
 #endif
 
-#include "../../include/include.h"
+#include "../../shared/Numerics/types.h"
 
 IssmDouble min(IssmDouble a,IssmDouble b){

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

@@ -10 +10 @@
 #include "./isnan.h"
 #include "./recast.h"
+#include "./types.h"
 
 class Input;

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

@@ -14 +14 @@
 
 #include "../io/Comm/Comm.h"
-#include "../include/types.h"
+#include "../shared/Numerics/types.h"
 
 /*cores: */

issm/trunk-jpl/src/c/toolkits/gsl/gslincludes.h

@@ -13 +13 @@
 #endif
 
-#include "../../include/types.h"
+#include "../../shared/Numerics/types.h"
 /*}}}*/
 

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

@@ -14 +14 @@
 #endif
 
-#include "../../include/types.h"
+#include "../../shared/Numerics/types.h"
 
 /*}}}*/

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

@@ -6 +6 @@
 #include <math.h>
 #include "../../../shared/shared.h"
-#include "../../../include/types.h"
+#include "../../../shared/Numerics/types.h"
 
 int DetermineGlobalSize(int local_size,COMM comm){

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

@@ -6 +6 @@
 #include <math.h>
 #include "../../../shared/shared.h"
-#include "../../../include/types.h"
+#include "../../../shared/Numerics/types.h"
 
 int DetermineLocalSize(int global_size,COMM comm){

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

@@ -8 +8 @@
 #include <math.h>
 #include "../../../shared/shared.h"
-#include "../../../include/types.h"
+#include "../../../shared/Numerics/types.h"
 
 int* DetermineRowRankFromLocalSize(int global_size,int localsize,COMM comm){

issm/trunk-jpl/src/c/toolkits/mpi/patches/mpipatches.h

@@ -6 +6 @@
 #define MPI_PATCHES_H_
 
-#include "../../../include/types.h"
+#include "../../../shared/Numerics/types.h"
 
 int DetermineLocalSize(int global_size,COMM comm);

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

@@ -10 +10 @@
 #endif
 
-#include "../../include/types.h"
+#include "../../shared/Numerics/types.h"
 #include "../../shared/MemOps/MemOps.h"
 #include "../../shared/Exceptions/exceptions.h"

issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.h

@@ -17 +17 @@
 
 #include "../petscincludes.h"
-#include "../../../include/include.h"
+#include "../../../shared/Numerics/types.h"
 
 /*}}}*/