From af4b6b46e8ae21f3f4ddd6f36b6f0b070fa2a78a Mon Sep 17 00:00:00 2001 From: sjanzou Date: Tue, 13 Aug 2024 23:33:53 -0600 Subject: [PATCH 1/2] REopt v3 API call working on MacOS 14.5 - addresses SAM #1830 --- ssc/cmod_battery_eqns.cpp | 2 +- ssc/cmod_pvsamv1_eqns.cpp | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ssc/cmod_battery_eqns.cpp b/ssc/cmod_battery_eqns.cpp index 435c173df..1fc012c3d 100644 --- a/ssc/cmod_battery_eqns.cpp +++ b/ssc/cmod_battery_eqns.cpp @@ -265,12 +265,12 @@ bool Reopt_size_standalone_battery_params(ssc_data_t data) { reopt_settings.assign("solver_name", var_data("SCIP")); // "HiGHS" option does not work with large numbers like 1e38 for tier max values per https://github.com/NREL/SAM/issues/1742 // assign the reopt parameter table and log messages + reopt_table->assign_match_case("Settings", reopt_settings); reopt_electric.assign_match_case("urdb_response", reopt_utility); reopt_table->assign_match_case("ElectricTariff", reopt_electric); reopt_table->assign_match_case("ElectricLoad", reopt_load); reopt_table->assign_match_case("Financial", reopt_fin); reopt_table->assign_match_case("ElectricStorage", reopt_batt); - reopt_table->assign_match_case("Settings", reopt_settings); vt->assign_match_case("reopt_scenario", reopt_params); vt->assign_match_case("log", log); return true; diff --git a/ssc/cmod_pvsamv1_eqns.cpp b/ssc/cmod_pvsamv1_eqns.cpp index c9f84a52d..1bd543db3 100644 --- a/ssc/cmod_pvsamv1_eqns.cpp +++ b/ssc/cmod_pvsamv1_eqns.cpp @@ -38,10 +38,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "vartab.h" SSCEXPORT bool Reopt_size_battery_params(ssc_data_t data) { - auto vt = static_cast(data); - if (!vt) { - return false; - } +// auto vt = static_cast(data); +// if (!vt) { +// return false; +// } var_table reopt_site, reopt_pv, reopt_utility; bool result = Reopt_size_standalone_battery_params(data); @@ -50,6 +50,11 @@ SSCEXPORT bool Reopt_size_battery_params(ssc_data_t data) { return result; } + auto vt = static_cast(data); + if (!vt) { + return false; + } + bool size_for_grid_outage = false; if (vt->is_assigned("size_for_grid_outage")) { size_for_grid_outage = vt->as_boolean("size_for_grid_outage"); From 77ab00d660e52b79e09757f7b9622a7d0dc18ebf Mon Sep 17 00:00:00 2001 From: sjanzou Date: Wed, 14 Aug 2024 00:13:03 -0600 Subject: [PATCH 2/2] Remove unnecessary changes in cmod_pvsamv1_eqns for SAM #1830 --- ssc/cmod_pvsamv1_eqns.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/ssc/cmod_pvsamv1_eqns.cpp b/ssc/cmod_pvsamv1_eqns.cpp index 1bd543db3..c9f84a52d 100644 --- a/ssc/cmod_pvsamv1_eqns.cpp +++ b/ssc/cmod_pvsamv1_eqns.cpp @@ -38,10 +38,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "vartab.h" SSCEXPORT bool Reopt_size_battery_params(ssc_data_t data) { -// auto vt = static_cast(data); -// if (!vt) { -// return false; -// } + auto vt = static_cast(data); + if (!vt) { + return false; + } var_table reopt_site, reopt_pv, reopt_utility; bool result = Reopt_size_standalone_battery_params(data); @@ -50,11 +50,6 @@ SSCEXPORT bool Reopt_size_battery_params(ssc_data_t data) { return result; } - auto vt = static_cast(data); - if (!vt) { - return false; - } - bool size_for_grid_outage = false; if (vt->is_assigned("size_for_grid_outage")) { size_for_grid_outage = vt->as_boolean("size_for_grid_outage");