support for --enable-nemesis=new

configure

@@ -31719,7 +31719,7 @@ $as_echo "#define HAVE_NETCDF 1" >>confdefs.h
 	  fi
 
 	  #  pass --disable-netcdf-4 to the subpackage so that we do not require HDF-5
-	  libmesh_subpackage_arguments="$libmesh_subpackage_arguments --disable-netcdf-4"
+	  #libmesh_subpackage_arguments="$libmesh_subpackage_arguments --disable-netcdf-4"
 
 	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: <<< Configuring library with NetCDF version 4 support >>>" >&5
 $as_echo "<<< Configuring library with NetCDF version 4 support >>>" >&6; }

contrib/exodusii/5.22b/nemesis/Makefile.am

@@ -8,3 +8,34 @@ pkg_sources = \
 # import as much commonality as possible
 include $(top_srcdir)/contrib/Make.common
 
+#####################################################
+## support the ne_ctest_wrap function for 'make check'
+#check_PROGRAMS = 
+#
+#if LIBMESH_DBG_MODE
+#  check_PROGRAMS            += ne_ctest_wrap-dbg
+#  ne_ctest_wrap_dbg_SOURCES  = ne_ctest_wrap.c
+#  ne_ctest_wrap_dbg_LDADD    = libdbg.la \
+#			       $(top_builddir)/contrib/exodusii/v5.22/exodus/cbind/libdbg.la \
+#                               $(top_builddir)/contrib/netcdf/v4/liblib/libnetcdf.la
+#endif
+#
+#if LIBMESH_DEVEL_MODE
+#  check_PROGRAMS              += ne_ctest_wrap-devel
+#  ne_ctest_wrap_devel_SOURCES  = ne_ctest_wrap.c
+#  ne_ctest_wrap_devel_LDADD    = libdevel.la \
+#			         $(top_builddir)/contrib/exodusii/v5.22/exodus/cbind/libdevel.la \
+#                                 $(top_builddir)/contrib/netcdf/v4/liblib/libnetcdf.la
+#endif
+#
+#if LIBMESH_OPT_MODE
+#  check_PROGRAMS            += ne_ctest_wrap-opt
+#  ne_ctest_wrap_opt_SOURCES  = ne_ctest_wrap.c
+#  ne_ctest_wrap_opt_LDADD    = libopt.la \
+#			       $(top_builddir)/contrib/exodusii/v5.22/exodus/cbind/libopt.la \
+#                               $(top_builddir)/contrib/netcdf/v4/liblib/libnetcdf.la
+#endif
+#
+#TESTS = $(check_PROGRAMS)
+#CLEANFILES = ne_test.exoII
+

contrib/exodusii/5.22b/nemesis/Makefile.in

@@ -884,6 +884,36 @@ uninstall-am:
 
 # import as much commonality as possible
 
+#####################################################
+#check_PROGRAMS = 
+#
+#if LIBMESH_DBG_MODE
+#  check_PROGRAMS            += ne_ctest_wrap-dbg
+#  ne_ctest_wrap_dbg_SOURCES  = ne_ctest_wrap.c
+#  ne_ctest_wrap_dbg_LDADD    = libdbg.la \
+#			       $(top_builddir)/contrib/exodusii/v5.22/exodus/cbind/libdbg.la \
+#                               $(top_builddir)/contrib/netcdf/v4/liblib/libnetcdf.la
+#endif
+#
+#if LIBMESH_DEVEL_MODE
+#  check_PROGRAMS              += ne_ctest_wrap-devel
+#  ne_ctest_wrap_devel_SOURCES  = ne_ctest_wrap.c
+#  ne_ctest_wrap_devel_LDADD    = libdevel.la \
+#			         $(top_builddir)/contrib/exodusii/v5.22/exodus/cbind/libdevel.la \
+#                                 $(top_builddir)/contrib/netcdf/v4/liblib/libnetcdf.la
+#endif
+#
+#if LIBMESH_OPT_MODE
+#  check_PROGRAMS            += ne_ctest_wrap-opt
+#  ne_ctest_wrap_opt_SOURCES  = ne_ctest_wrap.c
+#  ne_ctest_wrap_opt_LDADD    = libopt.la \
+#			       $(top_builddir)/contrib/exodusii/v5.22/exodus/cbind/libopt.la \
+#                               $(top_builddir)/contrib/netcdf/v4/liblib/libnetcdf.la
+#endif
+#
+#TESTS = $(check_PROGRAMS)
+#CLEANFILES = ne_test.exoII
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

include/mesh/nemesis_io_helper.h

@@ -36,7 +36,14 @@ namespace libMesh
 // correctly extern C'd but it doesn't hurt :)
 namespace Nemesis {
   extern "C" {
-#include "ne_nemesisI.h"
+    // this include guard gets set by exodus, but we included it
+    // in a namespace, so nemesis will not properly resolve e.g.
+    // ex_entity_id in the global namespace.  undefine the guard
+    // to get ne_nemesisI.h to properly include the typedefs
+#  ifdef EXODUS_II_HDR
+#    undef EXODUS_II_HDR
+#  endif
+#  include "ne_nemesisI.h"
   }
 }
 

m4/netcdf.m4

@@ -37,7 +37,7 @@ AC_DEFUN([CONFIGURE_NETCDF],
 	  fi
 
 	  #  pass --disable-netcdf-4 to the subpackage so that we do not require HDF-5
-	  libmesh_subpackage_arguments="$libmesh_subpackage_arguments --disable-netcdf-4"
+	  #libmesh_subpackage_arguments="$libmesh_subpackage_arguments --disable-netcdf-4"
 
 	  AC_MSG_RESULT(<<< Configuring library with NetCDF version 4 support >>>)
 	  ;;