Changeset 15839


Ignore:
Timestamp:
08/19/13 15:42:21 (12 years ago)
Author:
Eric.Larour
Message:

CHG: deleted Comm, as it is basically the same thing as what we define as ISSM_MPI_Comm in the mpi/issmcomm.h
layer. Also finished the conversion from the MPI layer to the ISSM MPI layer.

Location:
issm/trunk-jpl/src/c
Files:
1 deleted
30 edited

Legend:

Unmodified
Added
Removed

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

    r15838 r15839  
    172172                                        ./shared/io/Print/PrintfFunction.cpp\
    173173                                        ./shared/io/Print/Print.h\
    174                                         ./shared/io/Comm/Comm.h\
    175174                                        ./shared/io/Comm/IssmComm.h\
    176175                                        ./shared/io/Comm/IssmComm.cpp\

  • TabularUnified issm/trunk-jpl/src/c/analyses/EnvironmentInit.cpp

    r15838 r15839  
    1010#include "../toolkits/toolkits.h"
    1111
    12 COMM EnvironmentInit(int argc,char** argv){
     12ISSM_MPI_Comm EnvironmentInit(int argc,char** argv){
    1313
    1414        /*Output*/
    15         COMM comm = 0;
     15        ISSM_MPI_Comm comm = 0;
    1616
    1717        /*Initialize MPI environment: */

  • TabularUnified issm/trunk-jpl/src/c/analyses/analyses.h

    r15771 r15839  
    1313template <class doubletype> class Vector;
    1414
    15 #include "../shared/io/Comm/Comm.h"
     15#include "../shared/io/Comm/IssmComm.h"
    1616#include "../shared/Numerics/types.h"
    1717
    … …  
    4646void WriteLockFile(char* filename);
    4747void ResetBoundaryConditions(FemModel* femmodel, int analysis_type);
    48 COMM EnvironmentInit(int argc,char** argv);
     48ISSM_MPI_Comm EnvironmentInit(int argc,char** argv);
    4949void EnvironmentFinalize(void);
    5050void PrintBanner(void);

  • TabularUnified issm/trunk-jpl/src/c/classes/FemModel.cpp

    r15838 r15839  
    4141
    4242/*Object constructors and destructor*/
    43 /*FUNCTION FemModel::FemModel(int argc,char** argv,COMM incomm){{{*/
    44 FemModel::FemModel(int argc,char** argv,COMM incomm){
     43/*FUNCTION FemModel::FemModel(int argc,char** argv,ISSM_MPI_Comm incomm){{{*/
     44FemModel::FemModel(int argc,char** argv,ISSM_MPI_Comm incomm){
    4545
    4646        /*configuration: */

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

    r15249 r15839  
    4343                Parameters  *parameters;           //one set of parameters, independent of the analysis_type
    4444                Results     *results;              //results that cannot be fit into the elements
    45                 COMM        comm;                  //communicator for this particular model
     45                ISSM_MPI_Comm        comm;                  //communicator for this particular model
    4646
    4747                /*constructors, destructors: */
    48                 FemModel(int argc,char** argv,COMM comm_init);
     48                FemModel(int argc,char** argv,ISSM_MPI_Comm comm_init);
    4949                FemModel(char* rootpath, char* inputfilename, char* outputfilename, char* petscfilename, char* lockfilename, const int solution_type,const int* analyses,const int nummodels);
    5050                ~FemModel();

  • TabularUnified issm/trunk-jpl/src/c/main/globals.h

    r15728 r15839  
    66#define _GLOBALS_H_
    77
    8 #include "../shared/io/Comm/Comm.h"
     8#include "../shared/io/Comm/IssmComm.h"
    99#include "../toolkits/ToolkitOptions.h"
    1010
    1111/*Communicators: */
    12 COMM IssmComm::comm;
     12ISSM_MPI_Comm IssmComm::comm;
    1313bool IssmComm::parallel;
    1414

  • TabularUnified issm/trunk-jpl/src/c/main/issm.cpp

    r14921 r15839  
    1111
    1212        /*Initialize environment (MPI, PETSC, MUMPS, etc ...)*/
    13         COMM comm_init=EnvironmentInit(argc,argv);
     13        ISSM_MPI_Comm comm_init=EnvironmentInit(argc,argv);
    1414
    1515        /*Initialize femmodel from arguments provided command line: */

  • TabularUnified issm/trunk-jpl/src/c/main/kriging.cpp

    r15782 r15839  
    3939
    4040        /*Initialize environment (MPI, PETSC, MUMPS, etc ...)*/
    41         COMM comm=EnvironmentInit(argc,argv);
     41        ISSM_MPI_Comm comm=EnvironmentInit(argc,argv);
    4242        IssmComm::SetComm(comm);
    4343

  • TabularUnified issm/trunk-jpl/src/c/shared/Exceptions/Exceptions.cpp

    r15104 r15839  
    1111#include "./exceptions.h"
    1212#include "../io/Print/Print.h"
    13 #include "../io/Comm/Comm.h"
     13#include "../io/Comm/IssmComm.h"
    1414
    1515ErrorException::ErrorException(const string &what_arg){/*{{{*/

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

    r15838 r15839  
    1313#include "../../Exceptions/exceptions.h"
    1414
    15 void IssmComm::SetComm(ISSM_MPI_COMM incomm){ /*{{{*/
     15void IssmComm::SetComm(ISSM_MPI_Comm incomm){ /*{{{*/
    1616
    1717        /*A comm is provided, we are running in parallel (this is not a module)*/
    … …  
    2828
    2929}/*}}}*/
    30 ISSM_MPI_COMM IssmComm::GetComm(){  /*{{{*/
     30ISSM_MPI_Comm IssmComm::GetComm(){  /*{{{*/
    3131        if(!parallel) _error_("Cannot return comm in serial mode");
    3232        return comm;

  • TabularUnified issm/trunk-jpl/src/c/shared/io/Comm/IssmComm.h

    r15838 r15839  
    1414#endif
    1515
    16 #include "./CommDef.h"
     16#include "../../../toolkits/mpi/issmmpi.h"
    1717
    1818/*}}}*/
    … …  
    2525
    2626        public:
    27                 static void SetComm(ISSM_MPI_COMM incomm);
     27                static void SetComm(ISSM_MPI_Comm incomm);
    2828                static void SetComm(void);
    29                 static ISSM_MPI_COMM GetComm(void);
     29                static ISSM_MPI_Comm GetComm(void);
    3030                static int GetRank(void);
    3131                static int GetSize(void);

  • TabularUnified issm/trunk-jpl/src/c/shared/io/Disk/WriteLockFile.cpp

    r15660 r15839  
    44#include <cstdio>
    55#include "../../Exceptions/exceptions.h"
    6 #include "../Comm/Comm.h"
     6#include "../Comm/IssmComm.h"
    77#include "../Print/Print.h"
    88#include <cstdio>

  • TabularUnified issm/trunk-jpl/src/c/shared/io/Disk/pfopen.cpp

    r15838 r15839  
    1111#include <stdio.h>
    1212#include "../Print/Print.h"
    13 #include "../Comm/Comm.h"
     13#include "../Comm/IssmComm.h"
    1414#include "../../Exceptions/exceptions.h"
    1515

  • TabularUnified issm/trunk-jpl/src/c/shared/io/Print/PrintfFunction.cpp

    r15164 r15839  
    1616#endif
    1717#include "./Print.h"
    18 #include "../Comm/Comm.h"
     18#include "../Comm/IssmComm.h"
    1919#include "../../String/sharedstring.h"
    2020#include "../../MemOps/MemOps.h"

  • TabularUnified issm/trunk-jpl/src/c/shared/io/io.h

    r14910 r15839  
    1414#include "./Disk/diskio.h"
    1515#include "./Print/Print.h"
    16 #include "./Comm/Comm.h"
     16#include "./Comm/IssmComm.h"
    1717
    1818#endif  /* _IO_H_ */

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

    r15048 r15839  
    1212
    1313#include "../../shared/MemOps/MemOps.h"
    14 #include "../../shared/io/Comm/Comm.h"
     14#include "../../shared/io/Comm/IssmComm.h"
    1515#include "../../shared/Enum/Enum.h"
    1616#include "../../shared/Exceptions/exceptions.h"

  • TabularUnified issm/trunk-jpl/src/c/toolkits/mpi/commops/DetermineGlobalSize.cpp

    r15838 r15839  
    88#include "../../../shared/Numerics/types.h"
    99
    10 int DetermineGlobalSize(int local_size,COMM comm){
     10int DetermineGlobalSize(int local_size,ISSM_MPI_Comm comm){
    1111
    1212        /*output: */

  • TabularUnified issm/trunk-jpl/src/c/toolkits/mpi/commops/DetermineLocalSize.cpp

    r15838 r15839  
    77#include "../../../shared/shared.h"
    88
    9 int DetermineLocalSize(int global_size,COMM comm){
     9int DetermineLocalSize(int global_size,ISSM_MPI_Comm comm){
    1010
    1111        /*output: */

  • TabularUnified issm/trunk-jpl/src/c/toolkits/mpi/commops/DetermineRowRankFromLocalSize.cpp

    r15838 r15839  
    1010#include "../../../shared/Numerics/types.h"
    1111
    12 int* DetermineRowRankFromLocalSize(int global_size,int localsize,COMM comm){
     12int* DetermineRowRankFromLocalSize(int global_size,int localsize,ISSM_MPI_Comm comm){
    1313
    1414        /*intermediary: */

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

    r15838 r15839  
    1212#include <stdio.h>
    1313#include "../../../shared/MemOps/MemOps.h"
    14 #include "../../../shared/io/Comm/Comm.h"
     14#include "../../../shared/io/Comm/IssmComm.h"
    1515
    16 void GetOwnershipBoundariesFromRange(int* plower_row,int* pupper_row,int range,COMM comm){
     16void GetOwnershipBoundariesFromRange(int* plower_row,int* pupper_row,int range,ISSM_MPI_Comm comm){
    1717
    1818        /*externals :*/

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

    r15834 r15839  
    77
    88#include "../../../shared/Numerics/types.h"
    9 #include "../../../shared/io/Comm/Comm.h"
     9#include "../../../shared/io/Comm/IssmComm.h"
     10#include "../../mpi/issmmpi.h"
    1011
    11 int DetermineLocalSize(int global_size,COMM comm);
    12 int* DetermineRowRankFromLocalSize(int global_size,int localsize,COMM comm);
    13 void GetOwnershipBoundariesFromRange(int* plower_row,int* pupper_row,int range,COMM comm);
    14 int DetermineGlobalSize(int local_size,COMM comm);
     12int DetermineLocalSize(int global_size,ISSM_MPI_Comm comm);
     13int* DetermineRowRankFromLocalSize(int global_size,int localsize,ISSM_MPI_Comm comm);
     14void GetOwnershipBoundariesFromRange(int* plower_row,int* pupper_row,int range,ISSM_MPI_Comm comm);
     15int DetermineGlobalSize(int local_size,ISSM_MPI_Comm comm);
    1516
    1617#endif

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

    r15836 r15839  
    2020                #include <mpi.h>
    2121        #endif
    22         #include "./commops/commops.h"
    2322        /*}}}*/
    2423        /*MPI defines: *{{{*/
    … …  
    5049        #define ISSM_MPI_ANY_TAG       MPI_ANY_TAG
    5150        #define ISSM_MPI_ANY_SOURCE    MPI_ANY_SOURCE
     51       
     52    /*other include files: */
     53        #include "./commops/commops.h"
    5254        /*}}}*/
    5355#else 

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

    r15838 r15839  
    1313#include "../../shared/MemOps/MemOps.h"
    1414#include "../../shared/Exceptions/exceptions.h"
    15 #include "../../shared/io/Comm/Comm.h"
     15#include "../../shared/io/Comm/IssmComm.h"
    1616#include "../mpi/issmmpi.h"
    1717

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

    r15564 r15839  
    1313#include "../../../shared/MemOps/MemOps.h"
    1414#include "../../../shared/Exceptions/exceptions.h"
    15 #include "../../../shared/io/Comm/Comm.h"
     15#include "../../../shared/io/Comm/IssmComm.h"
    1616#include "../../../shared/Enum/Enum.h"
    1717

  • TabularUnified issm/trunk-jpl/src/c/toolkits/petsc/patches/MatMultPatch.cpp

    r15838 r15839  
    1818
    1919/*Function prototypes: */
    20 int MatMultCompatible(Mat A,Vec x,COMM comm);
    21 void VecRelocalize(Vec* outvector,Vec vector,int m,COMM comm);
     20int MatMultCompatible(Mat A,Vec x,ISSM_MPI_Comm comm);
     21void VecRelocalize(Vec* outvector,Vec vector,int m,ISSM_MPI_Comm comm);
    2222
    23 void MatMultPatch(Mat A,Vec X, Vec AX,COMM comm){ //same prototype as MatMult in Petsc
     23void MatMultPatch(Mat A,Vec X, Vec AX,ISSM_MPI_Comm comm){ //same prototype as MatMult in Petsc
    2424
    2525        int m,n;
    … …  
    4343}
    4444
    45 int MatMultCompatible(Mat A,Vec x,COMM comm){
     45int MatMultCompatible(Mat A,Vec x,ISSM_MPI_Comm comm){
    4646
    4747        /*error management*/
    … …  
    7373}
    7474
    75 void VecRelocalize(Vec* poutvector,Vec vector,int m,COMM comm){
     75void VecRelocalize(Vec* poutvector,Vec vector,int m,ISSM_MPI_Comm comm){
    7676
    7777        /*vector index and vector values*/

  • TabularUnified issm/trunk-jpl/src/c/toolkits/petsc/patches/MatToSerial.cpp

    r15838 r15839  
    1212#include "../../../shared/shared.h"
    1313
    14 void MatToSerial(double** poutmatrix,Mat matrix,COMM comm){
     14void MatToSerial(double** poutmatrix,Mat matrix,ISSM_MPI_Comm comm){
    1515
    1616        int i;

  • TabularUnified issm/trunk-jpl/src/c/toolkits/petsc/patches/NewMat.cpp

    r15838 r15839  
    1919
    2020/*NewMat(int M,int N){{{*/
    21 Mat NewMat(int M,int N,COMM comm){
     21Mat NewMat(int M,int N,ISSM_MPI_Comm comm){
    2222
    2323        /*output:*/
    … …  
    4646}
    4747/*}}}*/
    48 /*NewMat(int M,int N,double sparsity,COMM comm){{{*/
    49 Mat NewMat(int M,int N,double sparsity,COMM comm){
     48/*NewMat(int M,int N,double sparsity,ISSM_MPI_Comm comm){{{*/
     49Mat NewMat(int M,int N,double sparsity,ISSM_MPI_Comm comm){
    5050
    5151        /*output:*/
    … …  
    8080/*}}}*/
    8181/*NewMat(int M,int N,int connectivity,int numberofdofspernode){{{*/
    82 Mat NewMat(int M,int N,int connectivity,int numberofdofspernode,COMM comm){
     82Mat NewMat(int M,int N,int connectivity,int numberofdofspernode,ISSM_MPI_Comm comm){
    8383
    8484        /*output:*/

  • TabularUnified issm/trunk-jpl/src/c/toolkits/petsc/patches/NewVec.cpp

    r15838 r15839  
    1717#include "../../mpi/issmmpi.h"
    1818
    19 Vec NewVec(int size,COMM comm,bool fromlocalsize){
     19Vec NewVec(int size,ISSM_MPI_Comm comm,bool fromlocalsize){
    2020
    2121        int local_size;

  • TabularUnified issm/trunk-jpl/src/c/toolkits/petsc/patches/VecToMPISerial.cpp

    r15838 r15839  
    1212#include "../../../shared/shared.h"
    1313
    14 int VecToMPISerial(double** pgathered_vector, Vec vector,COMM comm){
     14int VecToMPISerial(double** pgathered_vector, Vec vector,ISSM_MPI_Comm comm){
    1515
    1616        int i;

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

    r15272 r15839  
    1313#include "./SolverEnum.h"
    1414#include "../../toolkitsenums.h"
    15 #include "../../../shared/io/Comm/Comm.h"
     15#include "../../../shared/io/Comm/IssmComm.h"
    1616
    1717class Parameters;
    1818
    19 Vec NewVec(int size,COMM comm,bool fromlocalsize=false);
    20 Mat NewMat(int M,int N,COMM comm);
    21 Mat NewMat(int M,int N,double sparsity,COMM comm);
    22 Mat NewMat(int M,int N,int connectivity,int numberofdofspernode, COMM comm);
     19Vec NewVec(int size,ISSM_MPI_Comm comm,bool fromlocalsize=false);
     20Mat NewMat(int M,int N,ISSM_MPI_Comm comm);
     21Mat NewMat(int M,int N,double sparsity,ISSM_MPI_Comm comm);
     22Mat NewMat(int M,int N,int connectivity,int numberofdofspernode, ISSM_MPI_Comm comm);
    2323
    24 int VecToMPISerial(double** pgathered_vector, Vec vector,COMM comm);
     24int VecToMPISerial(double** pgathered_vector, Vec vector,ISSM_MPI_Comm comm);
    2525void MatFree(Mat* pmat);
    2626void ISFree(IS* pis);
    … …  
    3232void PetscOptionsDetermineSolverType(int* psolver_type);
    3333void VecMerge(Vec A, Vec B, double* row_partition_vector,int row_partition_size);
    34 void MatMultPatch(Mat A,Vec X, Vec AX,COMM comm);
    35 void MatToSerial(double** poutmatrix,Mat matrix,COMM comm);
     34void MatMultPatch(Mat A,Vec X, Vec AX,ISSM_MPI_Comm comm);
     35void MatToSerial(double** poutmatrix,Mat matrix,ISSM_MPI_Comm comm);
    3636void VecDuplicatePatch(Vec* output, Vec input);
    3737Vec  SerialToVec(double* vector,int vector_size);
Note: See TracChangeset for help on using the changeset viewer.