diff --git a/Makefile.in b/Makefile.in index 73185468dc2..7d04c02cb9e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3998,7 +3998,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/configure b/configure index 9838d5338ac..17d8b1a6517 100755 --- a/configure +++ b/configure @@ -675,9 +675,12 @@ LIBMESH_ENABLE_LIBHILBERT_FALSE LIBMESH_ENABLE_LIBHILBERT_TRUE LIBHILBERT_LIBRARY LIBHILBERT_INCLUDE +LIBMESH_ENABLE_NEMESIS_V522_FALSE +LIBMESH_ENABLE_NEMESIS_V522_TRUE +LIBMESH_ENABLE_NEMESIS_V309_FALSE +LIBMESH_ENABLE_NEMESIS_V309_TRUE LIBMESH_ENABLE_NEMESIS_FALSE LIBMESH_ENABLE_NEMESIS_TRUE -NEMESIS_LIBRARY NEMESIS_INCLUDE LIBMESH_ENABLE_EXODUS_V522_FALSE LIBMESH_ENABLE_EXODUS_V522_TRUE @@ -31861,44 +31864,53 @@ fi # Check whether --enable-nemesis was given. if test "${enable_nemesis+set}" = set; then : enableval=$enable_nemesis; case "${enableval}" in - yes) enablenemesis=yes ;; - no) enablenemesis=no ;; - *) as_fn_error $? "bad value ${enableval} for --enable-nemesis" "$LINENO" 5 ;; + yes|v309) enablenemesis=yes ; nemesisversion="v3.09" ;; + new|v522) enablenemesis=yes ; nemesisversion="v5.22" ;; + no) enablenemesis=no ; nemesisversion=no ;; + *) as_fn_error $? "bad value ${enableval} for --enable-nemesis" "$LINENO" 5 ;; esac else - enablenemesis=$enableexodus + enablenemesis=$enableexodus ; nemesisversion="v3.09" fi # if unspecified, depend on exodus # Trump --enable-nemesis with --disable-mpi if (test "x$enablempi" = xno); then - enablenemesis=no + nemesisversion=no fi - if (test $enablenemesis = yes); then - NEMESIS_INCLUDE="-I\$(top_srcdir)/contrib/nemesis/Lib" - NEMESIS_LIBRARY="\$(EXTERNAL_LIBDIR)/libnemesis\$(libext)" + case "${nemesisversion}" in + + "v3.09") + # The NEMESIS API is distributed with libmesh, so we don't have to guess + # where it might be installed... + NEMESIS_INCLUDE="-I\$(top_srcdir)/contrib/nemesis/$nemesisversion" $as_echo "#define HAVE_NEMESIS_API 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: <<< Configuring library with Nemesis support >>>" >&5 -$as_echo "<<< Configuring library with Nemesis support >>>" >&6; } - have_nemesis=yes - else - NEMESIS_INCLUDE="" - NEMESIS_LIBRARY="" - enablenemesis=no - have_nemesis=no - fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: <<< Configuring library with Nemesis version $nemesisversion support >>>" >&5 +$as_echo "<<< Configuring library with Nemesis version $nemesisversion support >>>" >&6; } + ;; + + "v5.22") + exit 1 + ;; + + *) + NEMESIS_INCLUDE="" + enablenemesis=no + ;; + esac + ac_config_files="$ac_config_files contrib/nemesis/v3.09/Makefile" if (test $enablenemesis = yes); then libmesh_contrib_INCLUDES="$NEMESIS_INCLUDE $libmesh_contrib_INCLUDES" fi - if test x$enablenemesis = xyes; then + if test x$enablenemesis = xyes; then LIBMESH_ENABLE_NEMESIS_TRUE= LIBMESH_ENABLE_NEMESIS_FALSE='#' else @@ -31906,7 +31918,21 @@ else LIBMESH_ENABLE_NEMESIS_FALSE= fi - ac_config_files="$ac_config_files contrib/nemesis/Lib/Makefile" + if test x$nemesisversion = xv3.09; then + LIBMESH_ENABLE_NEMESIS_V309_TRUE= + LIBMESH_ENABLE_NEMESIS_V309_FALSE='#' +else + LIBMESH_ENABLE_NEMESIS_V309_TRUE='#' + LIBMESH_ENABLE_NEMESIS_V309_FALSE= +fi + + if test x$nemesisversion = xv5.22; then + LIBMESH_ENABLE_NEMESIS_V522_TRUE= + LIBMESH_ENABLE_NEMESIS_V522_FALSE='#' +else + LIBMESH_ENABLE_NEMESIS_V522_TRUE='#' + LIBMESH_ENABLE_NEMESIS_V522_FALSE= +fi # ------------------------------------------------------------- # ------------------------------------------------------------- @@ -32895,6 +32921,14 @@ if test -z "${LIBMESH_ENABLE_NEMESIS_TRUE}" && test -z "${LIBMESH_ENABLE_NEMESIS as_fn_error $? "conditional \"LIBMESH_ENABLE_NEMESIS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${LIBMESH_ENABLE_NEMESIS_V309_TRUE}" && test -z "${LIBMESH_ENABLE_NEMESIS_V309_FALSE}"; then + as_fn_error $? "conditional \"LIBMESH_ENABLE_NEMESIS_V309\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${LIBMESH_ENABLE_NEMESIS_V522_TRUE}" && test -z "${LIBMESH_ENABLE_NEMESIS_V522_FALSE}"; then + as_fn_error $? "conditional \"LIBMESH_ENABLE_NEMESIS_V522\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${LIBMESH_ENABLE_LIBHILBERT_TRUE}" && test -z "${LIBMESH_ENABLE_LIBHILBERT_FALSE}"; then as_fn_error $? "conditional \"LIBMESH_ENABLE_LIBHILBERT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -34107,7 +34141,7 @@ do "contrib/netcdf/v3/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/netcdf/v3/Makefile" ;; "contrib/exodusii/v5.09/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/exodusii/v5.09/Makefile" ;; "contrib/exodusii/v5.22/exodus/cbind/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/exodusii/v5.22/exodus/cbind/Makefile" ;; - "contrib/nemesis/Lib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/nemesis/Lib/Makefile" ;; + "contrib/nemesis/v3.09/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/nemesis/v3.09/Makefile" ;; "contrib/libHilbert/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/libHilbert/Makefile" ;; "contrib/fparser/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/fparser/Makefile" ;; "contrib/fparser/extrasrc/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/fparser/extrasrc/Makefile" ;; @@ -36349,6 +36383,9 @@ if (test "x$enableoptional" = "xyes"); then echo ' 'mpi.............................. : $enablempi echo ' 'nanoflann........................ : $enablenanoflann echo ' 'nemesis.......................... : $enablenemesis + if (test "x$nemesisversion" != "xno"); then + echo ' 'version....................... : $nemesisversion + fi echo ' 'netcdf........................... : $enablenetcdf if (test "x$netcdfversion" != "xno"); then echo ' 'version....................... : $netcdfversion diff --git a/contrib/Makefile.am b/contrib/Makefile.am index d3a69d80801..0f36275fa25 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -75,15 +75,19 @@ if LIBMESH_ENABLE_EXODUS_V522 endif endif + if LIBMESH_ENABLE_NEMESIS - SUBDIRS += nemesis/Lib - opt_libs += nemesis/Lib/libopt.la - dbg_libs += nemesis/Lib/libdbg.la - devel_libs += nemesis/Lib/libdevel.la - prof_libs += nemesis/Lib/libprof.la - oprof_libs += nemesis/Lib/liboprof.la +if LIBMESH_ENABLE_NEMESIS_V309 + SUBDIRS += nemesis/v3.09 + opt_libs += nemesis/v3.09/libopt.la + dbg_libs += nemesis/v3.09/libdbg.la + devel_libs += nemesis/v3.09/libdevel.la + prof_libs += nemesis/v3.09/libprof.la + oprof_libs += nemesis/v3.09/liboprof.la +endif endif + if LIBMESH_ENABLE_TECIO SUBDIRS += tecplot/tecio opt_libs += tecplot/tecio/libopt.la diff --git a/contrib/Makefile.in b/contrib/Makefile.in index 258bc89d655..19a696a1a1f 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -92,12 +92,12 @@ target_triplet = @target@ @LIBMESH_ENABLE_EXODUS_TRUE@@LIBMESH_ENABLE_EXODUS_V522_TRUE@am__append_35 = exodusii/v5.22/exodus/cbind/libdevel.la @LIBMESH_ENABLE_EXODUS_TRUE@@LIBMESH_ENABLE_EXODUS_V522_TRUE@am__append_36 = exodusii/v5.22/exodus/cbind/libprof.la @LIBMESH_ENABLE_EXODUS_TRUE@@LIBMESH_ENABLE_EXODUS_V522_TRUE@am__append_37 = exodusii/v5.22/exodus/cbind/liboprof.la -@LIBMESH_ENABLE_NEMESIS_TRUE@am__append_38 = nemesis/Lib -@LIBMESH_ENABLE_NEMESIS_TRUE@am__append_39 = nemesis/Lib/libopt.la -@LIBMESH_ENABLE_NEMESIS_TRUE@am__append_40 = nemesis/Lib/libdbg.la -@LIBMESH_ENABLE_NEMESIS_TRUE@am__append_41 = nemesis/Lib/libdevel.la -@LIBMESH_ENABLE_NEMESIS_TRUE@am__append_42 = nemesis/Lib/libprof.la -@LIBMESH_ENABLE_NEMESIS_TRUE@am__append_43 = nemesis/Lib/liboprof.la +@LIBMESH_ENABLE_NEMESIS_TRUE@@LIBMESH_ENABLE_NEMESIS_V309_TRUE@am__append_38 = nemesis/v3.09 +@LIBMESH_ENABLE_NEMESIS_TRUE@@LIBMESH_ENABLE_NEMESIS_V309_TRUE@am__append_39 = nemesis/v3.09/libopt.la +@LIBMESH_ENABLE_NEMESIS_TRUE@@LIBMESH_ENABLE_NEMESIS_V309_TRUE@am__append_40 = nemesis/v3.09/libdbg.la +@LIBMESH_ENABLE_NEMESIS_TRUE@@LIBMESH_ENABLE_NEMESIS_V309_TRUE@am__append_41 = nemesis/v3.09/libdevel.la +@LIBMESH_ENABLE_NEMESIS_TRUE@@LIBMESH_ENABLE_NEMESIS_V309_TRUE@am__append_42 = nemesis/v3.09/libprof.la +@LIBMESH_ENABLE_NEMESIS_TRUE@@LIBMESH_ENABLE_NEMESIS_V309_TRUE@am__append_43 = nemesis/v3.09/liboprof.la @LIBMESH_ENABLE_TECIO_TRUE@am__append_44 = tecplot/tecio @LIBMESH_ENABLE_TECIO_TRUE@am__append_45 = tecplot/tecio/libopt.la @LIBMESH_ENABLE_TECIO_TRUE@am__append_46 = tecplot/tecio/libdbg.la @@ -363,7 +363,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = boost/include gmv gzstream netcdf/v3 netcdf/v4 \ - exodusii/v5.09 exodusii/v5.22/exodus/cbind nemesis/Lib \ + exodusii/v5.09 exodusii/v5.22/exodus/cbind nemesis/v3.09 \ tecplot/tecio triangle tetgen libHilbert laspack metis \ parmetis sfcurves fparser nanoflann DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -517,7 +517,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/contrib/boost/include/Makefile.in b/contrib/boost/include/Makefile.in index 890079b1f76..37a29890c1b 100644 --- a/contrib/boost/include/Makefile.in +++ b/contrib/boost/include/Makefile.in @@ -529,7 +529,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/contrib/exodusii/5.22b/exodus/cbind/Makefile.in b/contrib/exodusii/5.22b/exodus/cbind/Makefile.in index c921f803dd5..e95a8b7fed9 100644 --- a/contrib/exodusii/5.22b/exodus/cbind/Makefile.in +++ b/contrib/exodusii/5.22b/exodus/cbind/Makefile.in @@ -1891,7 +1891,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/contrib/exodusii/Lib/Makefile.in b/contrib/exodusii/Lib/Makefile.in index 8ebca438407..b5969f207ab 100644 --- a/contrib/exodusii/Lib/Makefile.in +++ b/contrib/exodusii/Lib/Makefile.in @@ -1016,7 +1016,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/contrib/fparser/Makefile.in b/contrib/fparser/Makefile.in index 960e83c78fa..d9eccfd7d5a 100644 --- a/contrib/fparser/Makefile.in +++ b/contrib/fparser/Makefile.in @@ -466,7 +466,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/contrib/fparser/extrasrc/Makefile.in b/contrib/fparser/extrasrc/Makefile.in index 1c09f3fa5d3..1f710d84911 100644 --- a/contrib/fparser/extrasrc/Makefile.in +++ b/contrib/fparser/extrasrc/Makefile.in @@ -243,7 +243,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/contrib/gmv/Makefile.in b/contrib/gmv/Makefile.in index 2319219a559..2e192280421 100644 --- a/contrib/gmv/Makefile.in +++ b/contrib/gmv/Makefile.in @@ -325,7 +325,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/contrib/gzstream/Makefile.in b/contrib/gzstream/Makefile.in index 3e86f4b6f86..298e00d565a 100644 --- a/contrib/gzstream/Makefile.in +++ b/contrib/gzstream/Makefile.in @@ -347,7 +347,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/contrib/laspack/Makefile.in b/contrib/laspack/Makefile.in index e68cef92b53..b0cc56716bd 100644 --- a/contrib/laspack/Makefile.in +++ b/contrib/laspack/Makefile.in @@ -385,7 +385,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/contrib/libHilbert/Makefile.in b/contrib/libHilbert/Makefile.in index ca312c4a254..3746366febb 100644 --- a/contrib/libHilbert/Makefile.in +++ b/contrib/libHilbert/Makefile.in @@ -388,7 +388,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/contrib/metis/Makefile.in b/contrib/metis/Makefile.in index 93929fa851b..a8bb7ced98b 100644 --- a/contrib/metis/Makefile.in +++ b/contrib/metis/Makefile.in @@ -586,7 +586,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/contrib/nanoflann/Makefile.in b/contrib/nanoflann/Makefile.in index c00c18ff501..ec651e4165c 100644 --- a/contrib/nanoflann/Makefile.in +++ b/contrib/nanoflann/Makefile.in @@ -355,7 +355,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/contrib/nemesis/Lib/Makefile.in b/contrib/nemesis/Lib/Makefile.in index 5dc305054cb..938f343fd22 100644 --- a/contrib/nemesis/Lib/Makefile.in +++ b/contrib/nemesis/Lib/Makefile.in @@ -59,7 +59,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ @LIBMESH_OPT_MODE_TRUE@am__append_3 = libopt.la @LIBMESH_PROF_MODE_TRUE@am__append_4 = libprof.la @LIBMESH_OPROF_MODE_TRUE@am__append_5 = liboprof.la -subdir = contrib/nemesis/Lib +subdir = contrib/nemesis/v3.09 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_rtti.m4 \ $(top_srcdir)/m4/ax_boost_base.m4 \ @@ -485,7 +485,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -742,9 +741,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/nemesis/Lib/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/nemesis/v3.09/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu contrib/nemesis/Lib/Makefile + $(AUTOMAKE) --gnu contrib/nemesis/v3.09/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/contrib/nemesis/v3.09 b/contrib/nemesis/v3.09 new file mode 120000 index 00000000000..fb18f026ea3 --- /dev/null +++ b/contrib/nemesis/v3.09 @@ -0,0 +1 @@ +Lib \ No newline at end of file diff --git a/contrib/nemesis/v5.22 b/contrib/nemesis/v5.22 new file mode 120000 index 00000000000..5da10fae7d3 --- /dev/null +++ b/contrib/nemesis/v5.22 @@ -0,0 +1 @@ +../exodusii/5.22b \ No newline at end of file diff --git a/contrib/netcdf/Lib/Makefile.in b/contrib/netcdf/Lib/Makefile.in index d937b0b4380..28178c93417 100644 --- a/contrib/netcdf/Lib/Makefile.in +++ b/contrib/netcdf/Lib/Makefile.in @@ -388,7 +388,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/contrib/parmetis/Makefile.in b/contrib/parmetis/Makefile.in index cd75fe21dee..1e87f84bc1d 100644 --- a/contrib/parmetis/Makefile.in +++ b/contrib/parmetis/Makefile.in @@ -476,7 +476,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/contrib/sfcurves/Makefile.in b/contrib/sfcurves/Makefile.in index 1e4c009a5e8..ad0b0dd24d8 100644 --- a/contrib/sfcurves/Makefile.in +++ b/contrib/sfcurves/Makefile.in @@ -335,7 +335,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/contrib/tecplot/tecio/Makefile.in b/contrib/tecplot/tecio/Makefile.in index 7ba8ca6ed36..3ff7313ebb1 100644 --- a/contrib/tecplot/tecio/Makefile.in +++ b/contrib/tecplot/tecio/Makefile.in @@ -469,7 +469,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/contrib/tetgen/Makefile.in b/contrib/tetgen/Makefile.in index ced88d76953..0a206240272 100644 --- a/contrib/tetgen/Makefile.in +++ b/contrib/tetgen/Makefile.in @@ -355,7 +355,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/contrib/triangle/Makefile.in b/contrib/triangle/Makefile.in index ba0e1834200..757c8a93b22 100644 --- a/contrib/triangle/Makefile.in +++ b/contrib/triangle/Makefile.in @@ -355,7 +355,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/Makefile.in b/examples/Makefile.in index e844a206910..445ad547a55 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -308,7 +308,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/adaptivity/adaptivity_ex1/Makefile.in b/examples/adaptivity/adaptivity_ex1/Makefile.in index 043b9aff19b..811e15c362f 100644 --- a/examples/adaptivity/adaptivity_ex1/Makefile.in +++ b/examples/adaptivity/adaptivity_ex1/Makefile.in @@ -390,7 +390,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/adaptivity/adaptivity_ex2/Makefile.in b/examples/adaptivity/adaptivity_ex2/Makefile.in index 3dbf0fea7a3..fa99b88d446 100644 --- a/examples/adaptivity/adaptivity_ex2/Makefile.in +++ b/examples/adaptivity/adaptivity_ex2/Makefile.in @@ -404,7 +404,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/adaptivity/adaptivity_ex3/Makefile.in b/examples/adaptivity/adaptivity_ex3/Makefile.in index dca003119c4..d81c1fd47cd 100644 --- a/examples/adaptivity/adaptivity_ex3/Makefile.in +++ b/examples/adaptivity/adaptivity_ex3/Makefile.in @@ -396,7 +396,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/adaptivity/adaptivity_ex4/Makefile.in b/examples/adaptivity/adaptivity_ex4/Makefile.in index ba9ea49d3fe..4ebe527c51a 100644 --- a/examples/adaptivity/adaptivity_ex4/Makefile.in +++ b/examples/adaptivity/adaptivity_ex4/Makefile.in @@ -395,7 +395,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/adaptivity/adaptivity_ex5/Makefile.in b/examples/adaptivity/adaptivity_ex5/Makefile.in index 3d9448639f8..bea9c3e3f3f 100644 --- a/examples/adaptivity/adaptivity_ex5/Makefile.in +++ b/examples/adaptivity/adaptivity_ex5/Makefile.in @@ -400,7 +400,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/adjoints/adjoints_ex1/Makefile.in b/examples/adjoints/adjoints_ex1/Makefile.in index fde3f511e17..39739948f98 100644 --- a/examples/adjoints/adjoints_ex1/Makefile.in +++ b/examples/adjoints/adjoints_ex1/Makefile.in @@ -454,7 +454,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/adjoints/adjoints_ex2/Makefile.in b/examples/adjoints/adjoints_ex2/Makefile.in index 0af288d16f8..06b2d23a0dc 100644 --- a/examples/adjoints/adjoints_ex2/Makefile.in +++ b/examples/adjoints/adjoints_ex2/Makefile.in @@ -442,7 +442,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/adjoints/adjoints_ex3/Makefile.in b/examples/adjoints/adjoints_ex3/Makefile.in index dec96c2db00..05c9814232d 100644 --- a/examples/adjoints/adjoints_ex3/Makefile.in +++ b/examples/adjoints/adjoints_ex3/Makefile.in @@ -454,7 +454,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/adjoints/adjoints_ex4/Makefile.in b/examples/adjoints/adjoints_ex4/Makefile.in index 5492a445048..cd5e259754d 100644 --- a/examples/adjoints/adjoints_ex4/Makefile.in +++ b/examples/adjoints/adjoints_ex4/Makefile.in @@ -454,7 +454,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/adjoints/adjoints_ex5/Makefile.in b/examples/adjoints/adjoints_ex5/Makefile.in index a8bb2d32408..2d7d0652cb8 100644 --- a/examples/adjoints/adjoints_ex5/Makefile.in +++ b/examples/adjoints/adjoints_ex5/Makefile.in @@ -454,7 +454,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/eigenproblems/eigenproblems_ex1/Makefile.in b/examples/eigenproblems/eigenproblems_ex1/Makefile.in index 4fa819bd2a4..ad063400181 100644 --- a/examples/eigenproblems/eigenproblems_ex1/Makefile.in +++ b/examples/eigenproblems/eigenproblems_ex1/Makefile.in @@ -390,7 +390,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/eigenproblems/eigenproblems_ex2/Makefile.in b/examples/eigenproblems/eigenproblems_ex2/Makefile.in index 45d24dd8572..eb6c0ca733e 100644 --- a/examples/eigenproblems/eigenproblems_ex2/Makefile.in +++ b/examples/eigenproblems/eigenproblems_ex2/Makefile.in @@ -390,7 +390,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/eigenproblems/eigenproblems_ex3/Makefile.in b/examples/eigenproblems/eigenproblems_ex3/Makefile.in index d189e0819a1..dfddcf4dd86 100644 --- a/examples/eigenproblems/eigenproblems_ex3/Makefile.in +++ b/examples/eigenproblems/eigenproblems_ex3/Makefile.in @@ -396,7 +396,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/fem_system/fem_system_ex1/Makefile.in b/examples/fem_system/fem_system_ex1/Makefile.in index f8c691b2520..acfac00a050 100644 --- a/examples/fem_system/fem_system_ex1/Makefile.in +++ b/examples/fem_system/fem_system_ex1/Makefile.in @@ -419,7 +419,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/fem_system/fem_system_ex2/Makefile.in b/examples/fem_system/fem_system_ex2/Makefile.in index e90fde144a4..ee9f9fecdff 100644 --- a/examples/fem_system/fem_system_ex2/Makefile.in +++ b/examples/fem_system/fem_system_ex2/Makefile.in @@ -429,7 +429,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/introduction/introduction_ex1/Makefile.in b/examples/introduction/introduction_ex1/Makefile.in index 5615d09a52d..e3550057506 100644 --- a/examples/introduction/introduction_ex1/Makefile.in +++ b/examples/introduction/introduction_ex1/Makefile.in @@ -390,7 +390,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/introduction/introduction_ex2/Makefile.in b/examples/introduction/introduction_ex2/Makefile.in index 23f7c3d415d..5b5b984d161 100644 --- a/examples/introduction/introduction_ex2/Makefile.in +++ b/examples/introduction/introduction_ex2/Makefile.in @@ -390,7 +390,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/introduction/introduction_ex3/Makefile.in b/examples/introduction/introduction_ex3/Makefile.in index 89db21376bb..ecc63a7c921 100644 --- a/examples/introduction/introduction_ex3/Makefile.in +++ b/examples/introduction/introduction_ex3/Makefile.in @@ -400,7 +400,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/introduction/introduction_ex4/Makefile.in b/examples/introduction/introduction_ex4/Makefile.in index 97ccc580adc..0b98d16ee2e 100644 --- a/examples/introduction/introduction_ex4/Makefile.in +++ b/examples/introduction/introduction_ex4/Makefile.in @@ -400,7 +400,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/introduction/introduction_ex5/Makefile.in b/examples/introduction/introduction_ex5/Makefile.in index 3530a2ce9f1..a5da6eca089 100644 --- a/examples/introduction/introduction_ex5/Makefile.in +++ b/examples/introduction/introduction_ex5/Makefile.in @@ -400,7 +400,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/miscellaneous/miscellaneous_ex1/Makefile.in b/examples/miscellaneous/miscellaneous_ex1/Makefile.in index ad44b21ac7a..7e654f59eef 100644 --- a/examples/miscellaneous/miscellaneous_ex1/Makefile.in +++ b/examples/miscellaneous/miscellaneous_ex1/Makefile.in @@ -390,7 +390,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/miscellaneous/miscellaneous_ex2/Makefile.in b/examples/miscellaneous/miscellaneous_ex2/Makefile.in index dc6a7159ee6..e31fe80826e 100644 --- a/examples/miscellaneous/miscellaneous_ex2/Makefile.in +++ b/examples/miscellaneous/miscellaneous_ex2/Makefile.in @@ -395,7 +395,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/miscellaneous/miscellaneous_ex3/Makefile.in b/examples/miscellaneous/miscellaneous_ex3/Makefile.in index dc29b4dc521..e8fbca361a0 100644 --- a/examples/miscellaneous/miscellaneous_ex3/Makefile.in +++ b/examples/miscellaneous/miscellaneous_ex3/Makefile.in @@ -395,7 +395,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/miscellaneous/miscellaneous_ex4/Makefile.in b/examples/miscellaneous/miscellaneous_ex4/Makefile.in index b1b6e3f4822..9c6ceeb5cb9 100644 --- a/examples/miscellaneous/miscellaneous_ex4/Makefile.in +++ b/examples/miscellaneous/miscellaneous_ex4/Makefile.in @@ -390,7 +390,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/miscellaneous/miscellaneous_ex5/Makefile.in b/examples/miscellaneous/miscellaneous_ex5/Makefile.in index e0d81c056e4..7780b015f4f 100644 --- a/examples/miscellaneous/miscellaneous_ex5/Makefile.in +++ b/examples/miscellaneous/miscellaneous_ex5/Makefile.in @@ -404,7 +404,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/miscellaneous/miscellaneous_ex6/Makefile.in b/examples/miscellaneous/miscellaneous_ex6/Makefile.in index de9ec7f357f..4686e36ff40 100644 --- a/examples/miscellaneous/miscellaneous_ex6/Makefile.in +++ b/examples/miscellaneous/miscellaneous_ex6/Makefile.in @@ -390,7 +390,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/miscellaneous/miscellaneous_ex7/Makefile.in b/examples/miscellaneous/miscellaneous_ex7/Makefile.in index dded94c4e18..ec482e02bc3 100644 --- a/examples/miscellaneous/miscellaneous_ex7/Makefile.in +++ b/examples/miscellaneous/miscellaneous_ex7/Makefile.in @@ -423,7 +423,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/miscellaneous/miscellaneous_ex8/Makefile.in b/examples/miscellaneous/miscellaneous_ex8/Makefile.in index a056cab0bcd..49b34ef5aa6 100644 --- a/examples/miscellaneous/miscellaneous_ex8/Makefile.in +++ b/examples/miscellaneous/miscellaneous_ex8/Makefile.in @@ -419,7 +419,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/reduced_basis/reduced_basis_ex1/Makefile.in b/examples/reduced_basis/reduced_basis_ex1/Makefile.in index ef3ea5ab95f..a696c34be0f 100644 --- a/examples/reduced_basis/reduced_basis_ex1/Makefile.in +++ b/examples/reduced_basis/reduced_basis_ex1/Makefile.in @@ -414,7 +414,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/reduced_basis/reduced_basis_ex2/Makefile.in b/examples/reduced_basis/reduced_basis_ex2/Makefile.in index 603ad9a1f25..baa5141ebd2 100644 --- a/examples/reduced_basis/reduced_basis_ex2/Makefile.in +++ b/examples/reduced_basis/reduced_basis_ex2/Makefile.in @@ -414,7 +414,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/reduced_basis/reduced_basis_ex3/Makefile.in b/examples/reduced_basis/reduced_basis_ex3/Makefile.in index d02bb60dfcb..ba7c4fd0bde 100644 --- a/examples/reduced_basis/reduced_basis_ex3/Makefile.in +++ b/examples/reduced_basis/reduced_basis_ex3/Makefile.in @@ -414,7 +414,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/reduced_basis/reduced_basis_ex4/Makefile.in b/examples/reduced_basis/reduced_basis_ex4/Makefile.in index 1c899654a2b..ee157bc21e6 100644 --- a/examples/reduced_basis/reduced_basis_ex4/Makefile.in +++ b/examples/reduced_basis/reduced_basis_ex4/Makefile.in @@ -419,7 +419,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/reduced_basis/reduced_basis_ex5/Makefile.in b/examples/reduced_basis/reduced_basis_ex5/Makefile.in index bb5a8895d51..bf6a20d8461 100644 --- a/examples/reduced_basis/reduced_basis_ex5/Makefile.in +++ b/examples/reduced_basis/reduced_basis_ex5/Makefile.in @@ -419,7 +419,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/reduced_basis/reduced_basis_ex6/Makefile.in b/examples/reduced_basis/reduced_basis_ex6/Makefile.in index 793519e81b9..847aa496cb6 100644 --- a/examples/reduced_basis/reduced_basis_ex6/Makefile.in +++ b/examples/reduced_basis/reduced_basis_ex6/Makefile.in @@ -419,7 +419,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/reduced_basis/reduced_basis_ex7/Makefile.in b/examples/reduced_basis/reduced_basis_ex7/Makefile.in index fe74b961d06..d44d86f2f64 100644 --- a/examples/reduced_basis/reduced_basis_ex7/Makefile.in +++ b/examples/reduced_basis/reduced_basis_ex7/Makefile.in @@ -414,7 +414,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/solution_transfer/solution_transfer_ex1/Makefile.in b/examples/solution_transfer/solution_transfer_ex1/Makefile.in index e985d7a80d0..668f5c73399 100644 --- a/examples/solution_transfer/solution_transfer_ex1/Makefile.in +++ b/examples/solution_transfer/solution_transfer_ex1/Makefile.in @@ -390,7 +390,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/subdomains/subdomains_ex1/Makefile.in b/examples/subdomains/subdomains_ex1/Makefile.in index d1259b0d7b2..dfeaf0d489a 100644 --- a/examples/subdomains/subdomains_ex1/Makefile.in +++ b/examples/subdomains/subdomains_ex1/Makefile.in @@ -400,7 +400,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/subdomains/subdomains_ex2/Makefile.in b/examples/subdomains/subdomains_ex2/Makefile.in index 37edf5751f0..1961e621023 100644 --- a/examples/subdomains/subdomains_ex2/Makefile.in +++ b/examples/subdomains/subdomains_ex2/Makefile.in @@ -400,7 +400,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/systems_of_equations/systems_of_equations_ex1/Makefile.in b/examples/systems_of_equations/systems_of_equations_ex1/Makefile.in index 12e4478affe..ae85ce22a25 100644 --- a/examples/systems_of_equations/systems_of_equations_ex1/Makefile.in +++ b/examples/systems_of_equations/systems_of_equations_ex1/Makefile.in @@ -390,7 +390,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/systems_of_equations/systems_of_equations_ex2/Makefile.in b/examples/systems_of_equations/systems_of_equations_ex2/Makefile.in index 2fb9df4beba..f70ba3420a9 100644 --- a/examples/systems_of_equations/systems_of_equations_ex2/Makefile.in +++ b/examples/systems_of_equations/systems_of_equations_ex2/Makefile.in @@ -395,7 +395,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/systems_of_equations/systems_of_equations_ex3/Makefile.in b/examples/systems_of_equations/systems_of_equations_ex3/Makefile.in index 2bed5dab57d..eebc5f1a147 100644 --- a/examples/systems_of_equations/systems_of_equations_ex3/Makefile.in +++ b/examples/systems_of_equations/systems_of_equations_ex3/Makefile.in @@ -390,7 +390,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/systems_of_equations/systems_of_equations_ex4/Makefile.in b/examples/systems_of_equations/systems_of_equations_ex4/Makefile.in index 6a147d587be..008428ef732 100644 --- a/examples/systems_of_equations/systems_of_equations_ex4/Makefile.in +++ b/examples/systems_of_equations/systems_of_equations_ex4/Makefile.in @@ -390,7 +390,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/systems_of_equations/systems_of_equations_ex5/Makefile.in b/examples/systems_of_equations/systems_of_equations_ex5/Makefile.in index 19a3ef9ca3d..d337bbf0aa5 100644 --- a/examples/systems_of_equations/systems_of_equations_ex5/Makefile.in +++ b/examples/systems_of_equations/systems_of_equations_ex5/Makefile.in @@ -390,7 +390,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/systems_of_equations/systems_of_equations_ex6/Makefile.in b/examples/systems_of_equations/systems_of_equations_ex6/Makefile.in index b1932feb66e..975fa96cb2b 100644 --- a/examples/systems_of_equations/systems_of_equations_ex6/Makefile.in +++ b/examples/systems_of_equations/systems_of_equations_ex6/Makefile.in @@ -390,7 +390,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/transient/transient_ex1/Makefile.in b/examples/transient/transient_ex1/Makefile.in index 0a163f4787c..84c7a8cdfb4 100644 --- a/examples/transient/transient_ex1/Makefile.in +++ b/examples/transient/transient_ex1/Makefile.in @@ -400,7 +400,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/transient/transient_ex2/Makefile.in b/examples/transient/transient_ex2/Makefile.in index 24051dd18cd..ebf91b2631d 100644 --- a/examples/transient/transient_ex2/Makefile.in +++ b/examples/transient/transient_ex2/Makefile.in @@ -391,7 +391,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/vector_fe/vector_fe_ex1/Makefile.in b/examples/vector_fe/vector_fe_ex1/Makefile.in index c7edebec855..41a1b8247a4 100644 --- a/examples/vector_fe/vector_fe_ex1/Makefile.in +++ b/examples/vector_fe/vector_fe_ex1/Makefile.in @@ -398,7 +398,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/vector_fe/vector_fe_ex2/Makefile.in b/examples/vector_fe/vector_fe_ex2/Makefile.in index 4f594c4b5ff..8b1340e617b 100644 --- a/examples/vector_fe/vector_fe_ex2/Makefile.in +++ b/examples/vector_fe/vector_fe_ex2/Makefile.in @@ -424,7 +424,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/examples/vector_fe/vector_fe_ex3/Makefile.in b/examples/vector_fe/vector_fe_ex3/Makefile.in index e37ede7c17e..ac6764c8170 100644 --- a/examples/vector_fe/vector_fe_ex3/Makefile.in +++ b/examples/vector_fe/vector_fe_ex3/Makefile.in @@ -425,7 +425,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/include/Makefile.in b/include/Makefile.in index d6096c4a8a0..19e238d026c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -312,7 +312,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/include/libmesh/Makefile.in b/include/libmesh/Makefile.in index 864ae2cbad7..d0d26c49934 100644 --- a/include/libmesh/Makefile.in +++ b/include/libmesh/Makefile.in @@ -255,7 +255,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/m4/config_summary.m4 b/m4/config_summary.m4 index 17c67ff3f9f..8874754dfa0 100644 --- a/m4/config_summary.m4 +++ b/m4/config_summary.m4 @@ -126,6 +126,9 @@ if (test "x$enableoptional" = "xyes"); then echo ' 'mpi.............................. : $enablempi echo ' 'nanoflann........................ : $enablenanoflann echo ' 'nemesis.......................... : $enablenemesis + if (test "x$nemesisversion" != "xno"); then + echo ' 'version....................... : $nemesisversion + fi echo ' 'netcdf........................... : $enablenetcdf if (test "x$netcdfversion" != "xno"); then echo ' 'version....................... : $netcdfversion diff --git a/m4/libmesh_optional_packages.m4 b/m4/libmesh_optional_packages.m4 index 301363f6c00..9d825a7e240 100644 --- a/m4/libmesh_optional_packages.m4 +++ b/m4/libmesh_optional_packages.m4 @@ -407,8 +407,9 @@ AM_CONDITIONAL(LIBMESH_ENABLE_NETCDF_V4, test x$netcdfversion = x4) if (test $enablenemesis = yes); then libmesh_contrib_INCLUDES="$NEMESIS_INCLUDE $libmesh_contrib_INCLUDES" fi - AM_CONDITIONAL(LIBMESH_ENABLE_NEMESIS, test x$enablenemesis = xyes) - AC_CONFIG_FILES([contrib/nemesis/Lib/Makefile]) + AM_CONDITIONAL(LIBMESH_ENABLE_NEMESIS, test x$enablenemesis = xyes) + AM_CONDITIONAL(LIBMESH_ENABLE_NEMESIS_V309, test x$nemesisversion = xv3.09) + AM_CONDITIONAL(LIBMESH_ENABLE_NEMESIS_V522, test x$nemesisversion = xv5.22) # ------------------------------------------------------------- # ------------------------------------------------------------- # ------------------------------------------------------------- diff --git a/m4/nemesis.m4 b/m4/nemesis.m4 index 616ab7465b8..be9ff202ce0 100644 --- a/m4/nemesis.m4 +++ b/m4/nemesis.m4 @@ -7,33 +7,39 @@ AC_DEFUN([CONFIGURE_NEMESIS], AC_HELP_STRING([--enable-nemesis], [build with NemesisII API support]), [case "${enableval}" in - yes) enablenemesis=yes ;; - no) enablenemesis=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-nemesis) ;; + yes|v309) enablenemesis=yes ; nemesisversion="v3.09" ;; + new|v522) enablenemesis=yes ; nemesisversion="v5.22" ;; + no) enablenemesis=no ; nemesisversion=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-nemesis) ;; esac], - [enablenemesis=$enableexodus]) # if unspecified, depend on exodus + [enablenemesis=$enableexodus ; nemesisversion="v3.09"]) # if unspecified, depend on exodus # Trump --enable-nemesis with --disable-mpi if (test "x$enablempi" = xno); then - enablenemesis=no + nemesisversion=no fi - dnl The NEMESIS API is distributed with libmesh, so we don't have to guess - dnl where it might be installed... - if (test $enablenemesis = yes); then - NEMESIS_INCLUDE="-I\$(top_srcdir)/contrib/nemesis/Lib" - NEMESIS_LIBRARY="\$(EXTERNAL_LIBDIR)/libnemesis\$(libext)" - AC_DEFINE(HAVE_NEMESIS_API, 1, [Flag indicating whether the library will be compiled with Nemesis support]) - AC_MSG_RESULT(<<< Configuring library with Nemesis support >>>) - have_nemesis=yes - else - NEMESIS_INCLUDE="" - NEMESIS_LIBRARY="" - enablenemesis=no - have_nemesis=no - fi + case "${nemesisversion}" in + "v3.09") + # The NEMESIS API is distributed with libmesh, so we don't have to guess + # where it might be installed... + NEMESIS_INCLUDE="-I\$(top_srcdir)/contrib/nemesis/$nemesisversion" + AC_DEFINE(HAVE_NEMESIS_API, 1, [Flag indicating whether the library will be compiled with Nemesis support]) + AC_MSG_RESULT(<<< Configuring library with Nemesis version $nemesisversion support >>>) + ;; + + "v5.22") + exit 1 + ;; + + *) + NEMESIS_INCLUDE="" + enablenemesis=no + ;; + esac + + AC_CONFIG_FILES([contrib/nemesis/v3.09/Makefile]) AC_SUBST(NEMESIS_INCLUDE) - AC_SUBST(NEMESIS_LIBRARY) ]) diff --git a/tests/Makefile.in b/tests/Makefile.in index b04d7844bbf..7cdc1b1bb0d 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -454,7 +454,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@ MPI_LIBS_PATHS = @MPI_LIBS_PATHS@ NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@ NEMESIS_INCLUDE = @NEMESIS_INCLUDE@ -NEMESIS_LIBRARY = @NEMESIS_LIBRARY@ NETCDF_INCLUDE = @NETCDF_INCLUDE@ NM = @NM@ NMEDIT = @NMEDIT@