Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BHE; Move the function body in "CreateFlowAndTemperatureControl.h" to cpp file. #2275

Merged
merged 4 commits into from Dec 3, 2018

Conversation

Projects
None yet
3 participants
@ChaofanChen
Copy link
Member

ChaofanChen commented Nov 28, 2018

When adding cases of the CXA/CXC or 2U BHE, we also need to call the function named "createFlowAndTemperatureControl", and this will cause an error that multiple inclusion of the same definition in header file when compiling. Besides, we also need to enrich flow and temperature boundary conditions including the BHE coupled with heat pump.

@@ -11,6 +11,9 @@

#pragma once

#include "BaseLib/ConfigTree.h"
#include "BaseLib/Error.h"
#include "FlowAndTemperatureControl.h"
#include "RefrigerantProperties.h"

This comment has been minimized.

@endJunction

endJunction Nov 28, 2018

Member

The include directives go in the cpp file, and the header file should have only forward declarations where possible. To me at looks like all of the includes go into implementation file. memory and map includes are missing.

This comment has been minimized.

@ChaofanChen

ChaofanChen Nov 30, 2018

Author Member

Thanks for the comment, modified as suggested.

ChaofanChen added some commits Nov 28, 2018

BHE; Move the function body in "CreateFlowAndTemperatureControl.h" to…
… the cpp file.

In the case of the CXA/CXC or 2U BHE, we also need to call the function named "createFlowAndTemperatureControl", and this will cause an error of multiple definition when compiling. Besides, we also need to enrich flow and temperature boundary conditions including the BHE coupled with heat pump.

@ChaofanChen ChaofanChen force-pushed the ChaofanChen:dbhe_impl branch from cbf6bf5 to a4394d4 Nov 30, 2018

curves,
RefrigerantProperties const& refrigerant)
{
auto find_curve_or_error = [&](std::string const& name,

This comment has been minimized.

@TomFischer

TomFischer Nov 30, 2018

Member

You can use the very similar function getOrError() from BaseLib/Algorithm.h.

This comment has been minimized.

@ChaofanChen

ChaofanChen Nov 30, 2018

Author Member

Thanks for your comment. Using the existed function getOrError().

@TomFischer
Copy link
Member

TomFischer left a comment

When tests are green:

@TomFischer TomFischer merged commit 8dca64b into ufz:master Dec 3, 2018

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
deploy/netlify Deploy preview ready!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.