source: issm/oecreview/Archive/14312-15392/ISSM-14914-14915.diff@ 15393

Last change on this file since 15393 was 15393, checked in by Mathieu Morlighem, 12 years ago

NEW: adding Archive/14312-15392 for oecreview
File size: 15.4 KB

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

     
    1313template <class doubletype> class Vector;
    1414
    1515#include "../io/Comm/Comm.h"
    16 #include "../include/types.h"
     16#include "../shared/Numerics/types.h"
    1717
    1818/*cores: */
    1919void adjointdiagnostic_core(FemModel* femmodel);

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

     
    44class Quadtree;
    55class Variogram;
    66class Options;
    7 #include "../include/types.h"
     7#include "../shared/Numerics/types.h"
    88
    99/*!\brief Declaration of Observations class.
    1010 *

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

     
    1313class Node;
    1414class GaussTria;
    1515class GaussPenta;
    16 #include "../include/types.h"
     16#include "../shared/Numerics/types.h"
    1717
    1818/*! \brief Declaration of Inputs class.
    1919 *

  • ../trunk-jpl/src/c/include/types.h

     
    1 /*!\file: types.h
    2  * \brief prototypes for types.h
    3  */
    4 
    5 #ifndef _TYPES_H_
    6 #define  _TYPES_H_
    7 
    8 #ifdef HAVE_CONFIG_H
    9         #include <config.h>
    10 #else
    11 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
    12 #endif
    13 
    14 #include <stdio.h>
    15 
    16 /*here are our abstracted types: inspired on petsc */
    17 #if ISSM_USE_64BIT_INDICES == 1
    18 typedef long long IssmInt;
    19 //#define MPIU_INT MPI_LONG_LONG_INT already define in petsc
    20 #else
    21 typedef int IssmInt;
    22 //#define MPIU_INT MPI_INT already defined in petsc
    23 #endif 
    24 
    25 #if defined(_HAVE_ADOLC_) &&  !defined(_WRAPPERS_)
    26 #include "adolc/adolc.h"
    27 // for active variables
    28 typedef adouble IssmDouble;
    29 // for passive variables
    30 typedef double IssmPDouble;
    31 #else
    32 // see above
    33 typedef double IssmDouble;
    34 // see above
    35 typedef IssmDouble IssmPDouble;
    36 #endif
    37 
    38 #endif //ifndef _TYPES_H_

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

     
    55#ifndef _GLOBALS_H_
    66#define _GLOBALS_H_
    77
    8 #include "./types.h"
    98#include "../io/Comm/Comm.h"
    109#include "../classes/ToolkitOptions.h"
    1110

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

     
    66#define  _INCLUDEGLOBAL_H_
    77
    88#include "./typedefs.h"
    9 #include "./types.h"
    109
    1110#endif //ifndef _INCLUDE_H_

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

     
    55#ifndef _MATRIXUTILS_H_
    66#define _MATRIXUTILS_H_
    77
    8 #include "../../include/include.h"
     8#include "../../shared/Numerics/types.h"
    99
    1010int  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);
    1111int  MatrixMultiply( IssmDouble* a, int nrowa, int ncola, int itrna, IssmDouble* b, int nrowb, int ncolb, int itrnb, IssmDouble* c, int iaddc );

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

     
    88#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
    99#endif
    1010
    11 #include "../../include/include.h"
     11#include "../../shared/Numerics/types.h"
    1212
    1313IssmDouble min(IssmDouble a,IssmDouble b){
    1414        if (a<b)return a;

  • ../trunk-jpl/src/c/shared/Numerics/types.h

     
     1/*!\file: types.h
     2 * \brief prototypes for types.h
     3 */
     4
     5#ifndef _TYPES_H_
     6#define  _TYPES_H_
     7
     8#ifdef HAVE_CONFIG_H
     9        #include <config.h>
     10#else
     11#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
     12#endif
     13
     14#include <stdio.h>
     15
     16/*here are our abstracted types: inspired on petsc */
     17#if ISSM_USE_64BIT_INDICES == 1
     18typedef long long IssmInt;
     19//#define MPIU_INT MPI_LONG_LONG_INT already define in petsc
     20#else
     21typedef int IssmInt;
     22//#define MPIU_INT MPI_INT already defined in petsc
     23#endif 
     24
     25#if defined(_HAVE_ADOLC_) &&  !defined(_WRAPPERS_)
     26#include "adolc/adolc.h"
     27// for active variables
     28typedef adouble IssmDouble;
     29// for passive variables
     30typedef double IssmPDouble;
     31#else
     32// see above
     33typedef double IssmDouble;
     34// see above
     35typedef IssmDouble IssmPDouble;
     36#endif
     37
     38#endif //ifndef _TYPES_H_

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

     
    22 * \brief
    33 */
    44
    5 #include "../../include/types.h"
     5#include "../../shared/Numerics/types.h"
    66#ifndef _GAUSSPOINTS_H
    77#define _GAUSSPOINTS_H
    88

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

     
    11#include "../MemOps/MemOps.h"
    22#include "../../include/include.h"
    33#include "../Exceptions/exceptions.h"
     4#include "../Numerics/types.h"
    45#include "./isnan.h"
    56#include <math.h>
    67

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

     
    88#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
    99#endif
    1010
    11 #include "../../include/include.h"
     11#include "../../shared/Numerics/types.h"
    1212
    1313void cross(IssmDouble* result,IssmDouble* vector1,IssmDouble* vector2){
    1414

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

     
    99#include "./GaussPoints.h"
    1010#include "./isnan.h"
    1111#include "./recast.h"
     12#include "./types.h"
    1213
    1314class Input;
    1415class Parameters;

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

     
    66
    77#include <math.h>
    88
    9 #include "../../include/include.h"
     9#include "../../shared/Numerics/types.h"
    1010
    1111IssmDouble Paterson(IssmDouble temperature){
    1212

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

     
    99#endif
    1010
    1111#include "./IssmComm.h"
    12 #include "../../include/types.h"
     12#include "../../shared/Numerics/types.h"
    1313#include "../../shared/Exceptions/exceptions.h"
    1414
    1515void IssmComm::SetComm(COMM incomm){ /*{{{*/

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

     
    99#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
    1010#endif
    1111
    12 #include "../../include/types.h"
     12#include "../../shared/Numerics/types.h"
    1313#include "../../shared/MemOps/MemOps.h"
    1414#include "../../shared/Exceptions/exceptions.h"
    1515#include "../../io/Comm/Comm.h"

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

     
    1212#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
    1313#endif
    1414
    15 #include "../../include/types.h"
     15#include "../../shared/Numerics/types.h"
    1616/*}}}*/
    1717
    1818template <class doubletype> class IssmVec;

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

     
    55#include <stdio.h>
    66#include <math.h>
    77#include "../../../shared/shared.h"
    8 #include "../../../include/types.h"
     8#include "../../../shared/Numerics/types.h"
    99
    1010int DetermineLocalSize(int global_size,COMM comm){
    1111

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

     
    55#ifndef MPI_PATCHES_H_
    66#define MPI_PATCHES_H_
    77
    8 #include "../../../include/types.h"
     8#include "../../../shared/Numerics/types.h"
    99
    1010int DetermineLocalSize(int global_size,COMM comm);
    1111int* DetermineRowRankFromLocalSize(int global_size,int localsize,COMM comm);

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

     
    55#include <stdio.h>
    66#include <math.h>
    77#include "../../../shared/shared.h"
    8 #include "../../../include/types.h"
     8#include "../../../shared/Numerics/types.h"
    99
    1010int DetermineGlobalSize(int local_size,COMM comm){
    1111

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

     
    77#include <stdio.h>
    88#include <math.h>
    99#include "../../../shared/shared.h"
    10 #include "../../../include/types.h"
     10#include "../../../shared/Numerics/types.h"
    1111
    1212int* DetermineRowRankFromLocalSize(int global_size,int localsize,COMM comm){
    1313

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

     
    1313#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
    1414#endif
    1515
    16 #include "../../include/types.h"
     16#include "../../shared/Numerics/types.h"
    1717
    1818/*}}}*/
    1919

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

     
    1616#endif
    1717
    1818#include "../petscincludes.h"
    19 #include "../../../include/include.h"
     19#include "../../../shared/Numerics/types.h"
    2020
    2121/*}}}*/
    2222class PetscVec;

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

     
    2121core_sources = ./issm.h\
    2222                                        ./issm-binding.h\
    2323                                        ./include/typedefs.h\
    24                                         ./include/types.h\
    2524                                        ./include/include.h\
    2625                                        ./classes/classes.h\
    2726                                        ./classes/objects.h\
    … …  
    183182                                        ./shared/Matrix/matrix.h\
    184183                                        ./shared/Matrix/MatrixUtils.cpp\
    185184                                        ./shared/Numerics/numerics.h\
     185                                        ./shared/Numerics/types.h\
    186186                                        ./shared/Numerics/Verbosity.h\
    187187                                        ./shared/Numerics/Verbosity.cpp\
    188188                                        ./shared/Numerics/IsInputConverged.cpp\

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

     
    1111#include <string.h>
    1212
    1313#include "./DofIndexing.h"
    14 #include "../include/types.h"
     14#include "../shared/Numerics/types.h"
    1515#include "../include/typedefs.h"
    1616#include "../io/Print/Print.h"
    1717#include "../shared/Exceptions/exceptions.h"

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

     
    66#define _GAUSSPENTA_H_
    77
    88/*Headers:*/
    9 #include "../../include/types.h"
     9#include "../../shared/Numerics/types.h"
    1010class GaussTria;
    1111
    1212class GaussPenta{

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

     
    66#define _GAUSSTRIA_H_
    77
    88/*Headers:*/
    9 #include "../../include/types.h"
     9#include "../../shared/Numerics/types.h"
    1010
    1111class GaussTria{
    1212

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

     
    1010
    1111#include <string.h>
    1212#include "./ToolkitOptions.h"
    13 #include "../include/types.h"
     13#include "../shared/Numerics/types.h"
    1414#include "../shared/Exceptions/exceptions.h"
    1515#include "../shared/MemOps/MemOps.h"
    1616

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

     
    55#ifndef _DOFINDEXING_H_
    66#define  _DOFINDEXING_H_
    77
    8 #include "../include/types.h"
     8#include "../shared/Numerics/types.h"
    99
    1010class DofIndexing{
    1111

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

     
    2424#include <string>
    2525
    2626/*ISSM includes: */
    27 #include "../../include/types.h"
     27#include "../../shared/Numerics/types.h"
    2828#include "../../shared/MemOps/MemOps.h"
    2929#include "../../solutions/DakotaSpawnCore.h"
    3030
Note: See TracBrowser for help on using the repository browser.