From 701ca9848e3ee2f0d3b56222980d35e6892d4f1e Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Fri, 10 Nov 2023 08:34:30 -0700 Subject: [PATCH 1/4] Reduce storage-tank preset setpoint in separate branch. --- src/HPWHpresets.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index fa77c748..c9285d50 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -513,9 +513,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { else if (presetNum == MODELS_StorageTank) { setNumNodes(12); - setpoint_C = 52; - - setpoint_C = 800; + setpoint_C = F_TO_C(127.0); tankSizeFixed = false; tankVolume_L = GAL_TO_L(80); From 3c82620f25dd30fb06b96037ce2ca2853d82d9f0 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Fri, 17 Nov 2023 10:07:37 -0700 Subject: [PATCH 2/4] Separate version into in.hh --- cmake/git-version.cmake | 4 ++-- src/CMakeLists.txt | 7 ++++--- src/{HPWH.in.hh => HPWH.hh} | 5 +---- src/HPWHversion.in.hh | 21 +++++++++++++++++++++ test/CMakeLists.txt | 2 +- 5 files changed, 29 insertions(+), 10 deletions(-) rename src/{HPWH.in.hh => HPWH.hh} (99%) create mode 100644 src/HPWHversion.in.hh diff --git a/cmake/git-version.cmake b/cmake/git-version.cmake index f79f5fc3..1ca57b96 100644 --- a/cmake/git-version.cmake +++ b/cmake/git-version.cmake @@ -67,6 +67,6 @@ endif() message("Building ${PROJECT_NAME} ${${PROJECT_NAME}_VRSN_MAJOR}.${${PROJECT_NAME}_VRSN_MINOR}.${${PROJECT_NAME}_VRSN_PATCH}${${PROJECT_NAME}_VRSN_META}") configure_file( - "${PROJECT_SOURCE_DIR}/src/HPWH.in.hh" - "${PROJECT_BINARY_DIR}/src/HPWH.hh" + "${PROJECT_SOURCE_DIR}/src/HPWHversion.in.hh" + "${PROJECT_BINARY_DIR}/src/HPWHversion.hh" ) \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3ad5a629..b1de19e1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,6 @@ # Set HPWHsim Version add_custom_target(${PROJECT_NAME}_version_header - DEPENDS ${PROJECT_SOURCE_DIR}/src/HPWH.in.hh + DEPENDS ${PROJECT_SOURCE_DIR}/src/HPWHversion.in.hh COMMAND ${CMAKE_COMMAND} ARGS -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DPROJECT_BINARY_DIR=${PROJECT_BINARY_DIR} @@ -10,10 +10,11 @@ add_custom_target(${PROJECT_NAME}_version_header ) set_target_properties(${PROJECT_NAME}_version_header PROPERTIES FOLDER Dependencies/HPWHsim) -include_directories("${PROJECT_BINARY_DIR}/src") +include_directories("${PROJECT_BINARY_DIR}/src" "${PROJECT_SOURCE_DIR}/src") set(headers - HPWH.in.hh + HPWHversion.in.hh + HPWH.hh ) set(source diff --git a/src/HPWH.in.hh b/src/HPWH.hh similarity index 99% rename from src/HPWH.in.hh rename to src/HPWH.hh index a13723c7..69898a8b 100644 --- a/src/HPWH.in.hh +++ b/src/HPWH.hh @@ -20,10 +20,7 @@ namespace Btwxt { class RegularGridInterpolator; }; * excluded from compiling. This is done in order to reduce the size of the * final compiled code. */ -#define HPWHVRSN_MAJOR @HPWHsim_VRSN_MAJOR@ -#define HPWHVRSN_MINOR @HPWHsim_VRSN_MINOR@ -#define HPWHVRSN_PATCH @HPWHsim_VRSN_PATCH@ -#define HPWHVRSN_META "@HPWHsim_VRSN_META@" +#include "HPWHversion.hh" class HPWH { public: diff --git a/src/HPWHversion.in.hh b/src/HPWHversion.in.hh new file mode 100644 index 00000000..ab5bcbb4 --- /dev/null +++ b/src/HPWHversion.in.hh @@ -0,0 +1,21 @@ +#ifndef HPWHversion_hh +#define HPWHversion_hh + +#include +#include +#include +#include +#include +#include +#include + +#include +#include //for exit +#include + +#define HPWHVRSN_MAJOR @HPWHsim_VRSN_MAJOR@ +#define HPWHVRSN_MINOR @HPWHsim_VRSN_MINOR@ +#define HPWHVRSN_PATCH @HPWHsim_VRSN_PATCH@ +#define HPWHVRSN_META "@HPWHsim_VRSN_META@" + +#endif diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 523b56cf..08be0445 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,5 +1,5 @@ # Build test tool -include_directories("${PROJECT_BINARY_DIR}/src") +include_directories("${PROJECT_SOURCE_DIR}/src" "${PROJECT_BINARY_DIR}/src") add_executable(testTool main.cc ) add_executable(testTankSizeFixed testTankSizeFixed.cc) From bf190b6d2243e1f3af3332f290f63ae8be4119a3 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Mon, 20 Nov 2023 09:08:15 -0700 Subject: [PATCH 3/4] Separate version control. --- src/CMakeLists.txt | 1 + src/HPWH.cc | 11 ----------- src/HPWHversion.cc | 17 +++++++++++++++++ 3 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 src/HPWHversion.cc diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b1de19e1..115a45f2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,6 +18,7 @@ set(headers ) set(source + HPWHversion.cc HPWH.cc HPWHHeatSources.cc HPWHHeatingLogics.cc diff --git a/src/HPWH.cc b/src/HPWH.cc index 3a709c34..6e2ead4e 100644 --- a/src/HPWH.cc +++ b/src/HPWH.cc @@ -167,9 +167,6 @@ void HPWH::setMinutesPerStep(const double minutesPerStep_in) hoursPerStep = minutesPerStep / 60.0; }; -//ugh, this should be in the header -const std::string HPWH::version_maint = HPWHVRSN_META; - // public HPWH functions HPWH::HPWH(): messageCallback(NULL),messageCallbackContextPtr(NULL),hpwhVerbosity(VRB_silent) { @@ -269,14 +266,6 @@ HPWH & HPWH::operator=(const HPWH &hpwh) { HPWH::~HPWH() { } -string HPWH::getVersion() { - std::stringstream version; - - version << version_major << '.' << version_minor << '.' << version_patch << version_maint; - - return version.str(); -} - int HPWH::runOneStep(double drawVolume_L, double tankAmbientT_C,double heatSourceAmbientT_C, DRMODES DRstatus, diff --git a/src/HPWHversion.cc b/src/HPWHversion.cc new file mode 100644 index 00000000..7bba6197 --- /dev/null +++ b/src/HPWHversion.cc @@ -0,0 +1,17 @@ +/* +* Version control +*/ + +#include "HPWHVersion.hh" +#include "HPWH.hh" + +//ugh, this should be in the header +const std::string HPWH::version_maint = HPWHVRSN_META; + +std::string HPWH::getVersion() { + std::stringstream version; + + version << version_major << '.' << version_minor << '.' << version_patch << version_maint; + + return version.str(); +} From e2d103d223db7ed6daed28c0c37729f88ca6ec7c Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Mon, 20 Nov 2023 09:53:13 -0700 Subject: [PATCH 4/4] Remove unused includes. --- src/HPWHversion.in.hh | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/HPWHversion.in.hh b/src/HPWHversion.in.hh index ab5bcbb4..7adffdc4 100644 --- a/src/HPWHversion.in.hh +++ b/src/HPWHversion.in.hh @@ -1,18 +1,10 @@ +/* +* Version control +*/ + #ifndef HPWHversion_hh #define HPWHversion_hh -#include -#include -#include -#include -#include -#include -#include - -#include -#include //for exit -#include - #define HPWHVRSN_MAJOR @HPWHsim_VRSN_MAJOR@ #define HPWHVRSN_MINOR @HPWHsim_VRSN_MINOR@ #define HPWHVRSN_PATCH @HPWHsim_VRSN_PATCH@