Commit f8199238 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Changed default formats for VTKWriter and VTUWriter to binary and compressed,... 

Changed default formats for VTKWriter and VTUWriter to binary and compressed, compressed falls back to binary if zlib is not available
parent 32d1c833

src/TNL/Meshes/Writers/VTKWriter.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ public: 


   VTKWriter() = delete;



   VTKWriter( std::ostream& str, VTK::FileFormat format = VTK::FileFormat::ascii )

   VTKWriter( std::ostream& str, VTK::FileFormat format = VTK::FileFormat::binary )

   : str(str), format(format)

   {

      if( format != VTK::FileFormat::ascii && format != VTK::FileFormat::binary )

src/TNL/Meshes/Writers/VTUWriter.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ public: 


   VTUWriter() = delete;



   VTUWriter( std::ostream& str, VTK::FileFormat format = VTK::FileFormat::ascii )

   VTUWriter( std::ostream& str, VTK::FileFormat format = VTK::FileFormat::zlib_compressed )

   : str(str), format(format)

   {}

src/TNL/Meshes/Writers/VTUWriter.hpp

+7 −6
Original line number Diff line number Diff line
@@ -487,18 +487,17 @@ VTUWriter< Mesh >::writeDataArray( const Array& array, 
            str << +array[i] << " ";

         str << "\n";

         break;

      case VTK::FileFormat::binary:

         write_encoded_block< HeaderType >( array.getData(), array.getSize(), str );

         str << "\n";

         break;

      case VTK::FileFormat::zlib_compressed:

#ifdef HAVE_ZLIB

         write_compressed_block< HeaderType >( array.getData(), array.getSize(), str );

         str << "\n";

         break;

#else

         throw std::runtime_error("The ZLIB compression algorithm is not available in this build. Please recompile the program with -DHAVE_ZLIB.");

#endif

         // fall through to binary if HAVE_ZLIB is not defined

      case VTK::FileFormat::binary:

         write_encoded_block< HeaderType >( array.getData(), array.getSize(), str );

         str << "\n";

         break;

   }



   // write DataArray footer
@@ -540,8 +539,10 @@ VTUWriter< Mesh >::writeHeader() 
   else

      str << " byte_order=\"BigEndian\"";

   str << " header_type=\"" << VTK::getTypeName( HeaderType{} ) << "\"";

#ifdef HAVE_ZLIB

   if( format == VTK::FileFormat::zlib_compressed )

      str << " compressor=\"vtkZLibDataCompressor\"";

#endif

   str << ">\n";

   str << "<UnstructuredGrid>\n";