Changeset 15846


Ignore:
Timestamp:
08/20/13 09:53:36 (12 years ago)
Author:
Eric.Larour
Message:

CHG: implemented ISSM_MPI_Wtime for MPI case, temporary fix for the NR to run

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.cpp ΒΆ

    r15837 r15846  
    480480}/*}}}*/
    481481double ISSM_MPI_Wtime(void){/*{{{*/
    482  
    483   assert(0); // to be implemented
    484   return 0.0;
     482
     483#ifdef _HAVE_MPI_
     484        #ifdef _HAVE_AMPI_
     485        assert(0); // to be implemented
     486        return 0.0;
     487        #else
     488        return MPI_Wtime();
     489        #endif
     490#else
     491        assert(0); // to be implemented
     492        return 0.0;
     493#endif
    485494}/*}}}*/
    486495void ISSM_MPI_ContiguousInAdolc(size_t aSize) { /*{{{*/
Note: See TracChangeset for help on using the changeset viewer.