From e1433749cf76970fd579f6729704ea15df409b7f Mon Sep 17 00:00:00 2001
From: Shuang Chen <gechenshuang88@gmail.com>
Date: Wed, 11 Dec 2019 11:23:33 +0100
Subject: [PATCH] Implement review suggestions
- add /file in the top decription
- iostream dropped for not needed
- modified the phrase in the cmake list
- delete the else branch for no need
---
.../Python/BHEInflowPythonBoundaryCondition.h | 1 +
.../BHEInflowPythonBoundaryConditionPythonSideInterface.h | 1 +
.../HeatTransportBHE/BHE/FlowAndTemperatureControl.h | 6 +-----
ProcessLib/HeatTransportBHE/CMakeLists.txt | 7 +++----
.../HeatTransportBHE/CreateHeatTransportBHEProcess.cpp | 2 +-
5 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/ProcessLib/BoundaryCondition/Python/BHEInflowPythonBoundaryCondition.h b/ProcessLib/BoundaryCondition/Python/BHEInflowPythonBoundaryCondition.h
index ef3840bf86c..4430aac2148 100644
--- a/ProcessLib/BoundaryCondition/Python/BHEInflowPythonBoundaryCondition.h
+++ b/ProcessLib/BoundaryCondition/Python/BHEInflowPythonBoundaryCondition.h
@@ -1,4 +1,5 @@
/**
+ * \file
* \copyright
* Copyright (c) 2012-2019, OpenGeoSys Community (http://www.opengeosys.org)
* Distributed under a Modified BSD License.
diff --git a/ProcessLib/BoundaryCondition/Python/BHEInflowPythonBoundaryConditionPythonSideInterface.h b/ProcessLib/BoundaryCondition/Python/BHEInflowPythonBoundaryConditionPythonSideInterface.h
index a45a7532af1..dab8626ad34 100644
--- a/ProcessLib/BoundaryCondition/Python/BHEInflowPythonBoundaryConditionPythonSideInterface.h
+++ b/ProcessLib/BoundaryCondition/Python/BHEInflowPythonBoundaryConditionPythonSideInterface.h
@@ -1,4 +1,5 @@
/**
+ * \file
* \copyright
* Copyright (c) 2012-2019, OpenGeoSys Community (http://www.opengeosys.org)
* Distributed under a Modified BSD License.
diff --git a/ProcessLib/HeatTransportBHE/BHE/FlowAndTemperatureControl.h b/ProcessLib/HeatTransportBHE/BHE/FlowAndTemperatureControl.h
index 314e68142a6..e7d50bdb785 100644
--- a/ProcessLib/HeatTransportBHE/BHE/FlowAndTemperatureControl.h
+++ b/ProcessLib/HeatTransportBHE/BHE/FlowAndTemperatureControl.h
@@ -72,11 +72,7 @@ struct PowerCurveConstantFlow
{
return {0.0, T_out};
}
- else
- {
- return {flow_rate,
- power / flow_rate / heat_capacity / density + T_out};
- }
+ return {flow_rate, power / flow_rate / heat_capacity / density + T_out};
}
MathLib::PiecewiseLinearInterpolation const& power_curve;
diff --git a/ProcessLib/HeatTransportBHE/CMakeLists.txt b/ProcessLib/HeatTransportBHE/CMakeLists.txt
index 8e8fd364eb6..5cfb04c4de6 100644
--- a/ProcessLib/HeatTransportBHE/CMakeLists.txt
+++ b/ProcessLib/HeatTransportBHE/CMakeLists.txt
@@ -5,10 +5,9 @@ append_source_files(SOURCES LocalAssemblers)
add_library(HeatTransportBHE ${SOURCES})
-if(OGS_USE_PYTHON)
- target_link_libraries(HeatTransportBHE PUBLIC ProcessLib PRIVATE pybind11::pybind11)
-else()
- target_link_libraries(HeatTransportBHE PUBLIC ProcessLib)
+target_link_libraries(HeatTransportBHE PUBLIC ProcessLib)
+if (OGS_USE_PYTHON)
+ target_link_libraries(HeatTransportBHE PRIVATE pybind11::pybind11)
endif()
if(BUILD_SHARED_LIBS)
diff --git a/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp b/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp
index 3900c35a2ec..9c363d00c0d 100644
--- a/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp
+++ b/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp
@@ -23,7 +23,7 @@
#ifdef OGS_USE_PYTHON
#include <pybind11/pybind11.h>
#endif // OGS_USE_PYTHON
-#include <iostream>
+
namespace ProcessLib
{
namespace HeatTransportBHE
--
GitLab