Merge pull request #201 from bigladder/update-btwxt

Update Btwxt version with new version of Courier
bigladder · Feb 20, 2024 · 4609465 · 4609465
2 parents 4d4977d + 16fe0cf
commit 4609465
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git 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
diff --git a/Testing/Temporary/LastTest.log b/Testing/Temporary/LastTest.log
diff --git 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
@@ -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<Btwxt::GridAxis> gx {g0, g1, g2};
 

diff --git a/vendor/btwxt b/vendor/btwxt
+1 −1		.github/workflows/build-and-test.yml
+3 −3		.gitmodules
+1 −1		include/btwxt/CMakeLists.txt
+1 −1		include/btwxt/btwxt.h
+15 −14		include/btwxt/grid-axis.h
+1 −1		include/btwxt/grid-point-data.h
+0 −39		include/btwxt/logging.h
+27 −0		include/btwxt/messaging.h
+18 −12		include/btwxt/regular-grid-interpolator.h
+1 −1		src/CMakeLists.txt
+18 −24		src/grid-axis.cpp
+83 −65		src/regular-grid-interpolator-implementation.cpp
+38 −18		src/regular-grid-interpolator-implementation.h
+40 −24		src/regular-grid-interpolator.cpp
+115 −87		test/btwxt-tests.cpp
+14 −11		test/fixtures/implementation-fixtures.h
+23 −6		test/fixtures/public-fixtures.h
+16 −17		test/grid-axis-tests.cpp
+17 −15		test/implementation-tests.cpp
+3 −3		vendor/CMakeLists.txt
+1 −0		vendor/courier
+0 −1		vendor/courierr