diff --git a/examples/advection/LaxFridrichs_impl.h b/examples/advection/LaxFridrichs_impl.h index 6a52a10d622f84c1a55d871c27bb813818b04a70..cc487e28187910cbbdfc037a21ba3327d167c311 100644 --- a/examples/advection/LaxFridrichs_impl.h +++ b/examples/advection/LaxFridrichs_impl.h @@ -306,7 +306,7 @@ getLinearSystemRowLength( const MeshType& mesh, * by the Finite difference method. */ - return 2*Dimensions + 1; + //return 2*Dimensions + 1; } template< typename MeshReal, @@ -333,7 +333,7 @@ updateLinearSystem( const RealType& time, * by the Finite difference method. */ - const typename MeshEntity::template NeighbourEntities< 3 >& neighbourEntities = entity.getNeighbourEntities(); + /* const typename MeshEntity::template NeighbourEntities< 3 >& neighbourEntities = entity.getNeighbourEntities(); const RealType& lambdaX = tau * entity.getMesh().template getSpaceStepsProducts< -2, 0, 0 >(); const RealType& lambdaY = tau * entity.getMesh().template getSpaceStepsProducts< 0, -2, 0 >(); const RealType& lambdaZ = tau * entity.getMesh().template getSpaceStepsProducts< 0, 0, -2 >(); @@ -350,7 +350,7 @@ updateLinearSystem( const RealType& time, matrixRow.setElement( 3, center, 2.0 * ( lambdaX + lambdaY + lambdaZ ) ); matrixRow.setElement( 4, east, -lambdaX ); matrixRow.setElement( 5, north, -lambdaY ); - matrixRow.setElement( 6, up, -lambdaZ ); + matrixRow.setElement( 6, up, -lambdaZ );*/ } #endif /* LaxFridrichsIMPL_H */ diff --git a/examples/advection/advectionProblem_impl.h b/examples/advection/advectionProblem_impl.h index 2e0b0f7a52a3c389e55ac8ed617c858eefdd9510..6cb64dd3115df8856ca2c1aa94bf8b801f76e15e 100644 --- a/examples/advection/advectionProblem_impl.h +++ b/examples/advection/advectionProblem_impl.h @@ -301,7 +301,7 @@ assemblyLinearSystem( const RealType& time, DofVectorType& b, MeshDependentDataType& meshDependentData ) { - tnlLinearSystemAssembler< Mesh, + /*tnlLinearSystemAssembler< Mesh, MeshFunctionType, DifferentialOperator, BoundaryCondition, @@ -319,7 +319,7 @@ assemblyLinearSystem( const RealType& time, this->rightHandSide, u, matrix, - b ); + b );*/ } #endif /* advectionPROBLEM_IMPL_H_ */ diff --git a/examples/inviscid-flow/1d/eulerBuildConfigTag.h b/examples/inviscid-flow/1d/eulerBuildConfigTag.h index e55229103586a07a2dcbc815e08e7b93b37fe796..f0fc2953ad7f66124a5824a35a873bbf850ec5ab 100644 --- a/examples/inviscid-flow/1d/eulerBuildConfigTag.h +++ b/examples/inviscid-flow/1d/eulerBuildConfigTag.h @@ -17,10 +17,11 @@ template<> struct tnlConfigTagReal< eulerBuildConfigTag, long double > { enum { template<> struct tnlConfigTagIndex< eulerBuildConfigTag, short int >{ enum { enabled = false }; }; template<> struct tnlConfigTagIndex< eulerBuildConfigTag, long int >{ enum { enabled = false }; }; +template< int Dimensions > struct tnlConfigTagDimensions< eulerBuildConfigTag, Dimensions >{ enum { enabled = ( Dimensions == 1 ) }; }; + /**** * Use of tnlGrid is enabled for allowed dimensions and Real, Device and Index types. */ - template< int Dimensions, typename Real, typename Device, typename Index > struct tnlConfigTagMesh< eulerBuildConfigTag, tnlGrid< Dimensions, Real, Device, Index > > { enum { enabled = tnlConfigTagDimensions< eulerBuildConfigTag, Dimensions >::enabled && @@ -32,8 +33,8 @@ template< int Dimensions, typename Real, typename Device, typename Index > * Please, chose your preferred time discretisation here. */ template<> struct tnlConfigTagTimeDiscretisation< eulerBuildConfigTag, tnlExplicitTimeDiscretisationTag >{ enum { enabled = true }; }; -template<> struct tnlConfigTagTimeDiscretisation< eulerBuildConfigTag, tnlSemiImplicitTimeDiscretisationTag >{ enum { enabled = true }; }; -template<> struct tnlConfigTagTimeDiscretisation< eulerBuildConfigTag, tnlImplicitTimeDiscretisationTag >{ enum { enabled = true }; }; +template<> struct tnlConfigTagTimeDiscretisation< eulerBuildConfigTag, tnlSemiImplicitTimeDiscretisationTag >{ enum { enabled = false }; }; +template<> struct tnlConfigTagTimeDiscretisation< eulerBuildConfigTag, tnlImplicitTimeDiscretisationTag >{ enum { enabled = false }; }; /**** * Only the Runge-Kutta-Merson solver is enabled by default. diff --git a/examples/inviscid-flow/2d/eulerBuildConfigTag.h b/examples/inviscid-flow/2d/eulerBuildConfigTag.h index d242a88650f98f2cac9e0ea68473a10e7c29469f..a03c260be27f0ab5915edde0de252935a31b0f0f 100644 --- a/examples/inviscid-flow/2d/eulerBuildConfigTag.h +++ b/examples/inviscid-flow/2d/eulerBuildConfigTag.h @@ -17,10 +17,11 @@ template<> struct tnlConfigTagReal< eulerBuildConfigTag, long double > { enum { template<> struct tnlConfigTagIndex< eulerBuildConfigTag, short int >{ enum { enabled = false }; }; template<> struct tnlConfigTagIndex< eulerBuildConfigTag, long int >{ enum { enabled = false }; }; +template< int Dimensions > struct tnlConfigTagDimensions< eulerBuildConfigTag, Dimensions >{ enum { enabled = ( Dimensions == 2 ) }; }; + /**** * Use of tnlGrid is enabled for allowed dimensions and Real, Device and Index types. */ - template< int Dimensions, typename Real, typename Device, typename Index > struct tnlConfigTagMesh< eulerBuildConfigTag, tnlGrid< Dimensions, Real, Device, Index > > { enum { enabled = tnlConfigTagDimensions< eulerBuildConfigTag, Dimensions >::enabled && @@ -32,8 +33,8 @@ template< int Dimensions, typename Real, typename Device, typename Index > * Please, chose your preferred time discretisation here. */ template<> struct tnlConfigTagTimeDiscretisation< eulerBuildConfigTag, tnlExplicitTimeDiscretisationTag >{ enum { enabled = true }; }; -template<> struct tnlConfigTagTimeDiscretisation< eulerBuildConfigTag, tnlSemiImplicitTimeDiscretisationTag >{ enum { enabled = true }; }; -template<> struct tnlConfigTagTimeDiscretisation< eulerBuildConfigTag, tnlImplicitTimeDiscretisationTag >{ enum { enabled = true }; }; +template<> struct tnlConfigTagTimeDiscretisation< eulerBuildConfigTag, tnlSemiImplicitTimeDiscretisationTag >{ enum { enabled = false }; }; +template<> struct tnlConfigTagTimeDiscretisation< eulerBuildConfigTag, tnlImplicitTimeDiscretisationTag >{ enum { enabled = false }; }; /**** * Only the Runge-Kutta-Merson solver is enabled by default. diff --git a/src/solvers/tnlBuildConfigTags.h b/src/solvers/tnlBuildConfigTags.h index ced6a47fc7913918dd89cb9fa0cbe27345a5406d..4ee030b658a6b43a71bf8e7bd17e3b6562aa1218 100644 --- a/src/solvers/tnlBuildConfigTags.h +++ b/src/solvers/tnlBuildConfigTags.h @@ -57,10 +57,7 @@ template< typename ConfigTag > struct tnlConfigTagMeshResolve{ enum { enabled = /**** * 1, 2, and 3 dimensions are enabled by default */ -template< typename ConfigTag, int Dimensions > struct tnlConfigTagDimensions{ enum { enabled = false }; }; - template< typename ConfigTag > struct tnlConfigTagDimensions< ConfigTag, 1 >{ enum { enabled = true }; }; - template< typename ConfigTag > struct tnlConfigTagDimensions< ConfigTag, 2 >{ enum { enabled = true }; }; - template< typename ConfigTag > struct tnlConfigTagDimensions< ConfigTag, 3 >{ enum { enabled = true }; }; +template< typename ConfigTag, int Dimensions > struct tnlConfigTagDimensions{ enum { enabled = ( Dimensions > 0 && Dimensions <= 3 ) }; }; /**** * Up to the exceptions enlisted below, all mesh types are disabled by default.