From 471ecf0c0a3aab0eeb30f301b624717ec13383ae Mon Sep 17 00:00:00 2001 From: Janine Keith Date: Sat, 12 Oct 2024 15:01:42 -0600 Subject: [PATCH 1/2] renamed gamma_r to gamma_pmp where applicable --- ssc/cmod_pvsamv1.cpp | 2 +- test/input_cases/pvsamv1_battery_common_data.h | 4 ++-- test/input_cases/pvsamv1_common_data.cpp | 4 ++-- test/input_cases/pvyield_common_data.h | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ssc/cmod_pvsamv1.cpp b/ssc/cmod_pvsamv1.cpp index 7b3511df1..89869f31c 100644 --- a/ssc/cmod_pvsamv1.cpp +++ b/ssc/cmod_pvsamv1.cpp @@ -311,7 +311,7 @@ static var_info _cm_vtab_pvsamv1[] = { { SSC_INPUT, SSC_NUMBER, "cec_adjust", "Temperature coefficient adjustment", "%", "", "CEC Performance Model with Module Database", "module_model=1", "", "" }, { SSC_INPUT, SSC_NUMBER, "cec_alpha_sc", "Short circuit current temperature coefficient", "A/C", "", "CEC Performance Model with Module Database", "module_model=1", "", "" }, { SSC_INPUT, SSC_NUMBER, "cec_beta_oc", "Open circuit voltage temperature coefficient", "V/C", "", "CEC Performance Model with Module Database", "module_model=1", "", "" }, -{ SSC_INPUT, SSC_NUMBER, "cec_gamma_r", "Maximum power point temperature coefficient", "%/C", "", "CEC Performance Model with Module Database", "module_model=1", "", "" }, +{ SSC_INPUT, SSC_NUMBER, "cec_gamma_pmp", "Maximum power point temperature coefficient", "%/C", "", "CEC Performance Model with Module Database", "module_model=1", "", "" }, { SSC_INPUT, SSC_NUMBER, "cec_i_l_ref", "Light current", "A", "", "CEC Performance Model with Module Database", "module_model=1", "", "" }, { SSC_INPUT, SSC_NUMBER, "cec_i_mp_ref", "Maximum power point current", "A", "", "CEC Performance Model with Module Database", "module_model=1", "", "" }, { SSC_INPUT, SSC_NUMBER, "cec_i_o_ref", "Saturation current", "A", "", "CEC Performance Model with Module Database", "module_model=1", "", "" }, diff --git a/test/input_cases/pvsamv1_battery_common_data.h b/test/input_cases/pvsamv1_battery_common_data.h index 5122988c8..58d0a7099 100644 --- a/test/input_cases/pvsamv1_battery_common_data.h +++ b/test/input_cases/pvsamv1_battery_common_data.h @@ -238,7 +238,7 @@ void pvsamv1_pv_defaults(ssc_data_t& data) { ssc_data_set_number(data, "cec_adjust", 22.909179999999999); ssc_data_set_number(data, "cec_alpha_sc", 0.003735); ssc_data_set_number(data, "cec_beta_oc", -0.175619); - ssc_data_set_number(data, "cec_gamma_r", -0.38600000000000001); + ssc_data_set_number(data, "cec_gamma_pmp", -0.38600000000000001); ssc_data_set_number(data, "cec_i_l_ref", 6.0537280000000004); ssc_data_set_number(data, "cec_i_mp_ref", 5.6699999999999999); ssc_data_set_number(data, "cec_i_o_ref", 8.3604350000000005e-11); @@ -994,7 +994,7 @@ void commercial_multiarray_default(ssc_data_t& data) { ssc_data_set_number(data, "cec_adjust", 22.909179999999999); ssc_data_set_number(data, "cec_alpha_sc", 0.003735); ssc_data_set_number(data, "cec_beta_oc", -0.175619); - ssc_data_set_number(data, "cec_gamma_r", -0.38600000000000001); + ssc_data_set_number(data, "cec_gamma_pmp", -0.38600000000000001); ssc_data_set_number(data, "cec_i_l_ref", 6.0537280000000004); ssc_data_set_number(data, "cec_i_mp_ref", 5.6699999999999999); ssc_data_set_number(data, "cec_i_o_ref", 8.3604350000000005e-11); diff --git a/test/input_cases/pvsamv1_common_data.cpp b/test/input_cases/pvsamv1_common_data.cpp index 92403307d..49d604955 100644 --- a/test/input_cases/pvsamv1_common_data.cpp +++ b/test/input_cases/pvsamv1_common_data.cpp @@ -229,7 +229,7 @@ void pvsamv_nofinancial_default(ssc_data_t& data) ssc_data_set_number(data, "cec_adjust", 5.0100002288818359); ssc_data_set_number(data, "cec_alpha_sc", 0.0024920001160353422); ssc_data_set_number(data, "cec_beta_oc", -0.16975000500679016); - ssc_data_set_number(data, "cec_gamma_r", -0.31000000238418579); + ssc_data_set_number(data, "cec_gamma_pmp", -0.31000000238418579); ssc_data_set_number(data, "cec_i_l_ref", 6.2369999885559082); ssc_data_set_number(data, "cec_i_mp_ref", 5.8499999046325684); ssc_data_set_number(data, "cec_i_o_ref", 3.9799999233813832e-12); @@ -719,7 +719,7 @@ void pvsamv1_with_residential_default(ssc_data_t& data) ssc_data_set_number(data, "cec_adjust", 5.0100002288818359); ssc_data_set_number(data, "cec_alpha_sc", 0.0024920001160353422); ssc_data_set_number(data, "cec_beta_oc", -0.16975000500679016); - ssc_data_set_number(data, "cec_gamma_r", -0.31000000238418579); + ssc_data_set_number(data, "cec_gamma_pmp", -0.31000000238418579); ssc_data_set_number(data, "cec_i_l_ref", 6.2369999885559082); ssc_data_set_number(data, "cec_i_mp_ref", 5.8499999046325684); ssc_data_set_number(data, "cec_i_o_ref", 3.9799999233813832e-12); diff --git a/test/input_cases/pvyield_common_data.h b/test/input_cases/pvyield_common_data.h index 876fdc413..46c48592f 100644 --- a/test/input_cases/pvyield_common_data.h +++ b/test/input_cases/pvyield_common_data.h @@ -216,7 +216,7 @@ void pvyield_no_financial_meteo(ssc_data_t& data) ssc_data_set_number(data, "cec_adjust", 5.0100002288818359); ssc_data_set_number(data, "cec_alpha_sc", 0.0024920001160353422); ssc_data_set_number(data, "cec_beta_oc", -0.16975000500679016); - ssc_data_set_number(data, "cec_gamma_r", -0.31000000238418579); + ssc_data_set_number(data, "cec_gamma_pmp", -0.31000000238418579); ssc_data_set_number(data, "cec_i_l_ref", 6.2369999885559082); ssc_data_set_number(data, "cec_i_mp_ref", 5.8499999046325684); ssc_data_set_number(data, "cec_i_o_ref", 3.9799999233813832e-12); @@ -658,7 +658,7 @@ void pvyield_bifacial_case(ssc_data_t& data) ssc_data_set_number(data, "cec_adjust", 5.0100002288818359); ssc_data_set_number(data, "cec_alpha_sc", 0.0024920001160353422); ssc_data_set_number(data, "cec_beta_oc", -0.16975000500679016); - ssc_data_set_number(data, "cec_gamma_r", -0.31000000238418579); + ssc_data_set_number(data, "cec_gamma_pmp", -0.31000000238418579); ssc_data_set_number(data, "cec_i_l_ref", 6.2369999885559082); ssc_data_set_number(data, "cec_i_mp_ref", 5.8499999046325684); ssc_data_set_number(data, "cec_i_o_ref", 3.9799999233813832e-12); @@ -1095,7 +1095,7 @@ void pvyield_user_support_80603_meteo(ssc_data_t& data) ssc_data_set_number(data, "cec_adjust", 5.0100002288818359); ssc_data_set_number(data, "cec_alpha_sc", 0.0024920001160353422); ssc_data_set_number(data, "cec_beta_oc", -0.16975000500679016); - ssc_data_set_number(data, "cec_gamma_r", -0.31000000238418579); + ssc_data_set_number(data, "cec_gamma_pmp", -0.31000000238418579); ssc_data_set_number(data, "cec_i_l_ref", 6.2369999885559082); ssc_data_set_number(data, "cec_i_mp_ref", 5.8499999046325684); ssc_data_set_number(data, "cec_i_o_ref", 3.9799999233813832e-12); @@ -1534,7 +1534,7 @@ void pvyield_user_support_80603_AZ(ssc_data_t& data) ssc_data_set_number(data, "cec_adjust", 5.0100002288818359); ssc_data_set_number(data, "cec_alpha_sc", 0.0024920001160353422); ssc_data_set_number(data, "cec_beta_oc", -0.16975000500679016); - ssc_data_set_number(data, "cec_gamma_r", -0.31000000238418579); + ssc_data_set_number(data, "cec_gamma_pmp", -0.31000000238418579); ssc_data_set_number(data, "cec_i_l_ref", 6.2369999885559082); ssc_data_set_number(data, "cec_i_mp_ref", 5.8499999046325684); ssc_data_set_number(data, "cec_i_o_ref", 3.9799999233813832e-12); @@ -1974,7 +1974,7 @@ void pvsamMPPT_nofinancial_default(ssc_data_t& data) ssc_data_set_number(data, "cec_adjust", 5.0100002288818359); ssc_data_set_number(data, "cec_alpha_sc", 0.0024920001160353422); ssc_data_set_number(data, "cec_beta_oc", -0.16975000500679016); - ssc_data_set_number(data, "cec_gamma_r", -0.31000000238418579); + ssc_data_set_number(data, "cec_gamma_pmp", -0.31000000238418579); ssc_data_set_number(data, "cec_i_l_ref", 6.2369999885559082); ssc_data_set_number(data, "cec_i_mp_ref", 5.8499999046325684); ssc_data_set_number(data, "cec_i_o_ref", 3.9799999233813832e-12); From 04c7af5c7bd62cf2c18c8fc5d9e11e832b184766 Mon Sep 17 00:00:00 2001 From: Janine Keith Date: Mon, 28 Oct 2024 16:44:28 -0600 Subject: [PATCH 2/2] remove gamma_pmp from pv6parmod and pvsamv1 since it is not used --- ssc/cmod_pv6parmod.cpp | 1 - ssc/cmod_pvsamv1.cpp | 1 - test/input_cases/pvsamv1_battery_common_data.h | 2 -- test/input_cases/pvsamv1_common_data.cpp | 2 -- test/input_cases/pvyield_common_data.h | 5 ----- 5 files changed, 11 deletions(-) diff --git a/ssc/cmod_pv6parmod.cpp b/ssc/cmod_pv6parmod.cpp index 2530e488b..0d45d2ed8 100644 --- a/ssc/cmod_pv6parmod.cpp +++ b/ssc/cmod_pv6parmod.cpp @@ -65,7 +65,6 @@ static var_info _cm_vtab_pv6parmod[] = { { SSC_INPUT, SSC_NUMBER, "Isc", "Short circuit current", "A", "", "CEC 6 Parameter PV Module Model", "*", "", "" }, { SSC_INPUT, SSC_NUMBER, "alpha_isc", "Temp coeff of current at SC", "A/'C", "", "CEC 6 Parameter PV Module Model", "*", "", "" }, { SSC_INPUT, SSC_NUMBER, "beta_voc", "Temp coeff of voltage at OC", "V/'C", "", "CEC 6 Parameter PV Module Model", "*", "", "" }, - { SSC_INPUT, SSC_NUMBER, "gamma_pmp", "Temp coeff of power at MP", "%/'C", "", "CEC 6 Parameter PV Module Model", "*", "", "" }, { SSC_INPUT, SSC_NUMBER, "tnoct", "NOCT cell temperature", "'C", "", "CEC 6 Parameter PV Module Model", "*", "", "" }, { SSC_INPUT, SSC_NUMBER, "a", "Modified nonideality factor", "1/V", "", "CEC 6 Parameter PV Module Model", "*", "", "" }, { SSC_INPUT, SSC_NUMBER, "Il", "Light current", "A", "", "CEC 6 Parameter PV Module Model", "*", "", "" }, diff --git a/ssc/cmod_pvsamv1.cpp b/ssc/cmod_pvsamv1.cpp index a5af433f1..58c243202 100644 --- a/ssc/cmod_pvsamv1.cpp +++ b/ssc/cmod_pvsamv1.cpp @@ -311,7 +311,6 @@ static var_info _cm_vtab_pvsamv1[] = { { SSC_INPUT, SSC_NUMBER, "cec_adjust", "Temperature coefficient adjustment", "%", "", "CEC Performance Model with Module Database", "module_model=1", "", "" }, { SSC_INPUT, SSC_NUMBER, "cec_alpha_sc", "Short circuit current temperature coefficient", "A/C", "", "CEC Performance Model with Module Database", "module_model=1", "", "" }, { SSC_INPUT, SSC_NUMBER, "cec_beta_oc", "Open circuit voltage temperature coefficient", "V/C", "", "CEC Performance Model with Module Database", "module_model=1", "", "" }, -{ SSC_INPUT, SSC_NUMBER, "cec_gamma_pmp", "Maximum power point temperature coefficient", "%/C", "", "CEC Performance Model with Module Database", "module_model=1", "", "" }, { SSC_INPUT, SSC_NUMBER, "cec_i_l_ref", "Light current", "A", "", "CEC Performance Model with Module Database", "module_model=1", "", "" }, { SSC_INPUT, SSC_NUMBER, "cec_i_mp_ref", "Maximum power point current", "A", "", "CEC Performance Model with Module Database", "module_model=1", "", "" }, { SSC_INPUT, SSC_NUMBER, "cec_i_o_ref", "Saturation current", "A", "", "CEC Performance Model with Module Database", "module_model=1", "", "" }, diff --git a/test/input_cases/pvsamv1_battery_common_data.h b/test/input_cases/pvsamv1_battery_common_data.h index 58d0a7099..90cd2efc3 100644 --- a/test/input_cases/pvsamv1_battery_common_data.h +++ b/test/input_cases/pvsamv1_battery_common_data.h @@ -238,7 +238,6 @@ void pvsamv1_pv_defaults(ssc_data_t& data) { ssc_data_set_number(data, "cec_adjust", 22.909179999999999); ssc_data_set_number(data, "cec_alpha_sc", 0.003735); ssc_data_set_number(data, "cec_beta_oc", -0.175619); - ssc_data_set_number(data, "cec_gamma_pmp", -0.38600000000000001); ssc_data_set_number(data, "cec_i_l_ref", 6.0537280000000004); ssc_data_set_number(data, "cec_i_mp_ref", 5.6699999999999999); ssc_data_set_number(data, "cec_i_o_ref", 8.3604350000000005e-11); @@ -994,7 +993,6 @@ void commercial_multiarray_default(ssc_data_t& data) { ssc_data_set_number(data, "cec_adjust", 22.909179999999999); ssc_data_set_number(data, "cec_alpha_sc", 0.003735); ssc_data_set_number(data, "cec_beta_oc", -0.175619); - ssc_data_set_number(data, "cec_gamma_pmp", -0.38600000000000001); ssc_data_set_number(data, "cec_i_l_ref", 6.0537280000000004); ssc_data_set_number(data, "cec_i_mp_ref", 5.6699999999999999); ssc_data_set_number(data, "cec_i_o_ref", 8.3604350000000005e-11); diff --git a/test/input_cases/pvsamv1_common_data.cpp b/test/input_cases/pvsamv1_common_data.cpp index 49d604955..f3a7eefb6 100644 --- a/test/input_cases/pvsamv1_common_data.cpp +++ b/test/input_cases/pvsamv1_common_data.cpp @@ -229,7 +229,6 @@ void pvsamv_nofinancial_default(ssc_data_t& data) ssc_data_set_number(data, "cec_adjust", 5.0100002288818359); ssc_data_set_number(data, "cec_alpha_sc", 0.0024920001160353422); ssc_data_set_number(data, "cec_beta_oc", -0.16975000500679016); - ssc_data_set_number(data, "cec_gamma_pmp", -0.31000000238418579); ssc_data_set_number(data, "cec_i_l_ref", 6.2369999885559082); ssc_data_set_number(data, "cec_i_mp_ref", 5.8499999046325684); ssc_data_set_number(data, "cec_i_o_ref", 3.9799999233813832e-12); @@ -719,7 +718,6 @@ void pvsamv1_with_residential_default(ssc_data_t& data) ssc_data_set_number(data, "cec_adjust", 5.0100002288818359); ssc_data_set_number(data, "cec_alpha_sc", 0.0024920001160353422); ssc_data_set_number(data, "cec_beta_oc", -0.16975000500679016); - ssc_data_set_number(data, "cec_gamma_pmp", -0.31000000238418579); ssc_data_set_number(data, "cec_i_l_ref", 6.2369999885559082); ssc_data_set_number(data, "cec_i_mp_ref", 5.8499999046325684); ssc_data_set_number(data, "cec_i_o_ref", 3.9799999233813832e-12); diff --git a/test/input_cases/pvyield_common_data.h b/test/input_cases/pvyield_common_data.h index 46c48592f..00f739864 100644 --- a/test/input_cases/pvyield_common_data.h +++ b/test/input_cases/pvyield_common_data.h @@ -216,7 +216,6 @@ void pvyield_no_financial_meteo(ssc_data_t& data) ssc_data_set_number(data, "cec_adjust", 5.0100002288818359); ssc_data_set_number(data, "cec_alpha_sc", 0.0024920001160353422); ssc_data_set_number(data, "cec_beta_oc", -0.16975000500679016); - ssc_data_set_number(data, "cec_gamma_pmp", -0.31000000238418579); ssc_data_set_number(data, "cec_i_l_ref", 6.2369999885559082); ssc_data_set_number(data, "cec_i_mp_ref", 5.8499999046325684); ssc_data_set_number(data, "cec_i_o_ref", 3.9799999233813832e-12); @@ -658,7 +657,6 @@ void pvyield_bifacial_case(ssc_data_t& data) ssc_data_set_number(data, "cec_adjust", 5.0100002288818359); ssc_data_set_number(data, "cec_alpha_sc", 0.0024920001160353422); ssc_data_set_number(data, "cec_beta_oc", -0.16975000500679016); - ssc_data_set_number(data, "cec_gamma_pmp", -0.31000000238418579); ssc_data_set_number(data, "cec_i_l_ref", 6.2369999885559082); ssc_data_set_number(data, "cec_i_mp_ref", 5.8499999046325684); ssc_data_set_number(data, "cec_i_o_ref", 3.9799999233813832e-12); @@ -1095,7 +1093,6 @@ void pvyield_user_support_80603_meteo(ssc_data_t& data) ssc_data_set_number(data, "cec_adjust", 5.0100002288818359); ssc_data_set_number(data, "cec_alpha_sc", 0.0024920001160353422); ssc_data_set_number(data, "cec_beta_oc", -0.16975000500679016); - ssc_data_set_number(data, "cec_gamma_pmp", -0.31000000238418579); ssc_data_set_number(data, "cec_i_l_ref", 6.2369999885559082); ssc_data_set_number(data, "cec_i_mp_ref", 5.8499999046325684); ssc_data_set_number(data, "cec_i_o_ref", 3.9799999233813832e-12); @@ -1534,7 +1531,6 @@ void pvyield_user_support_80603_AZ(ssc_data_t& data) ssc_data_set_number(data, "cec_adjust", 5.0100002288818359); ssc_data_set_number(data, "cec_alpha_sc", 0.0024920001160353422); ssc_data_set_number(data, "cec_beta_oc", -0.16975000500679016); - ssc_data_set_number(data, "cec_gamma_pmp", -0.31000000238418579); ssc_data_set_number(data, "cec_i_l_ref", 6.2369999885559082); ssc_data_set_number(data, "cec_i_mp_ref", 5.8499999046325684); ssc_data_set_number(data, "cec_i_o_ref", 3.9799999233813832e-12); @@ -1974,7 +1970,6 @@ void pvsamMPPT_nofinancial_default(ssc_data_t& data) ssc_data_set_number(data, "cec_adjust", 5.0100002288818359); ssc_data_set_number(data, "cec_alpha_sc", 0.0024920001160353422); ssc_data_set_number(data, "cec_beta_oc", -0.16975000500679016); - ssc_data_set_number(data, "cec_gamma_pmp", -0.31000000238418579); ssc_data_set_number(data, "cec_i_l_ref", 6.2369999885559082); ssc_data_set_number(data, "cec_i_mp_ref", 5.8499999046325684); ssc_data_set_number(data, "cec_i_o_ref", 3.9799999233813832e-12);