Commit ed88590f authored by Ondrej Szekely's avatar Ondrej Szekely
Browse files

Fixing merge errors.

parent 0e47ea33

src/functors/initial_conditions/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,4 +8,4 @@ SET( headers tnlCylinderFunction.h 
             tnlTwinsFunction_impl.h             

   )

   

INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/functions/initial_conditions )
 
INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/functors/initial_conditions )

src/functors/initial_conditions/level_set_functions/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,4 +4,4 @@ SET( headers tnlBlobFunction.h 
             tnlPseudoSquareFunction_impl.h          

   )

   

INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/functions/initial_conditions/level_set_functions )
 
INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/functors/initial_conditions/level_set_functions )

src/problems/tnlHeatEquationProblem.h

+2 −2
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ class tnlHeatEquationProblem : public tnlPDEProblem< Mesh, 
                           const RealType& tau,

                           const MeshType& mesh,

                           DofVectorType& _u,

                           MeshDependentDataType& meshDependentData,

                           DofVectorType& _fu );

                           DofVectorType& _fu,

			   MeshDependentDataType& meshDependentData );



      template< typename Matrix >

      void assemblyLinearSystem( const RealType& time,

src/problems/tnlHeatEquationProblem_impl.h

+2 −2
Original line number Diff line number Diff line
@@ -181,8 +181,8 @@ getExplicitRHS( const RealType& time, 
                const RealType& tau,

                const MeshType& mesh,

                DofVectorType& u,

                MeshDependentDataType& meshDependentData,

                DofVectorType& fu )

                DofVectorType& fu,

		MeshDependentDataType& meshDependentData )

{

   /****

    * If you use an explicit solver like tnlEulerSolver or tnlMersonSolver, you