diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index ceb27bb4..782579ed 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -61,7 +61,7 @@ jobs: continue-on-error: ${{ matrix.experimental }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set Project Name diff --git a/Testing/Temporary/CTestCostData.txt b/Testing/Temporary/CTestCostData.txt deleted file mode 100644 index ed97d539..00000000 --- a/Testing/Temporary/CTestCostData.txt +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/Testing/Temporary/LastTest.log b/Testing/Temporary/LastTest.log deleted file mode 100644 index 223992e1..00000000 --- a/Testing/Temporary/LastTest.log +++ /dev/null @@ -1,3 +0,0 @@ -Start testing: Aug 20 10:13 Pacific Daylight Time ----------------------------------------------------------- -End testing: Aug 20 10:13 Pacific Daylight Time diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a988f7ff..813e0481 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -39,7 +39,7 @@ else () add_library(libHPWHsim SHARED ${library_sources}) endif () -target_include_directories(libHPWHsim PUBLIC ${PROJECT_BINARY_DIR}/src ${PROJECT_SOURCE_DIR}/src) +target_include_directories(libHPWHsim PUBLIC ${PROJECT_SOURCE_DIR}/src ${PROJECT_BINARY_DIR}/src) target_link_libraries(libHPWHsim PRIVATE ${PROJECT_NAME}_common_interface PUBLIC btwxt) target_compile_features(libHPWHsim PRIVATE cxx_std_17) diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index 167977f0..d1362a88 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -2200,17 +2200,20 @@ int HPWH::HPWHinit_presets(MODELS presetNum) // Set up regular grid interpolator. Btwxt::GridAxis g0(compressor.perfGrid[0], - "TAir", Btwxt::InterpolationMethod::linear, - Btwxt::ExtrapolationMethod::constant); + Btwxt::ExtrapolationMethod::constant, + {-DBL_MAX, DBL_MAX}, + "TAir"); Btwxt::GridAxis g1(compressor.perfGrid[1], - "TOut", Btwxt::InterpolationMethod::linear, - Btwxt::ExtrapolationMethod::constant); + Btwxt::ExtrapolationMethod::constant, + {-DBL_MAX, DBL_MAX}, + "TOut"); Btwxt::GridAxis g2(compressor.perfGrid[2], - "TIn", Btwxt::InterpolationMethod::linear, - Btwxt::ExtrapolationMethod::linear); + Btwxt::ExtrapolationMethod::linear, + {-DBL_MAX, DBL_MAX}, + "Tin"); std::vector gx {g0, g1, g2}; diff --git a/vendor/btwxt b/vendor/btwxt index 2a5926e9..1a8c0df1 160000 --- a/vendor/btwxt +++ b/vendor/btwxt @@ -1 +1 @@ -Subproject commit 2a5926e96b594bafbcaa7640a9cabd40b5ae043d +Subproject commit 1a8c0df1db24a3e4d206ef4ac8568f8c5781c782