From 4a6742c4ad29c116f9a72aa4e94005a1f1bd78d2 Mon Sep 17 00:00:00 2001
From: labourasse <labourassee@gmail.com>
Date: Fri, 11 Feb 2022 18:33:19 +0100
Subject: [PATCH] Modified files
---
src/language/modules/SchemeModule.cpp | 39 +++++++++++++++------------
src/scheme/VectorDiamondScheme.hpp | 1 +
2 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/src/language/modules/SchemeModule.cpp b/src/language/modules/SchemeModule.cpp
index 84d263e68..98013190e 100644
--- a/src/language/modules/SchemeModule.cpp
+++ b/src/language/modules/SchemeModule.cpp
@@ -518,24 +518,29 @@ SchemeModule::SchemeModule()
));
- this->_addBuiltinFunction(
- "energybalance",
- std::make_shared<BuiltinFunctionEmbedder<std::tuple<
- std::shared_ptr<const IDiscreteFunction>,
- std::shared_ptr<const IDiscreteFunction>>(const std::shared_ptr<const IDiscreteFunction>&,
- const std::shared_ptr<const IDiscreteFunction>&,
- const std::shared_ptr<const IDiscreteFunction>&,
- const std::shared_ptr<const IDiscreteFunction>&,
- const std::vector<
- std::shared_ptr<const IBoundaryConditionDescriptor>>&)>>(
- [](const std::shared_ptr<const IDiscreteFunction> lambdab, const std::shared_ptr<const IDiscreteFunction> mub,
- const std::shared_ptr<const IDiscreteFunction> U, const std::shared_ptr<const IDiscreteFunction> source,
- const std::vector<std::shared_ptr<const IBoundaryConditionDescriptor>>& bc_descriptor_list)
- -> const std::tuple<std::shared_ptr<const IDiscreteFunction>, std::shared_ptr<const IDiscreteFunction>> {
- return EnergyComputerHandler{lambdab, mub, U, source, bc_descriptor_list}.computeEnergyUpdate();
- }
+ this->_addBuiltinFunction("energybalance",
+ std::make_shared<BuiltinFunctionEmbedder<std::tuple<
+ std::shared_ptr<const IDiscreteFunction>,
+ std::shared_ptr<const IDiscreteFunction>>(const std::shared_ptr<const IDiscreteFunction>&,
+ const std::shared_ptr<const IDiscreteFunction>&,
+ const std::shared_ptr<const IDiscreteFunction>&,
+ const std::shared_ptr<const IDiscreteFunction>&,
+ const std::shared_ptr<const IDiscreteFunction>&,
+ const std::vector<std::shared_ptr<
+ const IBoundaryConditionDescriptor>>&)>>(
+ [](const std::shared_ptr<const IDiscreteFunction> lambdab,
+ const std::shared_ptr<const IDiscreteFunction> mub,
+ const std::shared_ptr<const IDiscreteFunction> U,
+ const std::shared_ptr<const IDiscreteFunction> dual_U,
+ const std::shared_ptr<const IDiscreteFunction> source,
+ const std::vector<std::shared_ptr<const IBoundaryConditionDescriptor>>&
+ bc_descriptor_list) -> const std::tuple<std::shared_ptr<const IDiscreteFunction>,
+ std::shared_ptr<const IDiscreteFunction>> {
+ return EnergyComputerHandler{lambdab, mub, U, dual_U, source, bc_descriptor_list}
+ .computeEnergyUpdate();
+ }
- ));
+ ));
this->_addBuiltinFunction("heat2",
std::make_shared<BuiltinFunctionEmbedder<
diff --git a/src/scheme/VectorDiamondScheme.hpp b/src/scheme/VectorDiamondScheme.hpp
index 9b56d86db..261a9b567 100644
--- a/src/scheme/VectorDiamondScheme.hpp
+++ b/src/scheme/VectorDiamondScheme.hpp
@@ -72,6 +72,7 @@ class EnergyComputerHandler
EnergyComputerHandler(const std::shared_ptr<const IDiscreteFunction>& lambdab,
const std::shared_ptr<const IDiscreteFunction>& mub,
const std::shared_ptr<const IDiscreteFunction>& U,
+ const std::shared_ptr<const IDiscreteFunction>& dual_U,
const std::shared_ptr<const IDiscreteFunction>& source,
const std::vector<std::shared_ptr<const IBoundaryConditionDescriptor>>& bc_descriptor_list);
--
GitLab