From ec3d46a73fb5ad71a5338870426216dacfa91582 Mon Sep 17 00:00:00 2001 From: Neal Kruis Date: Tue, 6 Feb 2024 12:33:53 -0700 Subject: [PATCH 1/6] Update to btwxt version with updated messaging. --- vendor/btwxt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/btwxt b/vendor/btwxt index 2a5926e9..19396082 160000 --- a/vendor/btwxt +++ b/vendor/btwxt @@ -1 +1 @@ -Subproject commit 2a5926e96b594bafbcaa7640a9cabd40b5ae043d +Subproject commit 193960829dbbfab92988dfc3969ff4cbe875eecb From 9c668dc93d0565a7f369b195c1fd813bd743608e Mon Sep 17 00:00:00 2001 From: Neal Kruis Date: Tue, 6 Feb 2024 12:41:45 -0700 Subject: [PATCH 2/6] Update GitHub action. --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 32fae356c2dea3418eadf762e639e78263d86608 Mon Sep 17 00:00:00 2001 From: Neal Kruis Date: Wed, 7 Feb 2024 13:32:38 -0700 Subject: [PATCH 3/6] Fix include directory search order. --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 7c802ddf85b5b04e88bccd313d94ce3c62bb50f5 Mon Sep 17 00:00:00 2001 From: Neal Kruis Date: Thu, 8 Feb 2024 14:58:49 -0700 Subject: [PATCH 4/6] Remove accidental Test directory. --- Testing/Temporary/CTestCostData.txt | 1 - Testing/Temporary/LastTest.log | 3 --- 2 files changed, 4 deletions(-) delete mode 100644 Testing/Temporary/CTestCostData.txt delete mode 100644 Testing/Temporary/LastTest.log 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 From 471330d9da549f9e7297c1b833cd0effeb2505c5 Mon Sep 17 00:00:00 2001 From: Neal Kruis Date: Thu, 15 Feb 2024 14:35:17 -0700 Subject: [PATCH 5/6] Change GridAxis argument order. --- src/HPWHpresets.cc | 15 +++++++++------ vendor/btwxt | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index 0749e845..612f81d1 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 19396082..b726d64a 160000 --- a/vendor/btwxt +++ b/vendor/btwxt @@ -1 +1 @@ -Subproject commit 193960829dbbfab92988dfc3969ff4cbe875eecb +Subproject commit b726d64a1885edd92c2f7a6e1e32cf82920d9317 From 0627f660f968476b6431d7cbe1e0a54042137ed8 Mon Sep 17 00:00:00 2001 From: Neal Kruis Date: Tue, 20 Feb 2024 13:08:58 -0700 Subject: [PATCH 6/6] Update to latest Btwxt. --- vendor/btwxt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/btwxt b/vendor/btwxt index b726d64a..1a8c0df1 160000 --- a/vendor/btwxt +++ b/vendor/btwxt @@ -1 +1 @@ -Subproject commit b726d64a1885edd92c2f7a6e1e32cf82920d9317 +Subproject commit 1a8c0df1db24a3e4d206ef4ac8568f8c5781c782