Ignore:
Timestamp:
06/01/12 17:26:03 (13 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk-jpl and trunk for revision 12326M

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/Container/Constraints.cpp

    r10522 r12330  
    4848
    4949        /*figure out total number of constraints combining all the cpus (no clones here)*/
    50         #ifdef _PARALLEL_
    51         MPI_Reduce(&localconstraints,&numberofconstraints,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD );
    52         MPI_Bcast(&numberofconstraints,1,MPI_INT,0,MPI_COMM_WORLD);
     50        #ifdef _HAVE_MPI_
     51                MPI_Reduce(&localconstraints,&numberofconstraints,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD );
     52                MPI_Bcast(&numberofconstraints,1,MPI_INT,0,MPI_COMM_WORLD);
    5353        #else
    54         numberofconstraints=localconstraints;
     54                numberofconstraints=localconstraints;
    5555        #endif
     56       
    5657
    5758        return numberofconstraints;
Note: See TracChangeset for help on using the changeset viewer.