diff --git a/src/implementation/core/CMakeLists.txt b/src/implementation/core/CMakeLists.txt
index f58d35e8554052ba303f13ef69f8b601bb4db34a..21912237861af95ced45f308603b0f46a80f8b3d 100755
--- a/src/implementation/core/CMakeLists.txt
+++ b/src/implementation/core/CMakeLists.txt
@@ -18,6 +18,7 @@ SET( CURRENT_DIR ${CMAKE_SOURCE_DIR}/src/implementation/core )
set( tnl_implementation_core_SOURCES
${CURRENT_DIR}/tnlArray_impl.cpp
${CURRENT_DIR}/tnlMultiArray_impl.cpp
+ ${CURRENT_DIR}/tnlMultiVector_impl.cpp
${CURRENT_DIR}/tnlSharedVector_impl.cpp
${CURRENT_DIR}/tnlVector_impl.cpp
${CURRENT_DIR}/tnlTimerRT.cpp
diff --git a/src/implementation/core/tnlMultiVector1D_impl.h b/src/implementation/core/tnlMultiVector1D_impl.h
index 558d4bf3b696ecd06eb70c56a452ab4f02ad9690..a3103ef492a040446842a65aa403e2e5b85e34f6 100644
--- a/src/implementation/core/tnlMultiVector1D_impl.h
+++ b/src/implementation/core/tnlMultiVector1D_impl.h
@@ -107,13 +107,13 @@ void tnlMultiVector< 1, Element, Device, Index > :: setElement( const Index i, E
template< typename Element, typename Device, typename Index >
Element& tnlMultiVector< 1, Element, Device, Index > :: operator()( const Index element )
{
- return tnlVector< Element, Device, Index > :: operator[]( getLongVectorIndex( element ) );
+ return tnlVector< Element, Device, Index > :: operator[]( getElementIndex( element ) );
}
template< typename Element, typename Device, typename Index >
const Element& tnlMultiVector< 1, Element, Device, Index > :: operator()( const Index element ) const
{
- return tnlVector< Element, Device, Index > :: operator[]( getLongVectorIndex( element ) );
+ return tnlVector< Element, Device, Index > :: operator[]( getElementIndex( element ) );
}
template< typename Element, typename Device, typename Index >
diff --git a/src/implementation/core/tnlMultiVector2D_impl.h b/src/implementation/core/tnlMultiVector2D_impl.h
index 74515fe88b94f45ff0dcda52e6ac22271436dfa9..f60c392dbbbda1b039800d906087af713d1ad857 100644
--- a/src/implementation/core/tnlMultiVector2D_impl.h
+++ b/src/implementation/core/tnlMultiVector2D_impl.h
@@ -50,7 +50,7 @@ template< typename Element, typename Device, typename Index >
bool tnlMultiVector< 2, Element, Device, Index > :: setDimensions( const Index jSize,
const Index iSize )
{
- tnlAssert( xSize > 0 && ySize > 0,
+ tnlAssert( iSize > 0 && jSize > 0,
cerr << "iSize = " << iSize
<< "jSize = " << jSize );
diff --git a/src/implementation/core/tnlMultiVector3D_impl.h b/src/implementation/core/tnlMultiVector3D_impl.h
index db8b22d36de3190fa0bbaff854943f2555795ec9..dc9e6d0eb5695378e913c9a17f8f63b73d08405e 100644
--- a/src/implementation/core/tnlMultiVector3D_impl.h
+++ b/src/implementation/core/tnlMultiVector3D_impl.h
@@ -101,8 +101,8 @@ Index tnlMultiVector< 3, Element, Device, Index > :: getElementIndex( const Inde
const Index i ) const
{
tnlAssert( i >= 0 && i < this -> dimensions[ 0 ] &&
- j >= 0 && j < this -> dimensions[ 1 ] &&,
- k >= 0 && k < this -> dimensions[ 2 ]
+ j >= 0 && j < this -> dimensions[ 1 ] &&
+ k >= 0 && k < this -> dimensions[ 2 ],
cerr << " i = " << i
<< " j = " << j
<< " k = " << k
diff --git a/src/implementation/core/tnlMultiVector4D_impl.h b/src/implementation/core/tnlMultiVector4D_impl.h
index 088a9265d4f100adb079ac38e7c462166ecfe4a1..88975d2ed5e819558d29eb7e4e8c72d78eb142b1 100644
--- a/src/implementation/core/tnlMultiVector4D_impl.h
+++ b/src/implementation/core/tnlMultiVector4D_impl.h
@@ -108,9 +108,9 @@ Index tnlMultiVector< 4, Element, Device, Index > :: getElementIndex( const Inde
const Index i ) const
{
tnlAssert( i >= 0 && i < this -> dimensions[ 0 ] &&
- j >= 0 && j < this -> dimensions[ 1 ] &&,
+ j >= 0 && j < this -> dimensions[ 1 ] &&
k >= 0 && k < this -> dimensions[ 2 ] &&
- l >= 0 && l < this -> dimensions[ 3 ]
+ l >= 0 && l < this -> dimensions[ 3 ],
cerr << " i = " << i
<< " j = " << j
<< " k = " << k
diff --git a/src/implementation/core/tnlMultiVector_impl.cpp b/src/implementation/core/tnlMultiVector_impl.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..58654547da57781536d9d048c591ce5ec8da12c9
--- /dev/null
+++ b/src/implementation/core/tnlMultiVector_impl.cpp
@@ -0,0 +1,62 @@
+/***************************************************************************
+ tnlMultiVector_impl.cpp - description
+ -------------------
+ begin : Jan 21, 2013
+ copyright : (C) 2013 by Tomas Oberhuber
+ email : tomas.oberhuber@fjfi.cvut.cz
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+
+#include <core/tnlMultiVector.h>
+
+#ifdef TEMPLATE_EXPLICIT_INSTANTIATION
+
+template class tnlMultiVector< 1, float, tnlHost, int >;
+template class tnlMultiVector< 1, double, tnlHost, int >;
+template class tnlMultiVector< 1, float, tnlHost, long int >;
+template class tnlMultiVector< 1, double, tnlHost, long int >;
+template class tnlMultiVector< 2, float, tnlHost, int >;
+template class tnlMultiVector< 2, double, tnlHost, int >;
+template class tnlMultiVector< 2, float, tnlHost, long int >;
+template class tnlMultiVector< 2, double, tnlHost, long int >;
+template class tnlMultiVector< 3, float, tnlHost, int >;
+template class tnlMultiVector< 3, double, tnlHost, int >;
+template class tnlMultiVector< 3, float, tnlHost, long int >;
+template class tnlMultiVector< 3, double, tnlHost, long int >;
+template class tnlMultiVector< 4, float, tnlHost, int >;
+template class tnlMultiVector< 4, double, tnlHost, int >;
+template class tnlMultiVector< 4, float, tnlHost, long int >;
+template class tnlMultiVector< 4, double, tnlHost, long int >;
+
+#ifdef HAVE_CUDA
+#endif
+
+template class tnlMultiVector< 1, float, tnlCuda, int >;
+template class tnlMultiVector< 1, double, tnlCuda, int >;
+template class tnlMultiVector< 1, float, tnlCuda, long int >;
+template class tnlMultiVector< 1, double, tnlCuda, long int >;
+template class tnlMultiVector< 2, float, tnlCuda, int >;
+template class tnlMultiVector< 2, double, tnlCuda, int >;
+template class tnlMultiVector< 2, float, tnlCuda, long int >;
+template class tnlMultiVector< 2, double, tnlCuda, long int >;
+template class tnlMultiVector< 3, float, tnlCuda, int >;
+template class tnlMultiVector< 3, double, tnlCuda, int >;
+template class tnlMultiVector< 3, float, tnlCuda, long int >;
+template class tnlMultiVector< 3, double, tnlCuda, long int >;
+template class tnlMultiVector< 4, float, tnlCuda, int >;
+template class tnlMultiVector< 4, double, tnlCuda, int >;
+template class tnlMultiVector< 4, float, tnlCuda, long int >;
+template class tnlMultiVector< 4, double, tnlCuda, long int >;
+
+#endif
+
+
+
diff --git a/src/implementation/mesh/tnlGrid1D_impl.h b/src/implementation/mesh/tnlGrid1D_impl.h
index f7e551fbd8f49abb6e813f882b2dabefabc0a7c0..0d8f674afd9535fcaec9c81dcc0b098f3659a5e1 100644
--- a/src/implementation/mesh/tnlGrid1D_impl.h
+++ b/src/implementation/mesh/tnlGrid1D_impl.h
@@ -41,6 +41,14 @@ tnlString tnlGrid< 1, Real, Device, Index> :: getTypeStatic()
tnlString( getParameterType< IndexType >() ) + " >";
}
+template< typename Real,
+ typename Device,
+ typename Index >
+tnlString tnlGrid< 1, Real, Device, Index> :: getType() const
+{
+ return this -> getTypeStatic();
+}
+
template< typename Real,
typename Device,
typename Index >
diff --git a/src/implementation/mesh/tnlGrid2D_impl.h b/src/implementation/mesh/tnlGrid2D_impl.h
index e6d78ae664f393261fc2eeaaa37ff3b4c614f599..5abce5f710a191b1c41343fc3054ad7afed29d2f 100644
--- a/src/implementation/mesh/tnlGrid2D_impl.h
+++ b/src/implementation/mesh/tnlGrid2D_impl.h
@@ -40,6 +40,15 @@ tnlString tnlGrid< 2, Real, Device, Index> :: getTypeStatic()
tnlString( getParameterType< IndexType >() ) + " >";
}
+template< typename Real,
+ typename Device,
+ typename Index >
+tnlString tnlGrid< 2, Real, Device, Index> :: getType() const
+{
+ cerr << "################" << endl;
+ return this -> getTypeStatic();
+}
+
template< typename Real,
typename Device,
typename Index >
@@ -149,8 +158,8 @@ Index tnlGrid< 2, Real, Device, Index> :: getNodeIndex( const Index j, const Ind
}
template< typename Real,
- typename Device,
- typename Index >
+ typename Device,
+ typename Index >
Index tnlGrid< 2, Real, Device, Index> :: getDofs() const
{
return this -> dofs;
diff --git a/src/implementation/mesh/tnlGrid3D_impl.h b/src/implementation/mesh/tnlGrid3D_impl.h
index 7e188588ae6285603786efcada4f581777f52532..85f2bb0a126064227109c3a5ba7922b0d5782dc9 100644
--- a/src/implementation/mesh/tnlGrid3D_impl.h
+++ b/src/implementation/mesh/tnlGrid3D_impl.h
@@ -40,6 +40,14 @@ tnlString tnlGrid< 3, Real, Device, Index> :: getTypeStatic()
tnlString( getParameterType< IndexType >() ) + " >";
}
+template< typename Real,
+ typename Device,
+ typename Index >
+tnlString tnlGrid< 3, Real, Device, Index> :: getType() const
+{
+ return this -> getTypeStatic();
+}
+
template< typename Real,
typename Device,
typename Index >
diff --git a/src/legacy/mesh/implementation/tnlGrid1D_impl.h b/src/legacy/mesh/implementation/tnlGrid1D_impl.h
index 50a541cc74a3edb68908f303cc12b6929bc02e5f..1b916c16ccc2c95fd34f5b2378687d5644e5af9d 100644
--- a/src/legacy/mesh/implementation/tnlGrid1D_impl.h
+++ b/src/legacy/mesh/implementation/tnlGrid1D_impl.h
@@ -229,9 +229,6 @@ Real tnlGridOld< 1, Real, Device, Index > :: Partial_x( const Index i1 ) const
template< typename Real, typename Device, typename Index >
Real tnlGridOld< 1, Real, Device, Index > :: Partial_xx( const Index i1 ) const
{
- tnlAssert( Dimensions == 1,
- cerr << "The array " << this -> getName()
- << " has " << Dimensions << " but 1 is expected." << endl; );
tnlAssert( i1 > 0 &&
i1 < ( tnlMultiVector< 1, Real, tnlHost, Index > :: getDimensions()[ tnlX ] - 1 ),
cerr << " i1 = " << i1 << " and it should be in ( 0, " <<
diff --git a/src/legacy/mesh/implementation/tnlGrid3D_impl.h b/src/legacy/mesh/implementation/tnlGrid3D_impl.h
index e7344039b5f9d1c36a939a94c6b2ff07ec048889..d6de14840a9e753c6f19d74e0e6b839891dcd82b 100644
--- a/src/legacy/mesh/implementation/tnlGrid3D_impl.h
+++ b/src/legacy/mesh/implementation/tnlGrid3D_impl.h
@@ -297,9 +297,6 @@ Real tnlGridOld< 3,Real, Device, Index > :: Partial_y_f( const Index i1,
const Index i2,
const Index i3 ) const
{
- tnlAssert( Dimensions == 3,
- cerr << "The array " << this -> getName()
- << " has " << Dimensions << " but 3 are expected." << endl; );
tnlAssert( i1 >= 0 && i2 >= 0 && i3 >= 0 &&
i1 <= this -> getDimensions()[ tnlX ] - 1 &&
i2 < this -> getDimensions()[ tnlY ] - 1 &&
diff --git a/src/mesh/tnlGrid.h b/src/mesh/tnlGrid.h
index 22b74a3706bc4008bcf93ccd4926eb7e1abd8ca5..c3c0d67080f4f1d04e74d68be0be171a45695ca4 100644
--- a/src/mesh/tnlGrid.h
+++ b/src/mesh/tnlGrid.h
@@ -46,6 +46,8 @@ class tnlGrid< 1, Real, Device, Index> : public tnlObject
static tnlString getTypeStatic();
+ tnlString getType() const;
+
void setDimensions( const Index xSize );
const tnlTuple< 1, Index >& getDimensions() const;
@@ -102,6 +104,8 @@ class tnlGrid< 2, Real, Device, Index> : public tnlObject
static tnlString getTypeStatic();
+ tnlString getType() const;
+
void setDimensions( const Index ySize, const Index xSize );
const tnlTuple< 2, Index >& getDimensions() const;
@@ -158,6 +162,8 @@ class tnlGrid< 3, Real, Device, Index> : public tnlObject
static tnlString getTypeStatic();
+ tnlString getType() const;
+
void setDimensions( const Index zSize, const Index ySize, const Index xSize );
const tnlTuple< 3, Index >& getDimensions() const;