From ed88590fd545c871240f15c64ae7cd692710cd51 Mon Sep 17 00:00:00 2001
From: Ondrej Szekely <ondra.szekely@gmail.com>
Date: Sun, 7 Jun 2015 15:32:57 +0200
Subject: [PATCH] Fixing merge errors.
---
src/functors/initial_conditions/CMakeLists.txt | 2 +-
.../initial_conditions/level_set_functions/CMakeLists.txt | 2 +-
src/problems/tnlHeatEquationProblem.h | 4 ++--
src/problems/tnlHeatEquationProblem_impl.h | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/functors/initial_conditions/CMakeLists.txt b/src/functors/initial_conditions/CMakeLists.txt
index c9eb200ed4..461bde7bce 100755
--- a/src/functors/initial_conditions/CMakeLists.txt
+++ b/src/functors/initial_conditions/CMakeLists.txt
@@ -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 )
diff --git a/src/functors/initial_conditions/level_set_functions/CMakeLists.txt b/src/functors/initial_conditions/level_set_functions/CMakeLists.txt
index 60fc51ec4f..45ab723961 100755
--- a/src/functors/initial_conditions/level_set_functions/CMakeLists.txt
+++ b/src/functors/initial_conditions/level_set_functions/CMakeLists.txt
@@ -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 )
diff --git a/src/problems/tnlHeatEquationProblem.h b/src/problems/tnlHeatEquationProblem.h
index f1356515c0..79e5c4af37 100644
--- a/src/problems/tnlHeatEquationProblem.h
+++ b/src/problems/tnlHeatEquationProblem.h
@@ -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,
diff --git a/src/problems/tnlHeatEquationProblem_impl.h b/src/problems/tnlHeatEquationProblem_impl.h
index 021c4cff6e..6774f588aa 100644
--- a/src/problems/tnlHeatEquationProblem_impl.h
+++ b/src/problems/tnlHeatEquationProblem_impl.h
@@ -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
--
GitLab