From a7b0a5d28a4ec536c895ea44f4cae2ca8eac654b Mon Sep 17 00:00:00 2001 From: ChaofanChen <chaofan.chen@ufz.de> Date: Sat, 7 Mar 2020 00:14:20 +0100 Subject: [PATCH] [BHE/1P] Small changes on DBUG information, docu and necessary includes. --- ProcessLib/HeatTransportBHE/BHE/BHECommonCoaxial.h | 1 + ProcessLib/HeatTransportBHE/BHE/BHE_1P.h | 1 + ProcessLib/HeatTransportBHE/BHE/BHE_1U.h | 1 + ProcessLib/HeatTransportBHE/BHE/BHE_2U.h | 1 + ProcessLib/HeatTransportBHE/BHE/CreateBHE1PType.cpp | 8 ++++++-- ProcessLib/HeatTransportBHE/Tests.cmake | 2 +- 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ProcessLib/HeatTransportBHE/BHE/BHECommonCoaxial.h b/ProcessLib/HeatTransportBHE/BHE/BHECommonCoaxial.h index efb715f7a9a..60db9261ea1 100644 --- a/ProcessLib/HeatTransportBHE/BHE/BHECommonCoaxial.h +++ b/ProcessLib/HeatTransportBHE/BHE/BHECommonCoaxial.h @@ -10,6 +10,7 @@ #pragma once #include <Eigen/Eigen> +#include <optional> #include "BHECommon.h" #include "FlowAndTemperatureControl.h" #include "PipeConfigurationCoaxial.h" diff --git a/ProcessLib/HeatTransportBHE/BHE/BHE_1P.h b/ProcessLib/HeatTransportBHE/BHE/BHE_1P.h index b14896c1c47..1c23ae53c1e 100644 --- a/ProcessLib/HeatTransportBHE/BHE/BHE_1P.h +++ b/ProcessLib/HeatTransportBHE/BHE/BHE_1P.h @@ -11,6 +11,7 @@ #pragma once #include <Eigen/Eigen> +#include <optional> #include "BaseLib/Error.h" diff --git a/ProcessLib/HeatTransportBHE/BHE/BHE_1U.h b/ProcessLib/HeatTransportBHE/BHE/BHE_1U.h index a699fb256b6..076e8fbd8b5 100644 --- a/ProcessLib/HeatTransportBHE/BHE/BHE_1U.h +++ b/ProcessLib/HeatTransportBHE/BHE/BHE_1U.h @@ -11,6 +11,7 @@ #pragma once #include <Eigen/Eigen> +#include <optional> #include "BaseLib/Error.h" diff --git a/ProcessLib/HeatTransportBHE/BHE/BHE_2U.h b/ProcessLib/HeatTransportBHE/BHE/BHE_2U.h index 0b0b22756a6..d703b3b7957 100644 --- a/ProcessLib/HeatTransportBHE/BHE/BHE_2U.h +++ b/ProcessLib/HeatTransportBHE/BHE/BHE_2U.h @@ -12,6 +12,7 @@ #include <Eigen/Eigen> +#include <optional> #include "BaseLib/Error.h" #include "BHECommon.h" diff --git a/ProcessLib/HeatTransportBHE/BHE/CreateBHE1PType.cpp b/ProcessLib/HeatTransportBHE/BHE/CreateBHE1PType.cpp index bcab2a31dac..2331f513e02 100644 --- a/ProcessLib/HeatTransportBHE/BHE/CreateBHE1PType.cpp +++ b/ProcessLib/HeatTransportBHE/BHE/CreateBHE1PType.cpp @@ -34,9 +34,13 @@ parseBHE1PTypeConfig( { // if the BHE is using python boundary condition auto const bhe_if_use_python_bc_conf = + //! \ogs_file_param{prj__processes__process__HEAT_TRANSPORT_BHE__borehole_heat_exchangers__borehole_heat_exchanger__use_bhe_pipe_network} config.getConfigParameter<bool>("use_bhe_pipe_network", false); - DBUG("If using python boundary condition : %s", - (bhe_if_use_python_bc_conf) ? "true" : "false"); + + if (bhe_if_use_python_bc_conf) + { + DBUG("BHE 1P using python boundary conditions."); + } auto const borehole_geometry = //! \ogs_file_param{prj__processes__process__HEAT_TRANSPORT_BHE__borehole_heat_exchangers__borehole_heat_exchanger__borehole} diff --git a/ProcessLib/HeatTransportBHE/Tests.cmake b/ProcessLib/HeatTransportBHE/Tests.cmake index 58397d29bbb..05da3e9dcde 100644 --- a/ProcessLib/HeatTransportBHE/Tests.cmake +++ b/ProcessLib/HeatTransportBHE/Tests.cmake @@ -100,7 +100,7 @@ AddTest( ) AddTest( - NAME HeatTransportBHE_single_pipe_flow_EBHE + NAME HeatTransportBHE_single_pipe_flow_EUBHE PATH Parabolic/T/BHE_1P RUNTIME 60 EXECUTABLE ogs -- GitLab