Factor complex data_stream into one method

And let's support that regardless of what LIBMESH_ENABLE_COMPLEX has
done with Number.  We already accidentally made std::complex a
dependency of xdr_cxx.h, though we hadn't yet removed the ifdefs for
<complex>.

Author: roystgnr

include/utils/xdr_cxx.h

@@ -36,12 +36,10 @@
 #include "libmesh/restore_warnings.h"
 #endif
 
+#include <complex>
 #include <iosfwd>
 #include <vector>
 #include <string>
-#ifdef LIBMESH_USE_COMPLEX_NUMBERS
-# include <complex>
-#endif
 
 const unsigned int xdr_MAX_STRING_LENGTH=256;
 
@@ -197,6 +195,13 @@ class Xdr
   template <typename T>
   void do_write(std::vector<std::complex<T>> & a);
 
+  /**
+   * Helper method for complex types
+   */
+  template <typename T>
+  void _complex_data_stream (std::complex<T> * val, const unsigned int len,
+                             const unsigned int line_break);
+
   /**
    * Helper method for extended FP types
    */

src/utils/xdr_cxx.C

@@ -1103,134 +1103,24 @@ void Xdr::_xfp_data_stream (XFP * val, const unsigned int len,
 
 
 
-#ifdef LIBMESH_USE_COMPLEX_NUMBERS
 template <>
 void Xdr::data_stream (std::complex<double> * val, const unsigned int len, const unsigned int line_break)
 {
-  switch (mode)
-    {
-    case ENCODE:
-    case DECODE:
-      {
-#ifdef LIBMESH_HAVE_XDR
-
-        libmesh_assert (this->is_open());
-
-
-        if (len > 0)
-          {
-            std::vector<double> io_buffer (2*len);
-
-            // Fill io_buffer if we are writing.
-            if (mode == ENCODE)
-              for (unsigned int i=0, cnt=0; i<len; i++)
-                {
-                  io_buffer[cnt++] = val[i].real();
-                  io_buffer[cnt++] = val[i].imag();
-                }
-
-            xdr_vector(xdrs.get(),
-                       reinterpret_cast<char *>(io_buffer.data()),
-                       2*len,
-                       sizeof(double),
-                       (xdrproc_t) xdr_double);
-
-            // Fill val array if we are reading.
-            if (mode == DECODE)
-              for (unsigned int i=0, cnt=0; i<len; i++)
-                {
-                  double re = io_buffer[cnt++];
-                  double im = io_buffer[cnt++];
-                  val[i] = std::complex<double>(re,im);
-                }
-          }
-#else
-
-        libmesh_error_msg("ERROR: Functionality is not available.\n"    \
-                          << "Make sure LIBMESH_HAVE_XDR is defined at build time\n" \
-                          << "The XDR interface is not available in this installation");
-
-#endif
-        return;
-      }
-
-    case READ:
-      {
-        libmesh_assert(in.get());
-        libmesh_assert (in->good());
-
-        for (unsigned int i=0; i<len; i++)
-          {
-            libmesh_assert(in.get());
-            libmesh_assert (in->good());
-            double re, im;
-            *in >> re >> im;
-            val[i] = std::complex<double>(re,im);
-          }
-
-        return;
-      }
+  this->_complex_data_stream(val, len, line_break);
+}
 
-    case WRITE:
-      {
-        libmesh_assert(out.get());
-        libmesh_assert (out->good());
 
-        // Save stream flags
-        std::ios_base::fmtflags out_flags = out->flags();
 
-        // We will use scientific notation sufficient to exactly
-        // represent our floating point precision in the following
-        // output.  The desired precision and format will
-        // automatically determine the width.
-        *out << std::scientific
-             << std::setprecision(std::numeric_limits<double>::max_digits10);
-
-        if (line_break == libMesh::invalid_uint)
-          for (unsigned int i=0; i<len; i++)
-            {
-              libmesh_assert(out.get());
-              libmesh_assert (out->good());
-              *out << val[i].real() << ' ';
-              *out << val[i].imag() << ' ';
-            }
-        else
-          {
-            const unsigned imax = std::min(line_break, len);
-            unsigned int cnt=0;
-            while (cnt < len)
-              {
-                for (unsigned int i=0; (i<imax && cnt<len); i++)
-                  {
-                    libmesh_assert(out.get());
-                    libmesh_assert (out->good());
-                    *out << val[cnt].real() << ' ';
-                    *out << val[cnt].imag();
-                    cnt++;
-
-                    // Write a space unless this is the last character on the current line.
-                    if (i+1 != imax)
-                      *out << " ";
-                  }
-                libmesh_assert(out.get());
-                libmesh_assert (out->good());
-                *out << '\n';
-              }
-          }
-
-        // Restore stream flags
-        out->flags(out_flags);
+template <>
+void Xdr::data_stream (std::complex<long double> * val, const unsigned int len, const unsigned int line_break)
+{
+  this->_complex_data_stream(val, len, line_break);
+}
 
-        return;
-      }
 
-    default:
-      libmesh_error_msg("Invalid mode = " << mode);
-    }
-}
 
-template <>
-void Xdr::data_stream (std::complex<long double> * val, const unsigned int len, const unsigned int line_break)
+template <typename T>
+void Xdr::_complex_data_stream (std::complex<T> * val, const unsigned int len, const unsigned int line_break)
 {
   switch (mode)
     {
@@ -1271,7 +1161,7 @@ void Xdr::data_stream (std::complex<long double> * val, const unsigned int len,
                 {
                   double re = io_buffer[cnt++];
                   double im = io_buffer[cnt++];
-                  val[i] = std::complex<long double>(re, im);
+                  val[i] = std::complex<T>(re, im);
                 }
           }
 #else
@@ -1293,9 +1183,9 @@ void Xdr::data_stream (std::complex<long double> * val, const unsigned int len,
           {
             libmesh_assert(in.get());
             libmesh_assert (in->good());
-            long double re, im;
+            T re, im;
             *in >> re >> im;
-            val[i] = std::complex<long double>(re,im);
+            val[i] = std::complex<T>(re,im);
           }
 
         return;
@@ -1317,7 +1207,7 @@ void Xdr::data_stream (std::complex<long double> * val, const unsigned int len,
         // base) that can be represented without change.  Equivalent
         // to FLT_DIG, DBL_DIG or LDBL_DIG for floating types.
         *out << std::scientific
-             << std::setprecision(std::numeric_limits<long double>::max_digits10);
+             << std::setprecision(std::numeric_limits<T>::max_digits10);
 
         if (line_break == libMesh::invalid_uint)
           for (unsigned int i=0; i<len; i++)
@@ -1359,7 +1249,8 @@ void Xdr::data_stream (std::complex<long double> * val, const unsigned int len,
       libmesh_error_msg("Invalid mode = " << mode);
     }
 }
-#endif // # LIBMESH_USE_COMPLEX_NUMBERS
+
+
 
 void Xdr::comment (std::string & comment_in)
 {