Merge branch 'c17_std_byte' into ortools

NREL · May 6, 2024 · 1f807e7 · 1f807e7
2 parents 210512c + 10110a0
commit 1f807e7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -107,9 +107,9 @@ jobs:
     - name: download OR-Tools
       run: |
           cd $GITHUB_WORKSPACE
-          curl -LJO https://github.com/google/or-tools/releases/download/v9.7/or-tools_x86_64_macOS-13.5_cpp_v9.7.2996.tar.gz
-          tar -xvf or-tools_x86_64_macOS-13.5_cpp_v9.7.2996.tar.gz
-          ORTOOLSDIR=$GITHUB_WORKSPACE/or-tools_x86_64_macOS-13.5_cpp_v9.7.2996
+          curl -LJO https://github.com/google/or-tools/releases/download/v9.9/or-tools_arm64_macOS-14.3.1_cpp_v9.9.3963.tar.gz
+          tar -xvf or-tools_arm64_macOS-14.3.1_cpp_v9.9.3963.tar.gz
+          ORTOOLSDIR=$GITHUB_WORKSPACE/or-tools_arm64_macOS-14.3.1_cpp_v9.9.3963
           echo "ORTOOLSDIR=$ORTOOLSDIR" >> $GITHUB_ENV
 
     - name: Clone Gtest

diff --git a/test/shared_test/lib_battery_test.cpp b/test/shared_test/lib_battery_test.cpp
@@ -360,8 +360,8 @@ TEST_F(lib_battery_test, runTestCycleAt3C){
     }
 //    std::cerr <<  idx << ": soc " << batteryModel->SOC() << ", cap " << capacity_passed << "\n";
     // the SOC isn't at 5 so it means the controller is not able to calculate a current/voltage at which to discharge to 5
-    s.capacity = { 47.09, 920.30, 883.49, 9.08, 0, 5.33, 6.36, 2};
-    s.batt_voltage = 467.09;
+    s.capacity = { 47.106, 920.30, 883.49, 9.08, 0, 5.33, 6.36, 2};
+    s.batt_voltage = 467.105;
     s.lifetime.q_relative = 93.08;
     s.lifetime.day_age_of_battery = 2591.17;
     s.lifetime.cycle->q_relative_cycle = 92.08;

diff --git a/test/ssc_test/cmod_battwatts_test.cpp b/test/ssc_test/cmod_battwatts_test.cpp
@@ -180,5 +180,5 @@ TEST_F(CMBattwatts_cmod_battwatts, NoPV) {
 
     auto cycles = data.as_vector_ssc_number_t("batt_cycles");
     ssc_number_t maxCycles = *std::max_element(cycles.begin(), cycles.end());
-    EXPECT_NEAR(maxCycles, 522, 0.1);
+    EXPECT_NEAR(maxCycles, 522, 3);
 }