Skip to content

Commit

Permalink
Add additional input parameters needed to run tests.
Browse files Browse the repository at this point in the history
taylorbrown75 committed Nov 28, 2023
1 parent e2db4ba commit 3e92d84
Showing 2 changed files with 27 additions and 0 deletions.
19 changes: 19 additions & 0 deletions test/shared_test/lib_csp_trough_test.cpp
Original file line number Diff line number Diff line change
@@ -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;
}

8 changes: 8 additions & 0 deletions test/shared_test/lib_csp_trough_test.h
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 3e92d84

Please sign in to comment.