Skip to content

Commit

Permalink
Update all compute modules and shading_factor_calculator for flattene…
Browse files Browse the repository at this point in the history 
…d UI variables
  • Loading branch information
@sjanzou
sjanzou committed Apr 11, 2023
1 parent f222fa7 commit d071043
Show file tree
Hide file tree
Showing 7 changed files with 225 additions and 129 deletions.
55 changes: 51 additions & 4 deletions ssc/cmod_pvsamv1.cpp
View file

Large diffs are not rendered by default.

13 changes: 12 additions & 1 deletion ssc/cmod_pvwattsv1.cpp
View file
Expand Up @@ -55,7 +55,18 @@ static var_info _cm_vtab_pvwattsv1[] = {
{ SSC_INPUT, SSC_NUMBER, "tilt_eq_lat", "Tilt=latitude override", "0/1", "", "PVWatts", "na:tilt", "BOOLEAN", "" },

/* shading inputs */
{ SSC_INPUT, SSC_TABLE, "shading", "Shading loss table", "", "", "PVWatts", "?", "", "" },
// { SSC_INPUT, SSC_TABLE, "shading", "Shading loss table", "", "", "PVWatts", "?", "", "" },
{SSC_INPUT, SSC_NUMBER, "shading_en_string_option", "Enable shading string option", "0/1", "0=false,1=true", "Shading", "?=0", "BOOLEAN", "" },
{SSC_INPUT, SSC_NUMBER, "shading_string_option", "Shading string option", "", "0=shadingdb,1=average,2=maximum,3=minimum", "Shading", "?=-1", "INTEGER,MIN=-1,MAX=4","" },
{SSC_INPUT, SSC_NUMBER, "shading_en_timestep", "Enable timestep beam shading losses", "0/1", "0=false,1=true", "Shading", "?=0", "BOOLEAN", "" },
{SSC_INPUT, SSC_MATRIX, "shading_timestep", "Timestep beam shading losses", "%", "", "Shading", "?", "", "" },
{SSC_INPUT, SSC_NUMBER, "shading_en_mxh", "Enable month x Hour beam shading losses", "0/1", "0=false,1=true", "Shading", "?=0", "BOOLEAN", "" },
{SSC_INPUT, SSC_MATRIX, "shading_mxh", "Month x Hour beam shading losses", "%", "", "Shading", "?", "", "" },
{SSC_INPUT, SSC_NUMBER, "shading_en_azal", "Enable azimuth x altitude beam shading losses", "0/1", "0=false,1=true", "Shading", "?=0", "BOOLEAN", "" },
{SSC_INPUT, SSC_MATRIX, "shading_azal", "Azimuth x altitude beam shading losses", "%", "", "Shading", "?", "", "" },
{SSC_INPUT, SSC_NUMBER, "shading_en_diff", "Enable diffuse shading loss", "0/1", "0=false,1=true", "Shading", "?=0", "BOOLEAN", "" },
{SSC_INPUT, SSC_NUMBER, "shading_diff", "Diffuse shading loss", "%", "", "Shading", "?", "", "" },


/* advanced parameters */
{ SSC_INPUT, SSC_NUMBER, "enable_user_poa", "Enable user-defined POA irradiance input", "0/1", "", "PVWatts", "?=0", "BOOLEAN", "" },
Expand Down
12 changes: 11 additions & 1 deletion ssc/cmod_pvwattsv5.cpp
View file
Expand Up @@ -73,7 +73,17 @@ static var_info _cm_vtab_pvwattsv5_common[] = {

static var_info _cm_vtab_pvwattsv5_part2[] = {

{ SSC_INPUT, SSC_TABLE, "shading", "Shading loss table", "", "", "System Design", "?", "", "" },
// { SSC_INPUT, SSC_TABLE, "shading", "Shading loss table", "", "", "System Design", "?", "", "" },
{SSC_INPUT, SSC_NUMBER, "shading_en_string_option", "Enable shading string option", "0/1", "0=false,1=true", "Shading", "?=0", "BOOLEAN", "" },
{SSC_INPUT, SSC_NUMBER, "shading_string_option", "Shading string option", "", "0=shadingdb,1=average,2=maximum,3=minimum", "Shading", "?=-1", "INTEGER,MIN=-1,MAX=4","" },
{SSC_INPUT, SSC_NUMBER, "shading_en_timestep", "Enable timestep beam shading losses", "0/1", "0=false,1=true", "Shading", "?=0", "BOOLEAN", "" },
{SSC_INPUT, SSC_MATRIX, "shading_timestep", "Timestep beam shading losses", "%", "", "Shading", "?", "", "" },
{SSC_INPUT, SSC_NUMBER, "shading_en_mxh", "Enable month x Hour beam shading losses", "0/1", "0=false,1=true", "Shading", "?=0", "BOOLEAN", "" },
{SSC_INPUT, SSC_MATRIX, "shading_mxh", "Month x Hour beam shading losses", "%", "", "Shading", "?", "", "" },
{SSC_INPUT, SSC_NUMBER, "shading_en_azal", "Enable azimuth x altitude beam shading losses", "0/1", "0=false,1=true", "Shading", "?=0", "BOOLEAN", "" },
{SSC_INPUT, SSC_MATRIX, "shading_azal", "Azimuth x altitude beam shading losses", "%", "", "Shading", "?", "", "" },
{SSC_INPUT, SSC_NUMBER, "shading_en_diff", "Enable diffuse shading loss", "0/1", "0=false,1=true", "Shading", "?=0", "BOOLEAN", "" },
{SSC_INPUT, SSC_NUMBER, "shading_diff", "Diffuse shading loss", "%", "", "Shading", "?", "", "" },

/* battery */
{ SSC_INPUT, SSC_NUMBER, "batt_simple_enable", "Enable Battery", "0/1", "", "System Design", "?=0", "BOOLEAN", "" },
Expand Down
12 changes: 11 additions & 1 deletion ssc/cmod_pvwattsv7.cpp
View file
Expand Up @@ -155,7 +155,17 @@ static var_info _cm_vtab_pvwattsv7[] = {
{ SSC_INPUT, SSC_NUMBER, "xfmr_nll", "GSU transformer no load loss (iron core)", "%(ac)", "", "System Design", "?=0.0", "", "" },
{ SSC_INPUT, SSC_NUMBER, "xfmr_ll", "GSU transformer load loss (resistive)", "%(ac)", "", "System Design", "?=0.0", "", "" },

{ SSC_INPUT, SSC_TABLE, "shading", "Shading loss table", "", "", "System Design", "?", "", "" },
// { SSC_INPUT, SSC_TABLE, "shading", "Shading loss table", "", "", "System Design", "?", "", "" },
{SSC_INPUT, SSC_NUMBER, "shading_en_string_option", "Enable shading string option", "0/1", "0=false,1=true", "Shading", "?=0", "BOOLEAN", "" },
{SSC_INPUT, SSC_NUMBER, "shading_string_option", "Shading string option", "", "0=shadingdb,1=average,2=maximum,3=minimum", "Shading", "?=-1", "INTEGER,MIN=-1,MAX=4","" },
{SSC_INPUT, SSC_NUMBER, "shading_en_timestep", "Enable timestep beam shading losses", "0/1", "0=false,1=true", "Shading", "?=0", "BOOLEAN", "" },
{SSC_INPUT, SSC_MATRIX, "shading_timestep", "Timestep beam shading losses", "%", "", "Shading", "?", "", "" },
{SSC_INPUT, SSC_NUMBER, "shading_en_mxh", "Enable month x Hour beam shading losses", "0/1", "0=false,1=true", "Shading", "?=0", "BOOLEAN", "" },
{SSC_INPUT, SSC_MATRIX, "shading_mxh", "Month x Hour beam shading losses", "%", "", "Shading", "?", "", "" },
{SSC_INPUT, SSC_NUMBER, "shading_en_azal", "Enable azimuth x altitude beam shading losses", "0/1", "0=false,1=true", "Shading", "?=0", "BOOLEAN", "" },
{SSC_INPUT, SSC_MATRIX, "shading_azal", "Azimuth x altitude beam shading losses", "%", "", "Shading", "?", "", "" },
{SSC_INPUT, SSC_NUMBER, "shading_en_diff", "Enable diffuse shading loss", "0/1", "0=false,1=true", "Shading", "?=0", "BOOLEAN", "" },
{SSC_INPUT, SSC_NUMBER, "shading_diff", "Diffuse shading loss", "%", "", "Shading", "?", "", "" },

{ SSC_INPUT, SSC_NUMBER, "batt_simple_enable", "Enable Battery", "0/1", "", "System Design", "?=0", "BOOLEAN", "" },

Expand Down
12 changes: 11 additions & 1 deletion ssc/cmod_pvwattsv8.cpp
View file
Expand Up @@ -157,7 +157,17 @@ static var_info _cm_vtab_pvwattsv8[] = {
{ SSC_INPUT, SSC_NUMBER, "xfmr_nll", "GSU transformer no load loss (iron core)", "%(ac)", "", "System Design", "?=0.0", "", "" },
{ SSC_INPUT, SSC_NUMBER, "xfmr_ll", "GSU transformer load loss (resistive)", "%(ac)", "", "System Design", "?=0.0", "", "" },

{ SSC_INPUT, SSC_TABLE, "shading", "Shading loss table", "", "", "System Design", "?", "", "" },
// { SSC_INPUT, SSC_TABLE, "shading", "Shading loss table", "", "", "System Design", "?", "", "" },
{SSC_INPUT, SSC_NUMBER, "shading_en_string_option", "Enable shading string option", "0/1", "0=false,1=true", "Shading", "?=0", "BOOLEAN", "" },
{SSC_INPUT, SSC_NUMBER, "shading_string_option", "Shading string option", "", "0=shadingdb,1=average,2=maximum,3=minimum", "Shading", "?=-1", "INTEGER,MIN=-1,MAX=4","" },
{SSC_INPUT, SSC_NUMBER, "shading_en_timestep", "Enable timestep beam shading losses", "0/1", "0=false,1=true", "Shading", "?=0", "BOOLEAN", "" },
{SSC_INPUT, SSC_MATRIX, "shading_timestep", "Timestep beam shading losses", "%", "", "Shading", "?", "", "" },
{SSC_INPUT, SSC_NUMBER, "shading_en_mxh", "Enable month x Hour beam shading losses", "0/1", "0=false,1=true", "Shading", "?=0", "BOOLEAN", "" },
{SSC_INPUT, SSC_MATRIX, "shading_mxh", "Month x Hour beam shading losses", "%", "", "Shading", "?", "", "" },
{SSC_INPUT, SSC_NUMBER, "shading_en_azal", "Enable azimuth x altitude beam shading losses", "0/1", "0=false,1=true", "Shading", "?=0", "BOOLEAN", "" },
{SSC_INPUT, SSC_MATRIX, "shading_azal", "Azimuth x altitude beam shading losses", "%", "", "Shading", "?", "", "" },
{SSC_INPUT, SSC_NUMBER, "shading_en_diff", "Enable diffuse shading loss", "0/1", "0=false,1=true", "Shading", "?=0", "BOOLEAN", "" },
{SSC_INPUT, SSC_NUMBER, "shading_diff", "Diffuse shading loss", "%", "", "Shading", "?", "", "" },


{ SSC_INPUT, SSC_NUMBER, "batt_simple_enable", "Enable Battery", "0/1", "", "System Design", "?=0", "BOOLEAN", "" },
Expand Down

0 comments on commit d071043

Please sign in to comment.