From 3e92d843cfd8bd54b03ad5f760a36cdba0a92d1b Mon Sep 17 00:00:00 2001
From: Taylor Brown <60201147+taylorbrown75@users.noreply.github.com>
Date: Tue, 28 Nov 2023 16:22:03 -0700
Subject: [PATCH] Add additional input parameters needed to run tests.

---
 test/shared_test/lib_csp_trough_test.cpp | 19 +++++++++++++++++++
 test/shared_test/lib_csp_trough_test.h   |  8 ++++++++
 2 files changed, 27 insertions(+)

diff --git a/test/shared_test/lib_csp_trough_test.cpp b/test/shared_test/lib_csp_trough_test.cpp
index c7f5af275..f59194bff 100644
--- a/test/shared_test/lib_csp_trough_test.cpp
+++ b/test/shared_test/lib_csp_trough_test.cpp
@@ -261,6 +261,14 @@ std::unique_ptr<Trough> TroughFactory::MakeTrough(TroughSpecifications* trough_s
     trough->m_sf_hdr_wallthicks = trough_specifications->sf_hdr_wallthicks;
     trough->m_sf_hdr_lengths = trough_specifications->sf_hdr_lengths;
 
+    // TMB 11-28-2023 Added parameters for updated Trough
+    trough->m_trough_loop_control = trough_specifications->trough_loop_control;
+    trough->m_use_solar_mult_or_aperture_area = trough_specifications->use_solar_mult_or_aperture_area;
+    trough->m_specified_solar_mult = trough_specifications->specified_solar_mult;
+    trough->m_P_ref = trough_specifications->P_ref;
+    trough->m_eta_ref = trough_specifications->eta_ref;
+    trough->m_non_solar_field_land_area_multiplier = trough_specifications->non_solar_field_land_area_multiplier;
+
     TroughSolvedParams trough_solved_params;
     trough->init(location, trough_solved_params);
 
@@ -665,6 +673,17 @@ std::unique_ptr<TroughSpecifications> DefaultTroughFactory::MakeSpecifications()
     double vals49[] = { -1 };
     trough_specifications->sf_hdr_lengths.assign(vals49, 1, 1);
 
+    // TMB 11-28-2023 Added parameters for updated Trough
+    std::vector<double> trough_loop_vals = { 8, 1, 1, 8, 1, 1, 7, 1, 1, 6, 1, 1, 5, 1, 1, 4, 1, 1, 3, 1, 1, 2, 1, 1, 1 };
+    trough_specifications->trough_loop_control.assign(trough_loop_vals.data(), trough_loop_vals.size(), 1);
+
+    trough_specifications->use_solar_mult_or_aperture_area = 0;
+    trough_specifications->specified_solar_mult = 2;
+    trough_specifications->P_ref = 111e6;
+    trough_specifications->eta_ref = 0.356;
+    trough_specifications->non_solar_field_land_area_multiplier = 1.4;
+
+
     return trough_specifications;
 }
 
diff --git a/test/shared_test/lib_csp_trough_test.h b/test/shared_test/lib_csp_trough_test.h
index dfe2819ad..1e0352481 100644
--- a/test/shared_test/lib_csp_trough_test.h
+++ b/test/shared_test/lib_csp_trough_test.h
@@ -208,6 +208,14 @@ namespace csp_trough
         util::matrix_t<double> sf_hdr_diams;                      //[m] Imported header diameters, used if custom_sf_pipe_sizes is true
         util::matrix_t<double> sf_hdr_wallthicks;                 //[m] Imported header wall thicknesses, used if custom_sf_pipe_sizes is true
         util::matrix_t<double> sf_hdr_lengths;                    //[m] Imported header lengths, used if custom_sf_pipe_sizes is true
+
+        // TMB 11-28-2023 Added parameters for updated Trough
+        util::matrix_t<double> trough_loop_control;
+        bool use_solar_mult_or_aperture_area;
+        double specified_solar_mult;
+        double P_ref;
+        double eta_ref;
+        double non_solar_field_land_area_multiplier;
     };
 
     struct TroughState