From 26dbb09630b59bf43852e77a01de4cf67521b950 Mon Sep 17 00:00:00 2001 From: "Benjamin S. Kirk" Date: Tue, 12 Feb 2013 13:47:19 -0600 Subject: [PATCH] fix for new exodus when netcdf4 unavailable --- Makefile.in | 1 + configure | 16 ++++++++++++---- contrib/Makefile.in | 1 + contrib/boost/include/Makefile.in | 1 + contrib/exodusii/5.22b/exodus/cbind/Makefile.in | 3 ++- contrib/exodusii/5.22b/nemesis/Makefile.in | 1 + contrib/exodusii/Lib/Makefile.in | 1 + contrib/fparser/Makefile.in | 1 + contrib/fparser/extrasrc/Makefile.in | 1 + contrib/gmv/Makefile.in | 1 + contrib/gzstream/Makefile.in | 1 + contrib/laspack/Makefile.in | 1 + contrib/libHilbert/Makefile.in | 1 + contrib/metis/Makefile.in | 1 + contrib/nanoflann/Makefile.in | 1 + contrib/nemesis/Lib/Makefile.in | 1 + contrib/netcdf/Lib/Makefile.in | 1 + contrib/parmetis/Makefile.in | 1 + contrib/sfcurves/Makefile.in | 1 + contrib/tecplot/tecio/Makefile.in | 1 + contrib/tetgen/Makefile.in | 1 + contrib/triangle/Makefile.in | 1 + examples/Makefile.in | 1 + examples/adaptivity/adaptivity_ex1/Makefile.in | 1 + examples/adaptivity/adaptivity_ex2/Makefile.in | 1 + examples/adaptivity/adaptivity_ex3/Makefile.in | 1 + examples/adaptivity/adaptivity_ex4/Makefile.in | 1 + examples/adaptivity/adaptivity_ex5/Makefile.in | 1 + examples/adjoints/adjoints_ex1/Makefile.in | 1 + examples/adjoints/adjoints_ex2/Makefile.in | 1 + examples/adjoints/adjoints_ex3/Makefile.in | 1 + examples/adjoints/adjoints_ex4/Makefile.in | 1 + examples/adjoints/adjoints_ex5/Makefile.in | 1 + .../eigenproblems/eigenproblems_ex1/Makefile.in | 1 + .../eigenproblems/eigenproblems_ex2/Makefile.in | 1 + .../eigenproblems/eigenproblems_ex3/Makefile.in | 1 + examples/fem_system/fem_system_ex1/Makefile.in | 1 + examples/fem_system/fem_system_ex2/Makefile.in | 1 + .../introduction/introduction_ex1/Makefile.in | 1 + .../introduction/introduction_ex2/Makefile.in | 1 + .../introduction/introduction_ex3/Makefile.in | 1 + .../introduction/introduction_ex4/Makefile.in | 1 + .../introduction/introduction_ex5/Makefile.in | 1 + .../miscellaneous/miscellaneous_ex1/Makefile.in | 1 + .../miscellaneous/miscellaneous_ex2/Makefile.in | 1 + .../miscellaneous/miscellaneous_ex3/Makefile.in | 1 + .../miscellaneous/miscellaneous_ex4/Makefile.in | 1 + .../miscellaneous/miscellaneous_ex5/Makefile.in | 1 + .../miscellaneous/miscellaneous_ex6/Makefile.in | 1 + .../miscellaneous/miscellaneous_ex7/Makefile.in | 1 + .../miscellaneous/miscellaneous_ex8/Makefile.in | 1 + .../reduced_basis/reduced_basis_ex1/Makefile.in | 1 + .../reduced_basis/reduced_basis_ex2/Makefile.in | 1 + .../reduced_basis/reduced_basis_ex3/Makefile.in | 1 + .../reduced_basis/reduced_basis_ex4/Makefile.in | 1 + .../reduced_basis/reduced_basis_ex5/Makefile.in | 1 + .../reduced_basis/reduced_basis_ex6/Makefile.in | 1 + .../reduced_basis/reduced_basis_ex7/Makefile.in | 1 + .../solution_transfer_ex1/Makefile.in | 1 + examples/subdomains/subdomains_ex1/Makefile.in | 1 + examples/subdomains/subdomains_ex2/Makefile.in | 1 + .../systems_of_equations_ex1/Makefile.in | 1 + .../systems_of_equations_ex2/Makefile.in | 1 + .../systems_of_equations_ex3/Makefile.in | 1 + .../systems_of_equations_ex4/Makefile.in | 1 + .../systems_of_equations_ex5/Makefile.in | 1 + .../systems_of_equations_ex6/Makefile.in | 1 + examples/transient/transient_ex1/Makefile.in | 1 + examples/transient/transient_ex2/Makefile.in | 1 + examples/vector_fe/vector_fe_ex1/Makefile.in | 1 + examples/vector_fe/vector_fe_ex2/Makefile.in | 1 + examples/vector_fe/vector_fe_ex3/Makefile.in | 1 + include/Makefile.in | 1 + include/libmesh/Makefile.in | 1 + m4/exodus.m4 | 1 + tests/Makefile.in | 1 + 76 files changed, 88 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index ed4f845243a..b0878815720 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3941,6 +3941,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/configure b/configure index 940ae5590a5..5b878616a47 100755 --- a/configure +++ b/configure @@ -688,6 +688,7 @@ LIBMESH_ENABLE_EXODUS_V509_FALSE LIBMESH_ENABLE_EXODUS_V509_TRUE LIBMESH_ENABLE_EXODUS_FALSE LIBMESH_ENABLE_EXODUS_TRUE +EXODUS_NOT_NETCDF4_FLAG EXODUS_INCLUDE LIBMESH_ENABLE_NETCDF_V4_FALSE LIBMESH_ENABLE_NETCDF_V4_TRUE @@ -29343,13 +29344,13 @@ $as_echo "#define HAVE_ML 1" >>confdefs.h $as_echo "<<< Configuring library with ML support >>>" >&6; } fi - as_ac_Header=`$as_echo "ac_cv_header_$withtrilinosdir/include/Tpetra_include.h" | $as_tr_sh` -ac_fn_cxx_check_header_mongrel "$LINENO" "$withtrilinosdir/include/Tpetra_include.h" "$as_ac_Header" "$ac_includes_default" + as_ac_Header=`$as_echo "ac_cv_header_$withtrilinosdir/include/Tpetra_config.h" | $as_tr_sh` +ac_fn_cxx_check_header_mongrel "$LINENO" "$withtrilinosdir/include/Tpetra_config.h" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : enabletpetra=yes else - as_ac_Header=`$as_echo "ac_cv_header_$withtrilinosdir/Tpetra_include.h" | $as_tr_sh` -ac_fn_cxx_check_header_mongrel "$LINENO" "$withtrilinosdir/Tpetra_include.h" "$as_ac_Header" "$ac_includes_default" + as_ac_Header=`$as_echo "ac_cv_header_$withtrilinosdir/Tpetra_config.h" | $as_tr_sh` +ac_fn_cxx_check_header_mongrel "$LINENO" "$withtrilinosdir/Tpetra_config.h" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : enabletpetra=yes else @@ -32113,6 +32114,12 @@ fi exodusversion=no fi + # no HDF5 &/or no NETCDF4 + EXODUS_NOT_NETCDF4_FLAG="" + if (test "x$enablehdf5" = "xno" -o "x$netcdfversion" = "x3"); then + EXODUS_NOT_NETCDF4_FLAG="-DNOT_NETCDF4" + fi + case "${exodusversion}" in "v5.09") @@ -32147,6 +32154,7 @@ $as_echo "<<< Configuring library with Exodus version $exodusversion support >>> + if (test $enableexodus = yes); then libmesh_contrib_INCLUDES="$EXODUS_INCLUDE $libmesh_contrib_INCLUDES" fi diff --git a/contrib/Makefile.in b/contrib/Makefile.in index c66960b3ab2..4373950df87 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -466,6 +466,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/contrib/boost/include/Makefile.in b/contrib/boost/include/Makefile.in index 97ec6e7bcd0..7021cdb0151 100644 --- a/contrib/boost/include/Makefile.in +++ b/contrib/boost/include/Makefile.in @@ -472,6 +472,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/contrib/exodusii/5.22b/exodus/cbind/Makefile.in b/contrib/exodusii/5.22b/exodus/cbind/Makefile.in index 22afd3ea019..0ca3658bc6c 100644 --- a/contrib/exodusii/5.22b/exodus/cbind/Makefile.in +++ b/contrib/exodusii/5.22b/exodus/cbind/Makefile.in @@ -1834,6 +1834,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ @@ -2051,7 +2052,7 @@ vtkbuild = @vtkbuild@ vtkmajor = @vtkmajor@ vtkversion = @vtkversion@ include_HEADERS = include/exodusII.h -pkg_cppflags = -I$(srcdir)/include $(NETCDF_INCLUDE) +pkg_cppflags = -I$(srcdir)/include $(NETCDF_INCLUDE) $(EXODUS_NOT_NETCDF4_FLAG) pkg_sources = \ include/doxygen.h \ include/exodusII.h \ diff --git a/contrib/exodusii/5.22b/nemesis/Makefile.in b/contrib/exodusii/5.22b/nemesis/Makefile.in index 99e8ae2624c..63b30c71b9a 100644 --- a/contrib/exodusii/5.22b/nemesis/Makefile.in +++ b/contrib/exodusii/5.22b/nemesis/Makefile.in @@ -273,6 +273,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/contrib/exodusii/Lib/Makefile.in b/contrib/exodusii/Lib/Makefile.in index 336d641c318..20074ddf86f 100644 --- a/contrib/exodusii/Lib/Makefile.in +++ b/contrib/exodusii/Lib/Makefile.in @@ -959,6 +959,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/contrib/fparser/Makefile.in b/contrib/fparser/Makefile.in index a6d18a6db96..e5e52097054 100644 --- a/contrib/fparser/Makefile.in +++ b/contrib/fparser/Makefile.in @@ -409,6 +409,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/contrib/fparser/extrasrc/Makefile.in b/contrib/fparser/extrasrc/Makefile.in index 32d38d28965..74a5c24ba1b 100644 --- a/contrib/fparser/extrasrc/Makefile.in +++ b/contrib/fparser/extrasrc/Makefile.in @@ -186,6 +186,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/contrib/gmv/Makefile.in b/contrib/gmv/Makefile.in index c0a1495c0aa..08b60e6490d 100644 --- a/contrib/gmv/Makefile.in +++ b/contrib/gmv/Makefile.in @@ -268,6 +268,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/contrib/gzstream/Makefile.in b/contrib/gzstream/Makefile.in index 35471eabc9b..6b220d708c4 100644 --- a/contrib/gzstream/Makefile.in +++ b/contrib/gzstream/Makefile.in @@ -290,6 +290,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/contrib/laspack/Makefile.in b/contrib/laspack/Makefile.in index ce2b8a32fc0..0f255fe3e20 100644 --- a/contrib/laspack/Makefile.in +++ b/contrib/laspack/Makefile.in @@ -328,6 +328,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/contrib/libHilbert/Makefile.in b/contrib/libHilbert/Makefile.in index 41fe3d5a074..398bf925f54 100644 --- a/contrib/libHilbert/Makefile.in +++ b/contrib/libHilbert/Makefile.in @@ -331,6 +331,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/contrib/metis/Makefile.in b/contrib/metis/Makefile.in index b3835b799f4..14b1f0ee259 100644 --- a/contrib/metis/Makefile.in +++ b/contrib/metis/Makefile.in @@ -529,6 +529,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/contrib/nanoflann/Makefile.in b/contrib/nanoflann/Makefile.in index f6b85ac2036..32a7346dd7b 100644 --- a/contrib/nanoflann/Makefile.in +++ b/contrib/nanoflann/Makefile.in @@ -298,6 +298,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/contrib/nemesis/Lib/Makefile.in b/contrib/nemesis/Lib/Makefile.in index 78517ffe465..734e204ffb4 100644 --- a/contrib/nemesis/Lib/Makefile.in +++ b/contrib/nemesis/Lib/Makefile.in @@ -428,6 +428,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/contrib/netcdf/Lib/Makefile.in b/contrib/netcdf/Lib/Makefile.in index 3d145282976..d41e2dae82d 100644 --- a/contrib/netcdf/Lib/Makefile.in +++ b/contrib/netcdf/Lib/Makefile.in @@ -331,6 +331,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/contrib/parmetis/Makefile.in b/contrib/parmetis/Makefile.in index edb8a86584b..b04d1ed9579 100644 --- a/contrib/parmetis/Makefile.in +++ b/contrib/parmetis/Makefile.in @@ -419,6 +419,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/contrib/sfcurves/Makefile.in b/contrib/sfcurves/Makefile.in index 3b803e4992d..20494693358 100644 --- a/contrib/sfcurves/Makefile.in +++ b/contrib/sfcurves/Makefile.in @@ -278,6 +278,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/contrib/tecplot/tecio/Makefile.in b/contrib/tecplot/tecio/Makefile.in index 4ac8b52ac55..3ddd4f874be 100644 --- a/contrib/tecplot/tecio/Makefile.in +++ b/contrib/tecplot/tecio/Makefile.in @@ -412,6 +412,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/contrib/tetgen/Makefile.in b/contrib/tetgen/Makefile.in index 3b3659d3c34..80d3798d682 100644 --- a/contrib/tetgen/Makefile.in +++ b/contrib/tetgen/Makefile.in @@ -298,6 +298,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/contrib/triangle/Makefile.in b/contrib/triangle/Makefile.in index 91042c51467..4f8a279a36e 100644 --- a/contrib/triangle/Makefile.in +++ b/contrib/triangle/Makefile.in @@ -298,6 +298,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/Makefile.in b/examples/Makefile.in index 5fff4a3665e..62322431884 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -251,6 +251,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/adaptivity/adaptivity_ex1/Makefile.in b/examples/adaptivity/adaptivity_ex1/Makefile.in index 9aa67509dba..c4d649572a4 100644 --- a/examples/adaptivity/adaptivity_ex1/Makefile.in +++ b/examples/adaptivity/adaptivity_ex1/Makefile.in @@ -333,6 +333,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/adaptivity/adaptivity_ex2/Makefile.in b/examples/adaptivity/adaptivity_ex2/Makefile.in index ed6b9ce8814..df5f817b61a 100644 --- a/examples/adaptivity/adaptivity_ex2/Makefile.in +++ b/examples/adaptivity/adaptivity_ex2/Makefile.in @@ -347,6 +347,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/adaptivity/adaptivity_ex3/Makefile.in b/examples/adaptivity/adaptivity_ex3/Makefile.in index 1dad9f06bff..92b82094272 100644 --- a/examples/adaptivity/adaptivity_ex3/Makefile.in +++ b/examples/adaptivity/adaptivity_ex3/Makefile.in @@ -339,6 +339,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/adaptivity/adaptivity_ex4/Makefile.in b/examples/adaptivity/adaptivity_ex4/Makefile.in index 1db352dbe91..f0ce9099628 100644 --- a/examples/adaptivity/adaptivity_ex4/Makefile.in +++ b/examples/adaptivity/adaptivity_ex4/Makefile.in @@ -338,6 +338,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/adaptivity/adaptivity_ex5/Makefile.in b/examples/adaptivity/adaptivity_ex5/Makefile.in index ac9505ab6ba..0739a093cd4 100644 --- a/examples/adaptivity/adaptivity_ex5/Makefile.in +++ b/examples/adaptivity/adaptivity_ex5/Makefile.in @@ -343,6 +343,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/adjoints/adjoints_ex1/Makefile.in b/examples/adjoints/adjoints_ex1/Makefile.in index 1b046a0ab19..d9d801053aa 100644 --- a/examples/adjoints/adjoints_ex1/Makefile.in +++ b/examples/adjoints/adjoints_ex1/Makefile.in @@ -397,6 +397,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/adjoints/adjoints_ex2/Makefile.in b/examples/adjoints/adjoints_ex2/Makefile.in index 0149b029efc..630253ca724 100644 --- a/examples/adjoints/adjoints_ex2/Makefile.in +++ b/examples/adjoints/adjoints_ex2/Makefile.in @@ -385,6 +385,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/adjoints/adjoints_ex3/Makefile.in b/examples/adjoints/adjoints_ex3/Makefile.in index 7bf797678a5..706fc08b33e 100644 --- a/examples/adjoints/adjoints_ex3/Makefile.in +++ b/examples/adjoints/adjoints_ex3/Makefile.in @@ -397,6 +397,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/adjoints/adjoints_ex4/Makefile.in b/examples/adjoints/adjoints_ex4/Makefile.in index 5d8bb3bcb71..cca7688d324 100644 --- a/examples/adjoints/adjoints_ex4/Makefile.in +++ b/examples/adjoints/adjoints_ex4/Makefile.in @@ -397,6 +397,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/adjoints/adjoints_ex5/Makefile.in b/examples/adjoints/adjoints_ex5/Makefile.in index dd43f58d51a..addd8f84c5f 100644 --- a/examples/adjoints/adjoints_ex5/Makefile.in +++ b/examples/adjoints/adjoints_ex5/Makefile.in @@ -397,6 +397,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/eigenproblems/eigenproblems_ex1/Makefile.in b/examples/eigenproblems/eigenproblems_ex1/Makefile.in index 93d8d35c193..0ee5c32bb62 100644 --- a/examples/eigenproblems/eigenproblems_ex1/Makefile.in +++ b/examples/eigenproblems/eigenproblems_ex1/Makefile.in @@ -333,6 +333,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/eigenproblems/eigenproblems_ex2/Makefile.in b/examples/eigenproblems/eigenproblems_ex2/Makefile.in index ec914feeb68..4f556866399 100644 --- a/examples/eigenproblems/eigenproblems_ex2/Makefile.in +++ b/examples/eigenproblems/eigenproblems_ex2/Makefile.in @@ -333,6 +333,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/eigenproblems/eigenproblems_ex3/Makefile.in b/examples/eigenproblems/eigenproblems_ex3/Makefile.in index 8f521ed4678..10aee2122e2 100644 --- a/examples/eigenproblems/eigenproblems_ex3/Makefile.in +++ b/examples/eigenproblems/eigenproblems_ex3/Makefile.in @@ -339,6 +339,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/fem_system/fem_system_ex1/Makefile.in b/examples/fem_system/fem_system_ex1/Makefile.in index a571eee54ff..f29157c239b 100644 --- a/examples/fem_system/fem_system_ex1/Makefile.in +++ b/examples/fem_system/fem_system_ex1/Makefile.in @@ -362,6 +362,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/fem_system/fem_system_ex2/Makefile.in b/examples/fem_system/fem_system_ex2/Makefile.in index e6da31d409b..6d084e151a2 100644 --- a/examples/fem_system/fem_system_ex2/Makefile.in +++ b/examples/fem_system/fem_system_ex2/Makefile.in @@ -372,6 +372,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/introduction/introduction_ex1/Makefile.in b/examples/introduction/introduction_ex1/Makefile.in index 319eb3cc2f7..90eece6d62f 100644 --- a/examples/introduction/introduction_ex1/Makefile.in +++ b/examples/introduction/introduction_ex1/Makefile.in @@ -333,6 +333,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/introduction/introduction_ex2/Makefile.in b/examples/introduction/introduction_ex2/Makefile.in index 920793d199a..8f2fbcf7816 100644 --- a/examples/introduction/introduction_ex2/Makefile.in +++ b/examples/introduction/introduction_ex2/Makefile.in @@ -333,6 +333,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/introduction/introduction_ex3/Makefile.in b/examples/introduction/introduction_ex3/Makefile.in index 1e796b080a4..8d78ea0051c 100644 --- a/examples/introduction/introduction_ex3/Makefile.in +++ b/examples/introduction/introduction_ex3/Makefile.in @@ -343,6 +343,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/introduction/introduction_ex4/Makefile.in b/examples/introduction/introduction_ex4/Makefile.in index 7a1ec37060f..498d6f5df04 100644 --- a/examples/introduction/introduction_ex4/Makefile.in +++ b/examples/introduction/introduction_ex4/Makefile.in @@ -343,6 +343,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/introduction/introduction_ex5/Makefile.in b/examples/introduction/introduction_ex5/Makefile.in index 9ca31a08657..a2a31f0e421 100644 --- a/examples/introduction/introduction_ex5/Makefile.in +++ b/examples/introduction/introduction_ex5/Makefile.in @@ -343,6 +343,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/miscellaneous/miscellaneous_ex1/Makefile.in b/examples/miscellaneous/miscellaneous_ex1/Makefile.in index 30dcc60fd55..a9c31588d87 100644 --- a/examples/miscellaneous/miscellaneous_ex1/Makefile.in +++ b/examples/miscellaneous/miscellaneous_ex1/Makefile.in @@ -333,6 +333,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/miscellaneous/miscellaneous_ex2/Makefile.in b/examples/miscellaneous/miscellaneous_ex2/Makefile.in index d187b50e74d..ca6776a1254 100644 --- a/examples/miscellaneous/miscellaneous_ex2/Makefile.in +++ b/examples/miscellaneous/miscellaneous_ex2/Makefile.in @@ -338,6 +338,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/miscellaneous/miscellaneous_ex3/Makefile.in b/examples/miscellaneous/miscellaneous_ex3/Makefile.in index 69eec926456..64d552c64f8 100644 --- a/examples/miscellaneous/miscellaneous_ex3/Makefile.in +++ b/examples/miscellaneous/miscellaneous_ex3/Makefile.in @@ -338,6 +338,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/miscellaneous/miscellaneous_ex4/Makefile.in b/examples/miscellaneous/miscellaneous_ex4/Makefile.in index 733eb83a121..2bd4e5c0755 100644 --- a/examples/miscellaneous/miscellaneous_ex4/Makefile.in +++ b/examples/miscellaneous/miscellaneous_ex4/Makefile.in @@ -333,6 +333,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/miscellaneous/miscellaneous_ex5/Makefile.in b/examples/miscellaneous/miscellaneous_ex5/Makefile.in index 1e13f212414..9fa4acba518 100644 --- a/examples/miscellaneous/miscellaneous_ex5/Makefile.in +++ b/examples/miscellaneous/miscellaneous_ex5/Makefile.in @@ -347,6 +347,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/miscellaneous/miscellaneous_ex6/Makefile.in b/examples/miscellaneous/miscellaneous_ex6/Makefile.in index 7f3ac50efa3..d834a00e68f 100644 --- a/examples/miscellaneous/miscellaneous_ex6/Makefile.in +++ b/examples/miscellaneous/miscellaneous_ex6/Makefile.in @@ -333,6 +333,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/miscellaneous/miscellaneous_ex7/Makefile.in b/examples/miscellaneous/miscellaneous_ex7/Makefile.in index b6103944d14..1041c16e90b 100644 --- a/examples/miscellaneous/miscellaneous_ex7/Makefile.in +++ b/examples/miscellaneous/miscellaneous_ex7/Makefile.in @@ -366,6 +366,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/miscellaneous/miscellaneous_ex8/Makefile.in b/examples/miscellaneous/miscellaneous_ex8/Makefile.in index 3f1bb0400c6..e8394fa8e62 100644 --- a/examples/miscellaneous/miscellaneous_ex8/Makefile.in +++ b/examples/miscellaneous/miscellaneous_ex8/Makefile.in @@ -362,6 +362,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/reduced_basis/reduced_basis_ex1/Makefile.in b/examples/reduced_basis/reduced_basis_ex1/Makefile.in index f7cf904c175..a9162f3d14b 100644 --- a/examples/reduced_basis/reduced_basis_ex1/Makefile.in +++ b/examples/reduced_basis/reduced_basis_ex1/Makefile.in @@ -357,6 +357,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/reduced_basis/reduced_basis_ex2/Makefile.in b/examples/reduced_basis/reduced_basis_ex2/Makefile.in index 258bff54ec3..c0c3ff4ed98 100644 --- a/examples/reduced_basis/reduced_basis_ex2/Makefile.in +++ b/examples/reduced_basis/reduced_basis_ex2/Makefile.in @@ -357,6 +357,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/reduced_basis/reduced_basis_ex3/Makefile.in b/examples/reduced_basis/reduced_basis_ex3/Makefile.in index 0da85f930f7..42339c4d850 100644 --- a/examples/reduced_basis/reduced_basis_ex3/Makefile.in +++ b/examples/reduced_basis/reduced_basis_ex3/Makefile.in @@ -357,6 +357,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/reduced_basis/reduced_basis_ex4/Makefile.in b/examples/reduced_basis/reduced_basis_ex4/Makefile.in index f47a235a575..98c4a072e31 100644 --- a/examples/reduced_basis/reduced_basis_ex4/Makefile.in +++ b/examples/reduced_basis/reduced_basis_ex4/Makefile.in @@ -362,6 +362,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/reduced_basis/reduced_basis_ex5/Makefile.in b/examples/reduced_basis/reduced_basis_ex5/Makefile.in index 05ff6f66142..dbb5660ea90 100644 --- a/examples/reduced_basis/reduced_basis_ex5/Makefile.in +++ b/examples/reduced_basis/reduced_basis_ex5/Makefile.in @@ -362,6 +362,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/reduced_basis/reduced_basis_ex6/Makefile.in b/examples/reduced_basis/reduced_basis_ex6/Makefile.in index 6a0c9624ac4..435ba02d888 100644 --- a/examples/reduced_basis/reduced_basis_ex6/Makefile.in +++ b/examples/reduced_basis/reduced_basis_ex6/Makefile.in @@ -362,6 +362,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/reduced_basis/reduced_basis_ex7/Makefile.in b/examples/reduced_basis/reduced_basis_ex7/Makefile.in index 2b6987c2704..4ad415a5388 100644 --- a/examples/reduced_basis/reduced_basis_ex7/Makefile.in +++ b/examples/reduced_basis/reduced_basis_ex7/Makefile.in @@ -357,6 +357,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/solution_transfer/solution_transfer_ex1/Makefile.in b/examples/solution_transfer/solution_transfer_ex1/Makefile.in index f6c4f099816..7c63104e9b4 100644 --- a/examples/solution_transfer/solution_transfer_ex1/Makefile.in +++ b/examples/solution_transfer/solution_transfer_ex1/Makefile.in @@ -333,6 +333,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/subdomains/subdomains_ex1/Makefile.in b/examples/subdomains/subdomains_ex1/Makefile.in index a0fc6660f5a..154a5c3fd81 100644 --- a/examples/subdomains/subdomains_ex1/Makefile.in +++ b/examples/subdomains/subdomains_ex1/Makefile.in @@ -343,6 +343,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/subdomains/subdomains_ex2/Makefile.in b/examples/subdomains/subdomains_ex2/Makefile.in index 37dc27deb28..71d80f0ace0 100644 --- a/examples/subdomains/subdomains_ex2/Makefile.in +++ b/examples/subdomains/subdomains_ex2/Makefile.in @@ -343,6 +343,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ 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 be37e758b09..d3e513e7d7b 100644 --- a/examples/systems_of_equations/systems_of_equations_ex1/Makefile.in +++ b/examples/systems_of_equations/systems_of_equations_ex1/Makefile.in @@ -333,6 +333,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ 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 68feed97135..65e18d0c434 100644 --- a/examples/systems_of_equations/systems_of_equations_ex2/Makefile.in +++ b/examples/systems_of_equations/systems_of_equations_ex2/Makefile.in @@ -338,6 +338,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ 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 9fe9cdeacc1..296775049a4 100644 --- a/examples/systems_of_equations/systems_of_equations_ex3/Makefile.in +++ b/examples/systems_of_equations/systems_of_equations_ex3/Makefile.in @@ -333,6 +333,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ 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 8a5b2723387..796dfe6ff52 100644 --- a/examples/systems_of_equations/systems_of_equations_ex4/Makefile.in +++ b/examples/systems_of_equations/systems_of_equations_ex4/Makefile.in @@ -333,6 +333,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ 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 1b27841e074..a59556da4ee 100644 --- a/examples/systems_of_equations/systems_of_equations_ex5/Makefile.in +++ b/examples/systems_of_equations/systems_of_equations_ex5/Makefile.in @@ -333,6 +333,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ 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 4bec24ffa91..3117fe8cacb 100644 --- a/examples/systems_of_equations/systems_of_equations_ex6/Makefile.in +++ b/examples/systems_of_equations/systems_of_equations_ex6/Makefile.in @@ -333,6 +333,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/transient/transient_ex1/Makefile.in b/examples/transient/transient_ex1/Makefile.in index fa2d39828d0..181388790f5 100644 --- a/examples/transient/transient_ex1/Makefile.in +++ b/examples/transient/transient_ex1/Makefile.in @@ -343,6 +343,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/transient/transient_ex2/Makefile.in b/examples/transient/transient_ex2/Makefile.in index 86ba986b8b9..3f06be9e9e5 100644 --- a/examples/transient/transient_ex2/Makefile.in +++ b/examples/transient/transient_ex2/Makefile.in @@ -334,6 +334,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/vector_fe/vector_fe_ex1/Makefile.in b/examples/vector_fe/vector_fe_ex1/Makefile.in index ce25116c11f..a6fce0d3c29 100644 --- a/examples/vector_fe/vector_fe_ex1/Makefile.in +++ b/examples/vector_fe/vector_fe_ex1/Makefile.in @@ -341,6 +341,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/vector_fe/vector_fe_ex2/Makefile.in b/examples/vector_fe/vector_fe_ex2/Makefile.in index 79ff6849393..91a87cf1426 100644 --- a/examples/vector_fe/vector_fe_ex2/Makefile.in +++ b/examples/vector_fe/vector_fe_ex2/Makefile.in @@ -367,6 +367,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/examples/vector_fe/vector_fe_ex3/Makefile.in b/examples/vector_fe/vector_fe_ex3/Makefile.in index 09b5d1f1be3..2000e5d4507 100644 --- a/examples/vector_fe/vector_fe_ex3/Makefile.in +++ b/examples/vector_fe/vector_fe_ex3/Makefile.in @@ -368,6 +368,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/include/Makefile.in b/include/Makefile.in index a4efbba6f43..a0d9c0031d1 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -255,6 +255,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/include/libmesh/Makefile.in b/include/libmesh/Makefile.in index 8b021a46b12..263956e86e0 100644 --- a/include/libmesh/Makefile.in +++ b/include/libmesh/Makefile.in @@ -198,6 +198,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ diff --git a/m4/exodus.m4 b/m4/exodus.m4 index 7af53d8e444..9517c3e75c4 100644 --- a/m4/exodus.m4 +++ b/m4/exodus.m4 @@ -51,4 +51,5 @@ AC_DEFUN([CONFIGURE_EXODUS], AC_CONFIG_FILES([contrib/exodusii/v5.09/Makefile]) AC_CONFIG_FILES([contrib/exodusii/v5.22/exodus/cbind/Makefile]) AC_SUBST(EXODUS_INCLUDE) + AC_SUBST(EXODUS_NOT_NETCDF4_FLAG) ]) diff --git a/tests/Makefile.in b/tests/Makefile.in index e58957afc52..7c200e07153 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -397,6 +397,7 @@ EGREP = @EGREP@ EIGEN_INCLUDE = @EIGEN_INCLUDE@ EXEEXT = @EXEEXT@ EXODUS_INCLUDE = @EXODUS_INCLUDE@ +EXODUS_NOT_NETCDF4_FLAG = @EXODUS_NOT_NETCDF4_FLAG@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@