Commit 24229abf authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Fixed usage of StaticVector as RealType in tnl-view

parent c815816e

src/TNL/Containers/StaticVector_impl.h

+2 −2
Original line number Diff line number Diff line
@@ -181,8 +181,8 @@ StaticVector< Size, Real >::abs() const 
}





template< int Size, typename Real >

StaticVector< Size, Real > operator * ( const Real& c, const StaticVector< Size, Real >& u )

template< int Size, typename Real, typename Scalar >

StaticVector< Size, Real > operator * ( const Scalar& c, const StaticVector< Size, Real >& u )

{

   return u * c;

}

src/TNL/Functions/MeshFunctionVTKWriter_impl.h

+5 −5
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ write( const MeshFunctionType& function, 
   const RealType spaceStepY = mesh.getSpaceSteps().y();

   const RealType originZ = mesh.getOrigin().z();

   const RealType spaceStepZ = mesh.getSpaceSteps().z();

   const RealType entitiesCount = mesh.getDimensions().x() * mesh.getDimensions().y() * mesh.getDimensions().z();

   const MeshIndex entitiesCount = mesh.template getEntitiesCount< typename MeshType::Cell >();

 

   str << "POINTS " << (mesh.getDimensions().x()+1) * (mesh.getDimensions().y()+1) * (mesh.getDimensions().z()+1) <<

          " float" << std::endl;
@@ -606,8 +606,8 @@ write( const MeshFunctionType& function, 
   const RealType spaceStepY = mesh.getSpaceSteps().y();

   const RealType originZ = mesh.getOrigin().z();

   const RealType spaceStepZ = mesh.getSpaceSteps().z();

   const RealType entitiesCount = mesh.template getEntitiesCount< Face >();

   const RealType pointsCount = mesh.template getEntitiesCount< Cell >();

   const MeshIndex entitiesCount = mesh.template getEntitiesCount< Face >();

   const MeshIndex pointsCount = mesh.template getEntitiesCount< Cell >();

 

   str << "POINTS " << pointsCount <<

          " float" << std::endl;
@@ -784,8 +784,8 @@ write( const MeshFunctionType& function, 
   const RealType spaceStepY = mesh.getSpaceSteps().y();

   const RealType originZ = mesh.getOrigin().z();

   const RealType spaceStepZ = mesh.getSpaceSteps().z();

   const RealType entitiesCount = mesh.template getEntitiesCount< Edge >();

   const RealType pointsCount = mesh.template getEntitiesCount< Cell >();

   const MeshIndex entitiesCount = mesh.template getEntitiesCount< Edge >();

   const MeshIndex pointsCount = mesh.template getEntitiesCount< Cell >();

 

   str << "POINTS " << pointsCount <<

          " float" << std::endl;

src/Tools/tnl-view.h

+3 −4
Original line number Diff line number Diff line
@@ -379,10 +379,9 @@ bool setElementType( const MeshPointer& meshPointer, 
      std::cerr << "Unable to parse object type " << elementType << "." << std::endl;

      return false;

   }

   // FIXME: this does not compile for an unknown reason

//   if( parsedElementType[ 0 ] == "Containers::StaticVector" ||

//       parsedElementType[ 0 ] == "tnlStaticVector" )               // TODO: remove deprecated type names

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

   if( parsedElementType[ 0 ] == "Containers::StaticVector" ||

       parsedElementType[ 0 ] == "tnlStaticVector" )               // TODO: remove deprecated type names

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



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

   return false;