From 0c30b8fb31245b008ecf7659a135a69681ec047f Mon Sep 17 00:00:00 2001 From: Matt Williamson Date: Thu, 17 Mar 2022 17:16:37 +0000 Subject: [PATCH 1/3] Added and upped GoogleTest to 1.11.0 --- models/tshirt/include/Tshirt.h | 1 + models/tshirt/include/tshirt_params.h | 4 +++- test/googletest | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/models/tshirt/include/Tshirt.h b/models/tshirt/include/Tshirt.h index c92aefd4e7..d9bb9fabf1 100644 --- a/models/tshirt/include/Tshirt.h +++ b/models/tshirt/include/Tshirt.h @@ -17,6 +17,7 @@ #include #include #include +#include namespace tshirt { diff --git a/models/tshirt/include/tshirt_params.h b/models/tshirt/include/tshirt_params.h index 45dff294a8..ce590f6e14 100644 --- a/models/tshirt/include/tshirt_params.h +++ b/models/tshirt/include/tshirt_params.h @@ -1,6 +1,8 @@ #ifndef NGEN_TSHIRT_PARAMS_H #define NGEN_TSHIRT_PARAMS_H +#include + namespace tshirt { /** @@ -78,7 +80,7 @@ namespace tshirt { max_groundwater_storage_meters(max_gw_storage) { this->max_soil_storage_meters = this->depth * maxsmc; this->Cschaake = refkdt * satdk / (2.0e-6); - this->max_lateral_flow = numeric_limits::max();//satdk * multiplier * this->max_soil_storage_meters; + this->max_lateral_flow = std::numeric_limits::max();//satdk * multiplier * this->max_soil_storage_meters; } }; diff --git a/test/googletest b/test/googletest index 703bd9caab..e2239ee604 160000 --- a/test/googletest +++ b/test/googletest @@ -1 +1 @@ -Subproject commit 703bd9caab50b139428cea1aaff9974ebee5742e +Subproject commit e2239ee6043f73722e7aa812a459f54a28552929 From e16881fea7f1c94c26e506d80e7a78324af7a247 Mon Sep 17 00:00:00 2001 From: Matt Williamson Date: Thu, 17 Mar 2022 21:12:53 +0000 Subject: [PATCH 2/3] Need explicity --- extern/test_bmi_cpp/src/test_bmi_cpp.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/extern/test_bmi_cpp/src/test_bmi_cpp.cpp b/extern/test_bmi_cpp/src/test_bmi_cpp.cpp index 30dd44dd94..671a0ae7f5 100644 --- a/extern/test_bmi_cpp/src/test_bmi_cpp.cpp +++ b/extern/test_bmi_cpp/src/test_bmi_cpp.cpp @@ -9,6 +9,7 @@ #include #include #include +#include std::string TestBmiCpp::GetComponentName(){ return "Testing BMI C++ Model"; From d1115f4a9ea1d47bc4ffa45c0e65fe5528f2e313 Mon Sep 17 00:00:00 2001 From: Matt Williamson Date: Fri, 18 Mar 2022 15:10:40 +0000 Subject: [PATCH 3/3] Fix issue with new GTest and older gcc --- include/forcing/DeferredWrappedProvider.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/include/forcing/DeferredWrappedProvider.hpp b/include/forcing/DeferredWrappedProvider.hpp index 2af7628a59..5c9295d599 100644 --- a/include/forcing/DeferredWrappedProvider.hpp +++ b/include/forcing/DeferredWrappedProvider.hpp @@ -4,6 +4,7 @@ #include #include #include +#include #include "WrappedForcingProvider.hpp" using namespace std;