[cig-commits] [commit] master: patched this useless (when called from SPECFEM) routine to avoid compilation problems on MAC OS (8263787)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Sat Oct 18 10:15:02 PDT 2014
Repository : https://github.com/geodynamics/specfem2d
On branch : master
Link : https://github.com/geodynamics/specfem2d/compare/843077844985b2d49d495eaf53cdb8a9d8cb47f0...826378781b28158178dce88bf7de32a60a40594f
>---------------------------------------------------------------
commit 826378781b28158178dce88bf7de32a60a40594f
Author: Dimitri Komatitsch <komatits at users.noreply.github.com>
Date: Sat Oct 18 19:15:39 2014 +0200
patched this useless (when called from SPECFEM) routine to avoid compilation problems on MAC OS
>---------------------------------------------------------------
826378781b28158178dce88bf7de32a60a40594f
src/meshfem2D/scotch_5.1.12b/src/libscotch/common.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/meshfem2D/scotch_5.1.12b/src/libscotch/common.c b/src/meshfem2D/scotch_5.1.12b/src/libscotch/common.c
index faa1449..8f6808c 100644
--- a/src/meshfem2D/scotch_5.1.12b/src/libscotch/common.c
+++ b/src/meshfem2D/scotch_5.1.12b/src/libscotch/common.c
@@ -105,11 +105,13 @@ clockGet (void)
((double) data.ru_utime.tv_usec + (double) data.ru_stime.tv_usec) * 1.0e-6L);
#else /* COMMON_TIMING_OLD */
#if defined (_POSIX_TIMERS) && (_POSIX_TIMERS >= 200112L)
- struct timespec tp;
+// struct timespec tp;
- clock_gettime (CLOCK_REALTIME, &tp); /* Elapsed time */
+// clock_gettime (CLOCK_REALTIME, &tp); /* Elapsed time */
- return ((double) tp.tv_sec + (double) tp.tv_nsec * 1.0e-9L);
+// return ((double) tp.tv_sec + (double) tp.tv_nsec * 1.0e-9L);
+// DK DK patched this useless (when called from SPECFEM) routine to avoid compilation problems on MAC OS
+ return (1.0e-6L);
#else /* defined (_POSIX_TIMERS) && (_POSIX_TIMERS >= 200112L) */
struct timeval tv;
More information about the CIG-COMMITS
mailing list