[cig-commits] [commit] devel: fixed three warnings in scotch_6.0.1rc2 (9bef9d2)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/specfem3d

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/fa99f77f37e1915ce43297ceecab198e7b1d7b65...6bc492cb02db42ff74c01612d6592589d23fec9e

>---------------------------------------------------------------

commit 9bef9d2155667887baa318bef56a9519c60f0df8
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date:   Fri Mar 7 05:16:30 2014 +0100

    fixed three warnings in scotch_6.0.1rc2


>---------------------------------------------------------------

9bef9d2155667887baa318bef56a9519c60f0df8
 .../scotch_6.0.1rc2/src/libscotch/bgraph_bipart_df_loop.c      |  2 ++
 .../scotch_6.0.1rc2/src/libscotch/kgraph_map_df_loop.c         | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/decompose_mesh/scotch_6.0.1rc2/src/libscotch/bgraph_bipart_df_loop.c b/src/decompose_mesh/scotch_6.0.1rc2/src/libscotch/bgraph_bipart_df_loop.c
index 61b4322..4f20d52 100644
--- a/src/decompose_mesh/scotch_6.0.1rc2/src/libscotch/bgraph_bipart_df_loop.c
+++ b/src/decompose_mesh/scotch_6.0.1rc2/src/libscotch/bgraph_bipart_df_loop.c
@@ -314,7 +314,9 @@ BgraphBipartDfThread * restrict thrdptr)          /* Thread-dependent data */
     }
 #endif /* BGRAPHBIPARTDFLOOPTHREAD */
   }
+#if !defined BGRAPHBIPARTDFLOOPTHREAD
 abort : ;
+#endif /* BGRAPHBIPARTDFLOOPTHREAD */
 
   for (vertnum = vertbas; vertnum < vertnnd; vertnum ++) /* Update part according to diffusion state */
     parttax[vertnum] = (difotax[vertnum] <= 0.0F) ? 0 : 1;
diff --git a/src/decompose_mesh/scotch_6.0.1rc2/src/libscotch/kgraph_map_df_loop.c b/src/decompose_mesh/scotch_6.0.1rc2/src/libscotch/kgraph_map_df_loop.c
index 0149746..24382ac 100644
--- a/src/decompose_mesh/scotch_6.0.1rc2/src/libscotch/kgraph_map_df_loop.c
+++ b/src/decompose_mesh/scotch_6.0.1rc2/src/libscotch/kgraph_map_df_loop.c
@@ -382,7 +382,7 @@ endloop1 : ;
       else
         diffval -= migrval;
       diffval = diffval / (velstax[vertnum] * crloval);
-      if (isnan (diffval)) {                      /* If overflow occured */
+      if (isnan (diffval)) {                      /* If overflow occurred */
 #ifdef SCOTCH_DEBUG_KGRAPH2
         errorPrintW (STRINGIFY (KGRAPHMAPDFLOOPNAME) ": overflow (1)");
 #endif /* SCOTCH_DEBUG_KGRAPH2 */
@@ -476,7 +476,7 @@ endloop2 : ;
 
       if (diffval <= 0.0F)                        /* Amount of liquid cannot be negative   */
         diffval = 0.0F;
-      if (isnan (diffval)) {                      /* If overflow occured */
+      if (isnan (diffval)) {                      /* If overflow occurred */
 #ifdef SCOTCH_DEBUG_KGRAPH2
         errorPrintW (STRINGIFY (KGRAPHMAPDFLOOPNAME) ": overflow (2)");
 #endif /* SCOTCH_DEBUG_KGRAPH2 */
@@ -495,7 +495,9 @@ endloop2 : ;
     difttax = (KgraphMapDfVertex *) difntax;      /* Swap old and new diffusion arrays          */
     difntax = (KgraphMapDfVertex *) difotax;      /* Casts to prevent IBM compiler from yelling */
     difotax = (KgraphMapDfVertex *) difttax;
-abort1 : ;                                        /* If overflow occured, resume here */
+#ifdef KGRAPHMAPDFLOOPTHREAD
+abort1 : ;                                        /* If overflow occurred, resume here */
+#endif
 #ifdef KGRAPHMAPDFLOOPTHREAD
     threadBarrier (thrdptr);
 
@@ -503,7 +505,9 @@ abort1 : ;                                        /* If overflow occured, resume
       break;
 #endif /* KGRAPHMAPDFLOOPTHREAD */
   }
+#if !defined KGRAPHMAPDFLOOPTHREAD
 abort2 : ;
+#endif
 
   for (vertnum = vertbas; vertnum < vertnnd; vertnum ++) /* Set new part distribution of local vertices */
     parttax[vertnum] = difntax[vertnum].partval;