diff --git a/ProcessLib/HeatTransportBHE/BHE/BHECommon.h b/ProcessLib/HeatTransportBHE/BHE/BHECommon.h index a19f997d6b038d617962f34639b17c272b5286f4..a8f2be2d39b2f0a52756fc5baa541484f61bc63c 100644 --- a/ProcessLib/HeatTransportBHE/BHE/BHECommon.h +++ b/ProcessLib/HeatTransportBHE/BHE/BHECommon.h @@ -42,7 +42,7 @@ struct BHECommon RefrigerantProperties const refrigerant; GroutParameters const grout; FlowAndTemperatureControl const flowAndTemperatureControl; - bool const usePythonBC; + bool const use_python_bcs; }; } // end of namespace BHE } // end of namespace HeatTransportBHE diff --git a/ProcessLib/HeatTransportBHE/BHE/BHECommonCoaxial.h b/ProcessLib/HeatTransportBHE/BHE/BHECommonCoaxial.h index 4b03f1fae594348a478a1dbe838a93f940967d36..6b42e434001103120188432dd7a7411b5932c1f9 100644 --- a/ProcessLib/HeatTransportBHE/BHE/BHECommonCoaxial.h +++ b/ProcessLib/HeatTransportBHE/BHE/BHECommonCoaxial.h @@ -28,9 +28,9 @@ public: GroutParameters const& grout, FlowAndTemperatureControl const& flowAndTemperatureControl, PipeConfigurationCoaxial const& pipes, - bool const usePythonBC) + bool const use_python_bcs) : BHECommon{borehole, refrigerant, grout, flowAndTemperatureControl, - usePythonBC}, + use_python_bcs}, _pipes(pipes) { cross_section_area_inner_pipe = _pipes.inner_pipe.area(); diff --git a/ProcessLib/HeatTransportBHE/BHE/BHECommonUType.h b/ProcessLib/HeatTransportBHE/BHE/BHECommonUType.h index 1f9717578fc60af591ab4c257176cccad6653264..4a62f2213a4647a80c8f9aae4ea45362a9ffd783 100644 --- a/ProcessLib/HeatTransportBHE/BHE/BHECommonUType.h +++ b/ProcessLib/HeatTransportBHE/BHE/BHECommonUType.h @@ -28,9 +28,9 @@ public: GroutParameters const& grout, FlowAndTemperatureControl const& flowAndTemperatureControl, PipeConfigurationUType const& pipes, - bool const usePythonBC) + bool const use_python_bcs) : BHECommon{borehole, refrigerant, grout, flowAndTemperatureControl, - usePythonBC}, + use_python_bcs}, _pipes(pipes) { } diff --git a/ProcessLib/HeatTransportBHE/BHE/BHE_1U.h b/ProcessLib/HeatTransportBHE/BHE/BHE_1U.h index 498e55ec3e400f126381ecdb4882ab869a9018a4..1c310007b2059818867ddf7e48f82d666b90b8d0 100644 --- a/ProcessLib/HeatTransportBHE/BHE/BHE_1U.h +++ b/ProcessLib/HeatTransportBHE/BHE/BHE_1U.h @@ -46,10 +46,10 @@ public: GroutParameters const& grout, FlowAndTemperatureControl const& flowAndTemperatureControl, PipeConfigurationUType const& pipes, - bool const usePythonBC) + bool const use_python_bcs) : BHECommonUType{borehole, refrigerant, grout, flowAndTemperatureControl, - pipes, usePythonBC} + pipes, use_python_bcs} { _thermal_resistances.fill(std::numeric_limits<double>::quiet_NaN()); diff --git a/ProcessLib/HeatTransportBHE/BHE/BHE_2U.h b/ProcessLib/HeatTransportBHE/BHE/BHE_2U.h index 151b21c9b59a6b100d8cc702d7284786f607d750..0eca5582707761334014dabd5a79ef9aafd59924 100644 --- a/ProcessLib/HeatTransportBHE/BHE/BHE_2U.h +++ b/ProcessLib/HeatTransportBHE/BHE/BHE_2U.h @@ -46,10 +46,10 @@ public: GroutParameters const& grout, FlowAndTemperatureControl const& flowAndTemperatureControl, PipeConfigurationUType const& pipes, - bool const usePythonBC) + bool const use_python_bcs) : BHECommonUType{borehole, refrigerant, grout, flowAndTemperatureControl, - pipes, usePythonBC} + pipes, use_python_bcs} { _thermal_resistances.fill(std::numeric_limits<double>::quiet_NaN()); diff --git a/ProcessLib/HeatTransportBHE/BHE/BHE_CXA.h b/ProcessLib/HeatTransportBHE/BHE/BHE_CXA.h index 98b40cd65b05db156a709f789cc9ddf27431ce23..7b818351bfc5eb737757c586f1a52a0b5969728f 100644 --- a/ProcessLib/HeatTransportBHE/BHE/BHE_CXA.h +++ b/ProcessLib/HeatTransportBHE/BHE/BHE_CXA.h @@ -43,10 +43,10 @@ public: GroutParameters const& grout, FlowAndTemperatureControl const& flowAndTemperatureControl, PipeConfigurationCoaxial const& pipes, - bool const usePythonBC) + bool const use_python_bcs) : BHECommonCoaxial{borehole, refrigerant, grout, flowAndTemperatureControl, - pipes, usePythonBC} + pipes, use_python_bcs} { // Initialize thermal resistances. auto values = visit( diff --git a/ProcessLib/HeatTransportBHE/BHE/BHE_CXC.h b/ProcessLib/HeatTransportBHE/BHE/BHE_CXC.h index 78e42566275cb90592880f69903f79a071369504..3ddbb6c526e9f66182372127313e781f7b92275d 100644 --- a/ProcessLib/HeatTransportBHE/BHE/BHE_CXC.h +++ b/ProcessLib/HeatTransportBHE/BHE/BHE_CXC.h @@ -43,10 +43,10 @@ public: GroutParameters const& grout, FlowAndTemperatureControl const& flowAndTemperatureControl, PipeConfigurationCoaxial const& pipes, - bool const usePythonBC) + bool const use_python_bcs) : BHECommonCoaxial{borehole, refrigerant, grout, flowAndTemperatureControl, - pipes, usePythonBC} + pipes, use_python_bcs} { // Initialize thermal resistances. auto values = visit( diff --git a/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp b/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp index 9deeded9983794783538a85b9341624bf3efdbeb..d5baf91fdb60942c4190ee36beb86c54b186e139 100644 --- a/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp +++ b/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp @@ -95,9 +95,6 @@ std::unique_ptr<Process> createHeatTransportBHEProcess( // reading BHE parameters -------------------------------------------------- std::vector<BHE::BHETypes> bhes; - // bhe array network parameter. - bool has_network_python_bc = false; - auto const& bhe_configs = //! \ogs_file_param{prj__processes__process__HEAT_TRANSPORT_BHE__borehole_heat_exchangers} config.getConfigSubtree("borehole_heat_exchangers"); @@ -147,17 +144,13 @@ std::unique_ptr<Process> createHeatTransportBHEProcess( MaterialPropertyLib::createMaterialSpatialDistributionMap(media, mesh); // find if bhe uses python boundary condition - auto const isUsingPythonBC = - visit([](auto const& bhe) { return bhe.usePythonBC; }, bhes[0]); - if (isUsingPythonBC) - { - has_network_python_bc = true; - } + auto const using_python_bcs = + visit([](auto const& bhe) { return bhe.use_python_bcs; }, bhes[0]); //! Python object computing BC values. BHEInflowPythonBoundaryConditionPythonSideInterface* py_object = nullptr; // create a pythonBoundaryCondition object - if (has_network_python_bc) + if (using_python_bcs) { #ifdef OGS_USE_PYTHON // Evaluate Python code in scope of main module diff --git a/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp b/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp index f4fae872bb906f2e0704c8143ad042774024ac01..2c327c794a5d60014b4fa635b6b70968b7b3f0b3 100644 --- a/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp +++ b/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp @@ -307,7 +307,7 @@ void HeatTransportBHEProcess::createBHEBoundaryConditionTopBottom( for (auto const& in_out_component_id : bhe.inflow_outflow_bc_component_ids) { - if (bhe.usePythonBC) + if (bhe.use_python_bcs) // call BHEPythonBoundarycondition { #ifdef OGS_USE_PYTHON