From 382ad3508b1ebbf6300687e20f7f6d8bb7006a50 Mon Sep 17 00:00:00 2001
From: Tomas Oberhuber <tomas.oberhuber@fjfi.cvut.cz>
Date: Mon, 15 Sep 2014 20:25:51 +0200
Subject: [PATCH] Fixing test function.
---
src/implementation/functions/tnlExpBumpFunction_impl.h | 8 ++++----
tools/src/tnl-init.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/implementation/functions/tnlExpBumpFunction_impl.h b/src/implementation/functions/tnlExpBumpFunction_impl.h
index e9c4b3424a..753762d0b8 100644
--- a/src/implementation/functions/tnlExpBumpFunction_impl.h
+++ b/src/implementation/functions/tnlExpBumpFunction_impl.h
@@ -63,7 +63,7 @@ tnlExpBumpFunction< 1, Real >::tnlExpBumpFunction()
template< typename Real >
template< int XDiffOrder, int YDiffOrder, int ZDiffOrder >
- Real tnlExpBumpFunction< 1, Real >::getF( const Vertex& v ) const
+ Real tnlExpBumpFunction< 1, Real >::getF( const VertexType& v ) const
{
const RealType& x = v.x();
if( YDiffOrder != 0 || ZDiffOrder != 0 )
@@ -90,7 +90,7 @@ template< typename Real >
template< int XDiffOrder, int YDiffOrder, int ZDiffOrder >
Real
tnlExpBumpFunction< 2, Real >::
-getF( const Vertex& v ) const
+getF( const VertexType& v ) const
{
const RealType& x = v.x();
const RealType& y = v.y();
@@ -118,11 +118,11 @@ tnlExpBumpFunction< 3, Real >::tnlExpBumpFunction()
{
}
-template< typename Vertex, typename Device >
+template< typename Real >
template< int XDiffOrder, int YDiffOrder, int ZDiffOrder >
Real
tnlExpBumpFunction< 3, Real >::
-getF( const Vertex& v ) const
+getF( const VertexType& v ) const
{
const RealType& x = v.x();
const RealType& y = v.y();
diff --git a/tools/src/tnl-init.h b/tools/src/tnl-init.h
index 6efe4e65d9..4d9ff48798 100644
--- a/tools/src/tnl-init.h
+++ b/tools/src/tnl-init.h
@@ -176,7 +176,7 @@ bool resolveFunction( const tnlParameterContainer& parameters )
}
if( functionName == "exp-bump" )
{
- typedef tnlExpBumpFunction< MeshType::Dimensions, typename MeshType::VertexType, typename MeshType::DeviceType > FunctionType;
+ typedef tnlExpBumpFunction< MeshType::Dimensions, typename MeshType::RealType > FunctionType;
return resolveDerivatives< MeshType, FunctionType >( parameters );
}
cerr << "Unknown function " << functionName << "." << endl;
--
GitLab