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

Merge branch 'master' into develop 

Conflicts:
	examples/advection/advectionProblem_impl.h
	examples/inviscid-flow/1d/eulerProblem_impl.h
	examples/inviscid-flow/2d/eulerProblem.h
	examples/inviscid-flow/eulerProblem_impl.h
	src/TNL/Solvers/ODE/Euler_impl.h
parents 65925df1 3b85a05d

examples/inviscid-flow/eulerProblem.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ class eulerProblem: 
      void bindDofs( const MeshPointer& mesh,

                     DofVectorPointer& dofs );



      void getExplicitRHS( const RealType& time,

      void getExplicitUpdate( const RealType& time,

                           const RealType& tau,

                           const MeshPointer& mesh,

                           DofVectorPointer& _u,

examples/inviscid-flow/eulerProblem_impl.h

+6 −6
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ template< typename Mesh, 
          typename InviscidOperators >

void

eulerProblem< Mesh, BoundaryCondition, RightHandSide, InviscidOperators >::

getExplicitRHS( const RealType& time,

getExplicitUpdate( const RealType& time,

                   const RealType& tau,

                   const MeshPointer& mesh,

                   DofVectorPointer& _u,

examples/navier-stokes/navierStokesSolver.h

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ class navierStokesSolver 


   bool solve();



   void GetExplicitRHS( const RealType& time,

   void getExplicitUpdate( const RealType& time,

                        const RealType& tau,

                        DofVectorType& _u,

                        DofVectorType& _fu );

examples/navier-stokes/navierStokesSolver_impl.h

+2 −2
Original line number Diff line number Diff line
@@ -260,12 +260,12 @@ bool navierStokesSolver< Mesh, EulerScheme > :: makeSnapshot( const RealType& t, 
}



template< typename Mesh, typename EulerScheme >

void navierStokesSolver< Mesh, EulerScheme > :: GetExplicitRHS(  const RealType& time,

void navierStokesSolver< Mesh, EulerScheme > :: getExplicitUpdate(  const RealType& time,

                                                                 const RealType& tau,

                                                                 DofVectorType& u,

                                                                 DofVectorType& fu )

{

   nsSolver.getExplicitRhs( time, tau, u, fu );

   nsSolver.getExplicitUpdate( time, tau, u, fu );

   solverMonitor.uMax = this->mesh.getAbsMax( nsSolver.getU() );

   solverMonitor.uAvg = this->mesh.getLpNorm( nsSolver.getU(), 1.0 );

   solverMonitor.eMax = this->mesh.getAbsMax( nsSolver.getEnergy() );

examples/transport-equation/transportEquationProblem.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public PDEProblem< Mesh, 
      void bindDofs( const MeshPointer& mesh,

                     DofVectorPointer& dofs );



      void getExplicitRHS( const RealType& time,

      void getExplicitUpdate( const RealType& time,

                           const RealType& tau,

                           const MeshPointer& mesh,

                           DofVectorPointer& _u,