Index: /issm/trunk-jpl/src/c/Container/Inputs.h =================================================================== --- /issm/trunk-jpl/src/c/Container/Inputs.h (revision 14914) +++ /issm/trunk-jpl/src/c/Container/Inputs.h (revision 14915) @@ -14,5 +14,5 @@ class GaussTria; class GaussPenta; -#include "../include/types.h" +#include "../shared/Numerics/types.h" /*! \brief Declaration of Inputs class. Index: /issm/trunk-jpl/src/c/Container/Observations.h =================================================================== --- /issm/trunk-jpl/src/c/Container/Observations.h (revision 14914) +++ /issm/trunk-jpl/src/c/Container/Observations.h (revision 14915) @@ -5,5 +5,5 @@ class Variogram; class Options; -#include "../include/types.h" +#include "../shared/Numerics/types.h" /*!\brief Declaration of Observations class. Index: /issm/trunk-jpl/src/c/Makefile.am =================================================================== --- /issm/trunk-jpl/src/c/Makefile.am (revision 14914) +++ /issm/trunk-jpl/src/c/Makefile.am (revision 14915) @@ -22,5 +22,4 @@ ./issm-binding.h\ ./include/typedefs.h\ - ./include/types.h\ ./include/include.h\ ./classes/classes.h\ @@ -184,4 +183,5 @@ ./shared/Matrix/MatrixUtils.cpp\ ./shared/Numerics/numerics.h\ + ./shared/Numerics/types.h\ ./shared/Numerics/Verbosity.h\ ./shared/Numerics/Verbosity.cpp\ Index: /issm/trunk-jpl/src/c/classes/DofIndexing.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/DofIndexing.cpp (revision 14914) +++ /issm/trunk-jpl/src/c/classes/DofIndexing.cpp (revision 14915) @@ -12,5 +12,5 @@ #include "./DofIndexing.h" -#include "../include/types.h" +#include "../shared/Numerics/types.h" #include "../include/typedefs.h" #include "../io/Print/Print.h" Index: /issm/trunk-jpl/src/c/classes/DofIndexing.h =================================================================== --- /issm/trunk-jpl/src/c/classes/DofIndexing.h (revision 14914) +++ /issm/trunk-jpl/src/c/classes/DofIndexing.h (revision 14915) @@ -6,5 +6,5 @@ #define _DOFINDEXING_H_ -#include "../include/types.h" +#include "../shared/Numerics/types.h" class DofIndexing{ Index: /issm/trunk-jpl/src/c/classes/ToolkitOptions.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/ToolkitOptions.cpp (revision 14914) +++ /issm/trunk-jpl/src/c/classes/ToolkitOptions.cpp (revision 14915) @@ -11,5 +11,5 @@ #include #include "./ToolkitOptions.h" -#include "../include/types.h" +#include "../shared/Numerics/types.h" #include "../shared/Exceptions/exceptions.h" #include "../shared/MemOps/MemOps.h" Index: /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp (revision 14914) +++ /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp (revision 14915) @@ -25,5 +25,5 @@ /*ISSM includes: */ -#include "../../include/types.h" +#include "../../shared/Numerics/types.h" #include "../../shared/MemOps/MemOps.h" #include "../../solutions/DakotaSpawnCore.h" Index: /issm/trunk-jpl/src/c/classes/gauss/GaussPenta.h =================================================================== --- /issm/trunk-jpl/src/c/classes/gauss/GaussPenta.h (revision 14914) +++ /issm/trunk-jpl/src/c/classes/gauss/GaussPenta.h (revision 14915) @@ -7,5 +7,5 @@ /*Headers:*/ -#include "../../include/types.h" +#include "../../shared/Numerics/types.h" class GaussTria; Index: /issm/trunk-jpl/src/c/classes/gauss/GaussTria.h =================================================================== --- /issm/trunk-jpl/src/c/classes/gauss/GaussTria.h (revision 14914) +++ /issm/trunk-jpl/src/c/classes/gauss/GaussTria.h (revision 14915) @@ -7,5 +7,5 @@ /*Headers:*/ -#include "../../include/types.h" +#include "../../shared/Numerics/types.h" class GaussTria{ Index: /issm/trunk-jpl/src/c/include/globals.h =================================================================== --- /issm/trunk-jpl/src/c/include/globals.h (revision 14914) +++ /issm/trunk-jpl/src/c/include/globals.h (revision 14915) @@ -6,5 +6,4 @@ #define _GLOBALS_H_ -#include "./types.h" #include "../io/Comm/Comm.h" #include "../classes/ToolkitOptions.h" Index: /issm/trunk-jpl/src/c/include/include.h =================================================================== --- /issm/trunk-jpl/src/c/include/include.h (revision 14914) +++ /issm/trunk-jpl/src/c/include/include.h (revision 14915) @@ -7,5 +7,4 @@ #include "./typedefs.h" -#include "./types.h" #endif //ifndef _INCLUDE_H_ Index: sm/trunk-jpl/src/c/include/types.h =================================================================== --- /issm/trunk-jpl/src/c/include/types.h (revision 14914) +++ (revision ) @@ -1,38 +1,0 @@ -/*!\file: types.h - * \brief prototypes for types.h - */ - -#ifndef _TYPES_H_ -#define _TYPES_H_ - -#ifdef HAVE_CONFIG_H - #include -#else -#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#include - -/*here are our abstracted types: inspired on petsc */ -#if ISSM_USE_64BIT_INDICES == 1 -typedef long long IssmInt; -//#define MPIU_INT MPI_LONG_LONG_INT already define in petsc -#else -typedef int IssmInt; -//#define MPIU_INT MPI_INT already defined in petsc -#endif - -#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_) -#include "adolc/adolc.h" -// for active variables -typedef adouble IssmDouble; -// for passive variables -typedef double IssmPDouble; -#else -// see above -typedef double IssmDouble; -// see above -typedef IssmDouble IssmPDouble; -#endif - -#endif //ifndef _TYPES_H_ Index: /issm/trunk-jpl/src/c/io/Comm/IssmComm.cpp =================================================================== --- /issm/trunk-jpl/src/c/io/Comm/IssmComm.cpp (revision 14914) +++ /issm/trunk-jpl/src/c/io/Comm/IssmComm.cpp (revision 14915) @@ -10,5 +10,5 @@ #include "./IssmComm.h" -#include "../../include/types.h" +#include "../../shared/Numerics/types.h" #include "../../shared/Exceptions/exceptions.h" Index: /issm/trunk-jpl/src/c/shared/Elements/Paterson.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Elements/Paterson.cpp (revision 14914) +++ /issm/trunk-jpl/src/c/shared/Elements/Paterson.cpp (revision 14915) @@ -7,5 +7,5 @@ #include -#include "../../include/include.h" +#include "../../shared/Numerics/types.h" IssmDouble Paterson(IssmDouble temperature){ Index: /issm/trunk-jpl/src/c/shared/Matrix/matrix.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Matrix/matrix.h (revision 14914) +++ /issm/trunk-jpl/src/c/shared/Matrix/matrix.h (revision 14915) @@ -6,5 +6,5 @@ #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); Index: /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.h (revision 14914) +++ /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.h (revision 14915) @@ -3,5 +3,5 @@ */ -#include "../../include/types.h" +#include "../../shared/Numerics/types.h" #ifndef _GAUSSPOINTS_H #define _GAUSSPOINTS_H Index: /issm/trunk-jpl/src/c/shared/Numerics/XZvectorsToCoordinateSystem.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/XZvectorsToCoordinateSystem.cpp (revision 14914) +++ /issm/trunk-jpl/src/c/shared/Numerics/XZvectorsToCoordinateSystem.cpp (revision 14915) @@ -2,4 +2,5 @@ #include "../../include/include.h" #include "../Exceptions/exceptions.h" +#include "../Numerics/types.h" #include "./isnan.h" #include Index: /issm/trunk-jpl/src/c/shared/Numerics/cross.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/cross.cpp (revision 14914) +++ /issm/trunk-jpl/src/c/shared/Numerics/cross.cpp (revision 14915) @@ -9,5 +9,5 @@ #endif -#include "../../include/include.h" +#include "../../shared/Numerics/types.h" void cross(IssmDouble* result,IssmDouble* vector1,IssmDouble* vector2){ Index: /issm/trunk-jpl/src/c/shared/Numerics/extrema.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/extrema.cpp (revision 14914) +++ /issm/trunk-jpl/src/c/shared/Numerics/extrema.cpp (revision 14915) @@ -9,5 +9,5 @@ #endif -#include "../../include/include.h" +#include "../../shared/Numerics/types.h" IssmDouble min(IssmDouble a,IssmDouble b){ Index: /issm/trunk-jpl/src/c/shared/Numerics/numerics.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/numerics.h (revision 14914) +++ /issm/trunk-jpl/src/c/shared/Numerics/numerics.h (revision 14915) @@ -10,4 +10,5 @@ #include "./isnan.h" #include "./recast.h" +#include "./types.h" class Input; Index: /issm/trunk-jpl/src/c/shared/Numerics/types.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/types.h (revision 14915) +++ /issm/trunk-jpl/src/c/shared/Numerics/types.h (revision 14915) @@ -0,0 +1,38 @@ +/*!\file: types.h + * \brief prototypes for types.h + */ + +#ifndef _TYPES_H_ +#define _TYPES_H_ + +#ifdef HAVE_CONFIG_H + #include +#else +#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +#endif + +#include + +/*here are our abstracted types: inspired on petsc */ +#if ISSM_USE_64BIT_INDICES == 1 +typedef long long IssmInt; +//#define MPIU_INT MPI_LONG_LONG_INT already define in petsc +#else +typedef int IssmInt; +//#define MPIU_INT MPI_INT already defined in petsc +#endif + +#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_) +#include "adolc/adolc.h" +// for active variables +typedef adouble IssmDouble; +// for passive variables +typedef double IssmPDouble; +#else +// see above +typedef double IssmDouble; +// see above +typedef IssmDouble IssmPDouble; +#endif + +#endif //ifndef _TYPES_H_ Index: /issm/trunk-jpl/src/c/solutions/solutions.h =================================================================== --- /issm/trunk-jpl/src/c/solutions/solutions.h (revision 14914) +++ /issm/trunk-jpl/src/c/solutions/solutions.h (revision 14915) @@ -14,5 +14,5 @@ #include "../io/Comm/Comm.h" -#include "../include/types.h" +#include "../shared/Numerics/types.h" /*cores: */ Index: /issm/trunk-jpl/src/c/toolkits/gsl/gslincludes.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/gsl/gslincludes.h (revision 14914) +++ /issm/trunk-jpl/src/c/toolkits/gsl/gslincludes.h (revision 14915) @@ -13,5 +13,5 @@ #endif -#include "../../include/types.h" +#include "../../shared/Numerics/types.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmSolver.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmSolver.h (revision 14914) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmSolver.h (revision 14915) @@ -14,5 +14,5 @@ #endif -#include "../../include/types.h" +#include "../../shared/Numerics/types.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/toolkits/mpi/patches/DetermineGlobalSize.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/mpi/patches/DetermineGlobalSize.cpp (revision 14914) +++ /issm/trunk-jpl/src/c/toolkits/mpi/patches/DetermineGlobalSize.cpp (revision 14915) @@ -6,5 +6,5 @@ #include #include "../../../shared/shared.h" -#include "../../../include/types.h" +#include "../../../shared/Numerics/types.h" int DetermineGlobalSize(int local_size,COMM comm){ Index: /issm/trunk-jpl/src/c/toolkits/mpi/patches/DetermineLocalSize.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/mpi/patches/DetermineLocalSize.cpp (revision 14914) +++ /issm/trunk-jpl/src/c/toolkits/mpi/patches/DetermineLocalSize.cpp (revision 14915) @@ -6,5 +6,5 @@ #include #include "../../../shared/shared.h" -#include "../../../include/types.h" +#include "../../../shared/Numerics/types.h" int DetermineLocalSize(int global_size,COMM comm){ Index: /issm/trunk-jpl/src/c/toolkits/mpi/patches/DetermineRowRankFromLocalSize.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/mpi/patches/DetermineRowRankFromLocalSize.cpp (revision 14914) +++ /issm/trunk-jpl/src/c/toolkits/mpi/patches/DetermineRowRankFromLocalSize.cpp (revision 14915) @@ -8,5 +8,5 @@ #include #include "../../../shared/shared.h" -#include "../../../include/types.h" +#include "../../../shared/Numerics/types.h" int* DetermineRowRankFromLocalSize(int global_size,int localsize,COMM comm){ Index: /issm/trunk-jpl/src/c/toolkits/mpi/patches/mpipatches.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/mpi/patches/mpipatches.h (revision 14914) +++ /issm/trunk-jpl/src/c/toolkits/mpi/patches/mpipatches.h (revision 14915) @@ -6,5 +6,5 @@ #define MPI_PATCHES_H_ -#include "../../../include/types.h" +#include "../../../shared/Numerics/types.h" int DetermineLocalSize(int global_size,COMM comm); Index: /issm/trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp (revision 14914) +++ /issm/trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp (revision 14915) @@ -10,5 +10,5 @@ #endif -#include "../../include/types.h" +#include "../../shared/Numerics/types.h" #include "../../shared/MemOps/MemOps.h" #include "../../shared/Exceptions/exceptions.h" Index: /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.h (revision 14914) +++ /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.h (revision 14915) @@ -17,5 +17,5 @@ #include "../petscincludes.h" -#include "../../../include/include.h" +#include "../../../shared/Numerics/types.h" /*}}}*/