Merge branch 'master' into heat-exchange-models

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"
 )

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,13 +10,15 @@ 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
+  HPWHversion.cc
   HPWH.cc
   HPWHHeatSources.cc
   HPWHHeatingLogics.cc

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)
 {
@@ -271,14 +268,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,

src/HPWH.in.hh → 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:

src/HPWHpresets.cc

@@ -515,9 +515,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);

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();
+}

src/HPWHversion.in.hh

@@ -0,0 +1,13 @@
+/*
+* Version control
+*/
+
+#ifndef HPWHversion_hh
+#define HPWHversion_hh
+
+#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

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)