Commit 8f492406 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Refactoring: removed tuple types from tnl-view

parent 7bb0d691

src/TNL/Functions/MeshFunctionVTKWriter.h

+1 −23
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ 
namespace TNL {

namespace Functions {



template< typename MeshFunction,

          bool = std::is_fundamental< typename MeshFunction::RealType >::value >

template< typename MeshFunction >

class MeshFunctionVTKWriter

: protected Meshes::Writers::VTKWriter< typename MeshFunction::MeshType >

{
@@ -51,26 +50,5 @@ public: 
   }

};



template< typename MeshFunction >

class MeshFunctionVTKWriter< MeshFunction, false >

{

public:

   MeshFunctionVTKWriter( std::ostream& str,

                          Meshes::VTK::FileFormat format = Meshes::VTK::FileFormat::ascii )

   {}



   bool write( const MeshFunction& function,

               const String& functionName = "cellFunctionValues" )

   {

      throw std::logic_error( "Unsupported RealType - VTKWriter supports only fundamental types." );

   }



   void appendFunction( const MeshFunction& function,

                        const String& functionName )

   {

      throw std::logic_error( "Unsupported RealType - VTKWriter supports only fundamental types." );

   }

};



} // namespace Functions

} // namespace TNL

src/Tools/tnl-view.h

+0 −60
Original line number Diff line number Diff line
@@ -306,57 +306,6 @@ bool setIndexType( const MeshPointer& meshPointer, 
   return false;

}



template< typename MeshPointer >

bool setTupleType( const MeshPointer& meshPointer,

                   const String& inputFileName,

                   const std::vector< String >& parsedObjectType,

                   const std::vector< String >& parsedValueType,

                   const Config::ParameterContainer& parameters )

{

   int dimensions = atoi( parsedValueType[ 1 ].getString() );

   String dataType = parsedValueType[ 2 ];

   if( dataType == "float" )

      switch( dimensions )

      {

         case 1:

            return setIndexType< MeshPointer, Containers::StaticVector< 1, float >, float >( meshPointer, inputFileName, parsedObjectType, parameters );

            break;

         case 2:

            return setIndexType< MeshPointer, Containers::StaticVector< 2, float >, float >( meshPointer, inputFileName, parsedObjectType, parameters );

            break;

         case 3:

            return setIndexType< MeshPointer, Containers::StaticVector< 3, float >, float >( meshPointer, inputFileName, parsedObjectType, parameters );

            break;

      }

   if( dataType == "double" )

      switch( dimensions )

      {

         case 1:

            return setIndexType< MeshPointer, Containers::StaticVector< 1, double >, double >( meshPointer, inputFileName, parsedObjectType, parameters );

            break;

         case 2:

            return setIndexType< MeshPointer, Containers::StaticVector< 2, double >, double >( meshPointer, inputFileName, parsedObjectType, parameters );

            break;

         case 3:

            return setIndexType< MeshPointer, Containers::StaticVector< 3, double >, double >( meshPointer, inputFileName, parsedObjectType, parameters );

            break;

      }

//   if( dataType == "long double" )

//      switch( dimensions )

//      {

//         case 1:

//            return setIndexType< MeshPointer, Containers::StaticVector< 1, long double >, long double >( meshPointer, inputFileName, parsedObjectType, parameters );

//            break;

//         case 2:

//            return setIndexType< MeshPointer, Containers::StaticVector< 2, long double >, long double >( meshPointer, inputFileName, parsedObjectType, parameters );

//            break;

//         case 3:

//            return setIndexType< MeshPointer, Containers::StaticVector< 3, long double >, long double >( meshPointer, inputFileName, parsedObjectType, parameters );

//            break;

//      }

   return false;

}



template< typename MeshPointer >

bool setValueType( const MeshPointer& meshPointer,

                     const String& inputFileName,
@@ -382,15 +331,6 @@ bool setValueType( const MeshPointer& meshPointer, 
   if( elementType == "bool" )

      return setIndexType< MeshPointer, bool, bool >( meshPointer, inputFileName, parsedObjectType, parameters );



   const std::vector< String > parsedValueType = parseObjectType( elementType );

   if( ! parsedValueType.size() )

   {

      std::cerr << "Unable to parse object type " << elementType << "." << std::endl;

      return false;

   }

   if( parsedValueType[ 0 ] == "Containers::StaticVector" )

      return setTupleType< MeshPointer >( meshPointer, inputFileName, parsedObjectType, parsedValueType, parameters );



   std::cerr << "Unknown element type " << elementType << "." << std::endl;

   return false;

}