Changeset 14897


Ignore:
Timestamp:
05/04/13 22:53:04 (12 years ago)
Author:
Eric.Larour
Message:

CHG: starting to cleanup the globals and types and typedefs include files. Send the communicator definitions
into an io/Comm/Comm.h header file, along with the IssmComm object.

Location:
issm/trunk-jpl/src/c
Files:
5 added
2 deleted
14 edited

Legend:

Unmodified
Added
Removed

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

    r14894 r14897  
    6060                                        ./classes/objects/Vertex.cpp\
    6161                                        ./classes/objects/AdolcEdf.h\
    62                                         ./classes/IssmComm.h\
    63                                         ./classes/IssmComm.cpp\
    6462                                        ./classes/ToolkitOptions.h\
    6563                                        ./classes/ToolkitOptions.cpp\
    … …  
    240238                                        ./io/Disk/WriteLockFile.cpp\
    241239                                        ./io/PrintfFunction.cpp\
     240                                        ./io/Comm/Comm.h\
     241                                        ./io/Comm/CommDef.h\
     242                                        ./io/Comm/IssmComm.h\
     243                                        ./io/Comm/IssmComm.cpp\
    242244                                        ./EnumDefinitions/EnumDefinitions.h\
    243245                                        ./modules/ModelProcessorx/ModelProcessorx.h\

  • issm/trunk-jpl/src/c/classes/ToolkitOptions.h

    r14688 r14897  
    1515#endif
    1616
    17 #include "../include/types.h"
    1817/*}}}*/
    1918

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

    r14792 r14897  
    3535#include "./OptPars.h"
    3636#include "./AdolcEdf.h"
    37 #include "./IssmComm.h"
    3837#include "./ToolkitOptions.h"
    3938#include "./RiftStruct.h"

  • issm/trunk-jpl/src/c/classes/objects/ExternalResults/GenericExternalResult.h

    r13761 r14897  
    1818#include "../../../shared/Exceptions/exceptions.h"
    1919#include "../../../shared/Numerics/recast.h"
    20 #include "../../../io/io.h"
    2120#include "../../../EnumDefinitions/EnumDefinitions.h"
    22 #include "../../../classes/IssmComm.h"
     21#include "../../../io/Comm/Comm.h"
    2322#include "./ExternalResult.h"
    2423/*}}}*/

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

    r14633 r14897  
    77
    88#include "./types.h"
    9 #include "../classes/IssmComm.h"
     9#include "../io/Comm/Comm.h"
    1010#include "../classes/ToolkitOptions.h"
    1111

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

    r13780 r14897  
    1313
    1414#include <stdio.h>
    15 
    16 /*Define abstract type for I/O: */
    17 enum param_type { STRING, INTEGER, STRINGARRAY, DOUBLE, DOUBLEVEC, DOUBLEMAT, PETSCVEC, PETSCMAT };
    1815
    1916/*here are our abstracted types: inspired on petsc */
    … …  
    3936#endif
    4037
    41 /*Define communicator: */
    42 #ifdef _HAVE_MPI_
    43 #include <mpi.h>
    44 typedef MPI_Comm COMM;
    45 #else
    46 typedef int COMM;
    47 #endif
    4838
    4939#endif //ifndef _TYPES_H_

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

    r14888 r14897  
    1919#include "../../include/macros.h"
    2020#include "../../classes/ToolkitOptions.h"
    21 #include "../../classes/IssmComm.h"
     21#include "../../io/Comm/Comm.h"
    2222#include "../../EnumDefinitions/EnumDefinitions.h"
    2323#include "./IssmToolkitUtils.h"

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

    r14888 r14897  
    2323#include "../../include/macros.h"
    2424#include "../../Container/DataSet.h"
    25 #include "../../classes/IssmComm.h"
     25#include "../../io/Comm/Comm.h"
    2626#include "../../classes/objects/Bucket.h"
    2727#include "../mumps/mumpsincludes.h"

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

    r14822 r14897  
    1313#include "../../shared/MemOps/xMemCpy.h"
    1414#include "../../shared/Alloc/alloc.h"
    15 #include "../../classes/IssmComm.h"
     15#include "../../io/Comm/Comm.h"
    1616#include "../../include/macros.h"
    1717#include "../../classes/ToolkitOptions.h"

  • issm/trunk-jpl/src/c/toolkits/mpi/mpiincludes.h

    r13780 r14897  
    1212#include "./patches/mpipatches.h"
    1313
     14
    1415#endif

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

    r14894 r14897  
    1212#include <stdio.h>
    1313#include "../../../shared/Alloc/alloc.h"
    14 #include "../../../classes/IssmComm.h"
     14#include "../../../io/Comm/Comm.h"
    1515
    1616void GetOwnershipBoundariesFromRange(int* plower_row,int* pupper_row,int range,COMM comm){

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

    r14882 r14897  
    1515#include "../../shared/Alloc/alloc.h"
    1616#include "../../shared/Exceptions/exceptions.h"
    17 #include "../../classes/IssmComm.h"
     17#include "../../io/Comm/Comm.h"
    1818#include "../mpi/patches/mpipatches.h"
    1919

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

    r14822 r14897  
    1313#include "../../../shared/Alloc/alloc.h"
    1414#include "../../../shared/Exceptions/exceptions.h"
    15 #include "../../../classes/IssmComm.h"
     15#include "../../../io/Comm/Comm.h"
    1616#include "../../../EnumDefinitions/EnumDefinitions.h"
    1717

  • issm/trunk-jpl/src/c/toolkits/petsc/patches/petscpatches.h

    r13780 r14897  
    1313#include "./SolverEnum.h"
    1414#include "../../toolkitsenums.h"
    15 #include "../../../include/types.h"
     15#include "../../../io/Comm/Comm.h"
    1616
    1717class Parameters;
Note: See TracChangeset for help on using the changeset viewer.