Commit 8359ecc5 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Merge branch 'master' of geraldine.fjfi.cvut.cz:/local/projects/tnl/tnl

Conflicts:
	.gitignore
parents 994cc384 f24162a9
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ class tnlFunctionAdapter< Mesh, Function, tnlGeneralFunction >
                                const IndexType index,
                                const RealType& time = 0.0 )
      {
         return function.getValue( mesh.template getEntityCenter< MeshEntityDimension >,
         return function.getValue( mesh, //.template getEntityCenter< MeshEntityDimension >,
                                   index,
                                   time );
      }
@@ -87,7 +87,7 @@ class tnlFunctionAdapter< tnlGrid< Dimensions, Real, Device, Index >, Function,
                                const CoordinatesType& coordinates,
                                const RealType& time = 0.0 )
      {
         return function.getValue( mesh.template getCellCenter< VertexType >( coordinates ),
         return function.getValue( mesh, //.template getCellCenter< VertexType >( coordinates ),
                                   index,
                                   time );
      }
@@ -221,11 +221,12 @@ class tnlFunctionAdapter< tnlGrid< Dimensions, Real, Device, Index >, Function,
      }
};

// TODO: Fix the specializations for the constant function.
#ifdef UNDEF
/****
 * Specialization for constant function
 *  - it does not ask the mesh for the mesh entity center
 */

template< typename Mesh,
          int FunctionDimensions,
          typename Real >
@@ -288,6 +289,6 @@ class tnlFunctionAdapter< tnlGrid< Dimensions, Real, Device, Index >,
      }
};


#endif /* UNDEF */

#endif /* TNLFUNCTIONADAPTER_H_ */