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

Refactoring functions.

parent 2e6ad3c2

examples/advection/advection.h

+4 −4
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#include <TNL/Solvers/BuildConfigTags.h>

#include <TNL/Operators/DirichletBoundaryConditions.h>

#include <TNL/Operators/NeumannBoundaryConditions.h>

#include <TNL/Functions/Analytic/ConstantFunction.h>

#include <TNL/Functions/Analytic/Constant.h>

#include "advectionProblem.h"

#include "LaxFridrichs.h"

#include "advectionRhs.h"
@@ -83,15 +83,15 @@ class advectionSetter 
          String boundaryConditionsType = parameters.getParameter< String >( "boundary-conditions-type" );

          if( parameters.checkParameter( "boundary-conditions-constant" ) )

          {

             typedef Functions::Analytic::ConstantFunction< Dimensions, Real > ConstantFunction;

             typedef Functions::Analytic::Constant< Dimensions, Real > Constant;

             if( boundaryConditionsType == "dirichlet" )

             {

                typedef Operators::DirichletBoundaryConditions< MeshType, ConstantFunction, MeshType::getMeshDimensions(), Real, Index > BoundaryConditions;

                typedef Operators::DirichletBoundaryConditions< MeshType, Constant, MeshType::getMeshDimensions(), Real, Index > BoundaryConditions;

                typedef advectionProblem< MeshType, BoundaryConditions, RightHandSide, ApproximateOperator > Problem;

                SolverStarter solverStarter;

                return solverStarter.template run< Problem >( parameters );

             }

             typedef Operators::NeumannBoundaryConditions< MeshType, ConstantFunction, Real, Index > BoundaryConditions;

             typedef Operators::NeumannBoundaryConditions< MeshType, Constant, Real, Index > BoundaryConditions;

             typedef advectionProblem< MeshType, BoundaryConditions, RightHandSide, ApproximateOperator > Problem;

             SolverStarter solverStarter;

             return solverStarter.template run< Problem >( parameters );

examples/heat-equation/tnl-heat-equation.h

+6 −6
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <TNL/Operators/diffusion/LinearDiffusion.h>

#include <TNL/Operators/DirichletBoundaryConditions.h>

#include <TNL/Operators/NeumannBoundaryConditions.h>

#include <TNL/Functions/Analytic/ConstantFunction.h>

#include <TNL/Functions/Analytic/Constant.h>

#include <TNL/Functions/MeshFunction.h>

#include <TNL/Problems/HeatEquationProblem.h>

#include <TNL/Meshes/Grid.h>
@@ -42,7 +42,7 @@ class heatEquationConfig 
         typedef Meshes::Grid< 1, double, Devices::Host, int > Mesh;

         typedef Functions::MeshFunction< Mesh > MeshFunction;

         Operators::DirichletBoundaryConditions< Mesh, MeshFunction >::configSetup( config );

         Operators::DirichletBoundaryConditions< Mesh, Functions::Analytic::ConstantFunction< 1 > >::configSetup( config );

         Operators::DirichletBoundaryConditions< Mesh, Functions::Analytic::Constant< 1 > >::configSetup( config );

         config.addEntry< String >( "boundary-conditions-file", "File with the values of the boundary conditions.", "boundary.tnl" );

         config.addEntry< double >( "boundary-conditions-constant", "This sets a value in case of the constant boundary conditions." );

         config.addEntry< double >( "right-hand-side-constant", "This sets a constant value for the right-hand side.", 0.0 );
@@ -70,21 +70,21 @@ class heatEquationSetter 
   {

      enum { Dimensions = MeshType::meshDimensions };

      typedef Operators::LinearDiffusion< MeshType, Real, Index > ApproximateOperator;

      typedef Functions::Analytic::ConstantFunction< Dimensions, Real > RightHandSide;

      typedef Functions::Analytic::Constant< Dimensions, Real > RightHandSide;

      typedef Vectors::StaticVector < MeshType::meshDimensions, Real > Vertex;



      String boundaryConditionsType = parameters.getParameter< String >( "boundary-conditions-type" );

      if( parameters.checkParameter( "boundary-conditions-constant" ) )

      {

         typedef Functions::Analytic::ConstantFunction< Dimensions, Real > ConstantFunction;

         typedef Functions::Analytic::Constant< Dimensions, Real > Constant;

         if( boundaryConditionsType == "dirichlet" )

         {

            typedef Operators::DirichletBoundaryConditions< MeshType, ConstantFunction > BoundaryConditions;

            typedef Operators::DirichletBoundaryConditions< MeshType, Constant > BoundaryConditions;

            typedef HeatEquationProblem< MeshType, BoundaryConditions, RightHandSide, ApproximateOperator > Problem;

            SolverStarter solverStarter;

            return solverStarter.template run< Problem >( parameters );

         }

         typedef Operators::NeumannBoundaryConditions< MeshType, ConstantFunction, Real, Index > BoundaryConditions;

         typedef Operators::NeumannBoundaryConditions< MeshType, Constant, Real, Index > BoundaryConditions;

         typedef HeatEquationProblem< MeshType, BoundaryConditions, RightHandSide, ApproximateOperator > Problem;

         SolverStarter solverStarter;

         return solverStarter.template run< Problem >( parameters );

examples/inviscid-flow/1d/euler.h

+4 −4
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#include <TNL/Solvers/BuildConfigTags.h>

#include <TNL/Operators/DirichletBoundaryConditions.h>

#include <TNL/Operators/NeumannBoundaryConditions.h>

#include <TNL/Functions/Analytic/ConstantFunction.h>

#include <TNL/Functions/Analytic/Constant.h>

#include "eulerProblem.h"

#include "LaxFridrichs.h"
@@ -79,15 +79,15 @@ class eulerSetter 
          String boundaryConditionsType = parameters.getParameter< String >( "boundary-conditions-type" );

          if( parameters.checkParameter( "boundary-conditions-constant" ) )

          {

             typedef Functions::Analytic::ConstantFunction< Dimensions, Real > ConstantFunction;

             typedef Functions::Analytic::Constant< Dimensions, Real > Constant;

             if( boundaryConditionsType == "dirichlet" )

             {

                typedef Operators::DirichletBoundaryConditions< MeshType, ConstantFunction, MeshType::getMeshDimensions(), Real, Index > BoundaryConditions;

                typedef Operators::DirichletBoundaryConditions< MeshType, Constant, MeshType::getMeshDimensions(), Real, Index > BoundaryConditions;

                typedef eulerProblem< MeshType, BoundaryConditions, RightHandSide, ApproximateOperator > Problem;

                SolverStarter solverStarter;

                return solverStarter.template run< Problem >( parameters );

             }

             typedef Operators::NeumannBoundaryConditions< MeshType, ConstantFunction, Real, Index > BoundaryConditions;

             typedef Operators::NeumannBoundaryConditions< MeshType, Constant, Real, Index > BoundaryConditions;

             typedef eulerProblem< MeshType, BoundaryConditions, RightHandSide, ApproximateOperator > Problem;

             SolverStarter solverStarter;

             return solverStarter.template run< Problem >( parameters );

examples/inviscid-flow/2d/euler.h

+4 −4
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#include <TNL/Solvers/BuildConfigTags.h>

#include <TNL/Operators/DirichletBoundaryConditions.h>

#include <TNL/Operators/NeumannBoundaryConditions.h>

#include <TNL/Functions/Analytic/ConstantFunction.h>

#include <TNL/Functions/Analytic/Constant.h>

#include "eulerProblem.h"

#include "LaxFridrichs.h"

#include "eulerRhs.h"
@@ -80,15 +80,15 @@ class eulerSetter 
          String boundaryConditionsType = parameters.getParameter< String >( "boundary-conditions-type" );

          if( parameters.checkParameter( "boundary-conditions-constant" ) )

          {

             typedef Functions::Analytic::ConstantFunction< Dimensions, Real > ConstantFunction;

             typedef Functions::Analytic::Constant< Dimensions, Real > Constant;

             if( boundaryConditionsType == "dirichlet" )

             {

                typedef Operators::DirichletBoundaryConditions< MeshType, ConstantFunction, MeshType::getMeshDimensions(), Real, Index > BoundaryConditions;

                typedef Operators::DirichletBoundaryConditions< MeshType, Constant, MeshType::getMeshDimensions(), Real, Index > BoundaryConditions;

                typedef eulerProblem< MeshType, BoundaryConditions, RightHandSide, ApproximateOperator > Problem;

                SolverStarter solverStarter;

                return solverStarter.template run< Problem >( parameters );

             }

             typedef Operators::NeumannBoundaryConditions< MeshType, ConstantFunction, Real, Index > BoundaryConditions;

             typedef Operators::NeumannBoundaryConditions< MeshType, Constant, Real, Index > BoundaryConditions;

             typedef eulerProblem< MeshType, BoundaryConditions, RightHandSide, ApproximateOperator > Problem;

             SolverStarter solverStarter;

             return solverStarter.template run< Problem >( parameters );

examples/mean-curvature-flow/tnl-mean-curvature-flow.h

+5 −5
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <TNL/Operators/diffusion/LinearDiffusion.h>

#include <TNL/Operators/DirichletBoundaryConditions.h>

#include <TNL/Operators/NeumannBoundaryConditions.h>

#include <TNL/Functions/Analytic/ConstantFunction.h>

#include <TNL/Functions/Analytic/Constant.h>

#include <TNL/Problems/MeanCurvatureFlowProblem.h>

#include <TNL/Operators/diffusion/OneSidedNonlinearDiffusion.h>

#include <TNL/Operators/operator-Q/tnlOneSideDiffOperatorQ.h>
@@ -101,21 +101,21 @@ class meanCurvatureFlowSetter 
   static bool setBoundaryConditions( const Config::ParameterContainer& parameters )

   {

      typedef OneSidedNonlinearDiffusion< MeshType, NonlinearOperator, Real, Index > ApproximateOperator;

      typedef ConstantFunction< Dimensions, Real > RightHandSide;

      typedef Constant< Dimensions, Real > RightHandSide;

      typedef StaticVector< MeshType::meshDimensions, Real > Vertex;



      String boundaryConditionsType = parameters.getParameter< String >( "boundary-conditions-type" );

      if( parameters.checkParameter( "boundary-conditions-constant" ) )

      {

         typedef ConstantFunction< Dimensions, Real > ConstantFunction;

         typedef Constant< Dimensions, Real > Constant;

         if( boundaryConditionsType == "dirichlet" )

         {

            typedef DirichletBoundaryConditions< MeshType, ConstantFunction, Dimensions, Real, Index > BoundaryConditions;

            typedef DirichletBoundaryConditions< MeshType, Constant, Dimensions, Real, Index > BoundaryConditions;

            typedef MeanCurvatureFlowProblem< MeshType, BoundaryConditions, RightHandSide, ApproximateOperator > Solver;

            SolverStarter solverStarter;

            return solverStarter.template run< Solver >( parameters );

         }

         typedef NeumannBoundaryConditions< MeshType, ConstantFunction, Real, Index > BoundaryConditions;

         typedef NeumannBoundaryConditions< MeshType, Constant, Real, Index > BoundaryConditions;

         typedef MeanCurvatureFlowProblem< MeshType, BoundaryConditions, RightHandSide, ApproximateOperator > Solver;

         SolverStarter solverStarter;

         return solverStarter.template run< Solver >( parameters );