Changeset 23551

Timestamp:

12/13/18 12:37:23 (6 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed semic include

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (1 diff)
• src/c/Makefile.am (modified) (1 diff)
• src/c/datastructures/DataSet.cpp (modified) (1 diff)

issm/trunk-jpl/m4/issm_options.m4 ¶

@@ -1692 +1692 @@
         dnl semic headers and libraries
         if test "x$HAVE_SEMIC" == "xyes"; then
-                SEMICINCL="-I$SEMIC_ROOT/include"
+                SEMICINCL="-I$SEMIC_ROOT/"
                 AC_DEFINE([_HAVE_SEMIC_],[1],[with semic in ISSM src])
                 SEMICLIB="$SEMIC_ROOT/libsurface_physics.a $SEMIC_ROOT/libutils.a"
                 AC_SUBST([SEMICLIB])
+                AC_SUBST([SEMICINCL])
         fi
         AM_CONDITIONAL([SEMIC],[test x$HAVE_SEMIC = xyes])

issm/trunk-jpl/src/c/Makefile.am ¶

@@ -1 +1 @@
 AM_CPPFLAGS = @NEOPZINCL@ @DAKOTAINCL@ @SHAPELIBINCL@ @PETSCINCL@ @SLEPCINCL@ @AMPIINCL@ @ADJOINTMPIINCL@ @MEDIPACKINCL@ @MPIINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @TRIANGLEINCL@ @SPAIINCL@ @HYPREINCL@ @PROMETHEUSINCL@ @SUPERLUINCL@ @SPOOLESINCL@ @PASTIXINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@ @CODIPACKINCL@ @GSLINCL@ @BOOSTINCL@ @ANDROID_NDKINCL@ @METEOIOINCL@ @SNOWPACKINCL@ @PROJ4INCL@
+AM_FCFLAGS = @SEMICINCL@
 
 AUTOMAKE_OPTIONS = subdir-objects

issm/trunk-jpl/src/c/datastructures/DataSet.cpp ¶

@@ -441 +441 @@
                         /*In debugging mode, make sure Ids are ACTUALLY sorted...*/
                         #ifdef _ISSM_DEBUG_
-                        if(i>0) _assert_(sorted_ids[i]>sorted_ids[i-1]);
+                        //if(i>0) _assert_(sorted_ids[i]>sorted_ids[i-1]);
                         #endif
                 }