Merge pull request #3498 from roystgnr/metaphysicl_update

Update MetaPhysicL, enable all compiler warnings for it

Author: roystgnr

configure

@@ -56938,7 +56938,6 @@ fi
 
                               my_top_srcdir="$(cd $srcdir && pwd)"
 
-
           if test "x$build_metaphysicl" = "xyes"; then :
 
                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: <<< Configuring library with built-in MetaPhysicL support >>>" >&5
@@ -57035,7 +57034,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       as_fn_append ax_args " '--with-cxx-std=20$acsm_cxx_version'"
       as_fn_append ax_args " 'CPPFLAGS=-I$my_top_srcdir/contrib/timpi/src/algorithms/include/ -I$my_top_srcdir/contrib/timpi/src/parallel/include/ -I$my_top_srcdir/contrib/timpi/src/utilities/include/ -I$ac_abs_top_builddir/contrib/timpi/src/utilities/include/ $CPPFLAGS'"
       as_fn_append ax_args " 'LDFLAGS=-L$ac_abs_top_builddir/contrib/timpi/src/ $LDFLAGS'"
-      as_fn_append ax_args " 'TIMPI_DIR=$my_top_srcdir/contrib/timpi/'"
+      as_fn_append ax_args " '--with-future-timpi-dir=$prefix'"
       as_fn_append ax_args " '--with-timpi-method=$my_method'"
 
       # New options that may need to be merged with existing options.

contrib/metaphysicl

@@ -121,14 +121,10 @@ AC_DEFUN([CONFIGURE_METAPHYSICL],
           dnl here's a trick from GraphicsMagick:
           my_top_srcdir="$(cd $srcdir && pwd)"
 
-          dnl FIXME: setting TIMPI_DIR, even to something invalid, is
-          dnl currently the best way to get MetaPhysicL to recognize
-          dnl that we really want TIMPI.
-
           AS_IF([test "x$build_metaphysicl" = "xyes"],
                 [
                  AC_MSG_RESULT(<<< Configuring library with built-in MetaPhysicL support >>>)
-                 AX_SUBDIRS_CONFIGURE([contrib/metaphysicl],[[--with-cxx-std=20$acsm_cxx_version],[CPPFLAGS=-I$my_top_srcdir/contrib/timpi/src/algorithms/include/ -I$my_top_srcdir/contrib/timpi/src/parallel/include/ -I$my_top_srcdir/contrib/timpi/src/utilities/include/ -I$ac_abs_top_builddir/contrib/timpi/src/utilities/include/ $CPPFLAGS],[LDFLAGS=-L$ac_abs_top_builddir/contrib/timpi/src/ $LDFLAGS],[TIMPI_DIR=$my_top_srcdir/contrib/timpi/],[--with-timpi-method=$my_method]])
+                 AX_SUBDIRS_CONFIGURE([contrib/metaphysicl],[[--with-cxx-std=20$acsm_cxx_version],[CPPFLAGS=-I$my_top_srcdir/contrib/timpi/src/algorithms/include/ -I$my_top_srcdir/contrib/timpi/src/parallel/include/ -I$my_top_srcdir/contrib/timpi/src/utilities/include/ -I$ac_abs_top_builddir/contrib/timpi/src/utilities/include/ $CPPFLAGS],[LDFLAGS=-L$ac_abs_top_builddir/contrib/timpi/src/ $LDFLAGS],[--with-future-timpi-dir=$prefix],[--with-timpi-method=$my_method]])
                 ],
                 [AC_MSG_RESULT(<<< Configuring library with external MetaPhysicL support >>>)])
         ],

m4/libmesh_metaphysicl.m4

@@ -31,12 +31,9 @@
 #include "libmesh/libmesh_common.h"
 #include "libmesh/compare_types.h"
 
-// FIXME - having to do this with MetaPhysicL brings me shame - RHS
-#include "libmesh/ignore_warnings.h"
 // Template specialization declarations in here need to *precede* code
 // using them.
 #include "metaphysicl/dynamicsparsenumberarray_decl.h"
-#include "libmesh/restore_warnings.h"
 
 using MetaPhysicL::DynamicSparseNumberArray;
 
@@ -124,11 +121,8 @@ void convert_from_receive (SendT & received,
 
 
 #ifdef LIBMESH_HAVE_METAPHYSICL
-// FIXME - wrapping MetaPhysicL is shameful - RHS
-#include "libmesh/ignore_warnings.h"
 // Include MetaPhysicL definitions finally
 #include "metaphysicl/dynamicsparsenumberarray.h"
-#include "libmesh/restore_warnings.h"
 
 // And make sure we instantiate the methods we'll need to use on them.
 #include "libmesh/dense_matrix_impl.h"