Skip to content

Commit

Permalink
Merge pull request #998 from NREL/pysam_138
Browse files Browse the repository at this point in the history 
Fix pysam issue 138 - change all weather group names to "weather" case sensitive
  • Loading branch information
@brtietz
brtietz authored Feb 21, 2023
2 parents 173e663 + 5e909be commit 1113bcc
Show file tree
Hide file tree
Showing 15 changed files with 60 additions and 60 deletions.
4 changes: 2 additions & 2 deletions ssc/cmod_linear_fresnel_dsg_iph.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ static var_info _cm_vtab_linear_fresnel_dsg_iph[] = {
// VARTYPE DATATYPE NAME LABEL UNITS META GROUP REQUIRED_IF CONSTRAINTS UI_HINTS

// Weather File
{ SSC_INPUT, SSC_STRING, "file_name", "local weather file path", "", "", "Weather", "*", "LOCAL_FILE", "" },
{ SSC_INPUT, SSC_TABLE, "solar_resource_data", "Weather resource data in memory", "", "", "Weather", "?", "", "" },
{ SSC_INPUT, SSC_STRING, "file_name", "local weather file path", "", "", "weather", "*", "LOCAL_FILE", "" },
{ SSC_INPUT, SSC_TABLE, "solar_resource_data", "Weather resource data in memory", "", "", "weather", "?", "", "" },


// System Design
Expand Down
10 changes: 5 additions & 5 deletions ssc/cmod_mspt_sf_and_rec_isolated.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ static var_info _cm_vtab_mspt_sf_and_rec_isolated[] = {
// Time
{ SSC_INPUT, SSC_ARRAY, "timestep_od", "Timestep", "s", "", "Timeseries", "sim_type=1", "", ""},
// Weather
{ SSC_INPUT, SSC_ARRAY, "P_amb_od", "Ambient pressure", "mbar", "", "Weather", "sim_type=1", "", ""},
{ SSC_INPUT, SSC_ARRAY, "T_amb_od", "Ambient temperature", "C", "", "Weather", "sim_type=1", "", ""},
{ SSC_INPUT, SSC_ARRAY, "deltaT_sky_od", "Difference between ambient and sky temps", "C", "", "Weather", "sim_type=1", "", ""},
{ SSC_INPUT, SSC_ARRAY, "v_wind_10_od", "Wind speed at 10 meters", "m/s", "", "Weather", "sim_type=1", "", ""},
{ SSC_INPUT, SSC_ARRAY, "clearsky_to_measured_dni_od", "Ratio of clearsky to measured DNI", "", "", "Weather", "sim_type=1&is_rec_clearsky_control=1", "", ""},
{ SSC_INPUT, SSC_ARRAY, "P_amb_od", "Ambient pressure", "mbar", "", "weather", "sim_type=1", "", ""},
{ SSC_INPUT, SSC_ARRAY, "T_amb_od", "Ambient temperature", "C", "", "weather", "sim_type=1", "", ""},
{ SSC_INPUT, SSC_ARRAY, "deltaT_sky_od", "Difference between ambient and sky temps", "C", "", "weather", "sim_type=1", "", ""},
{ SSC_INPUT, SSC_ARRAY, "v_wind_10_od", "Wind speed at 10 meters", "m/s", "", "weather", "sim_type=1", "", ""},
{ SSC_INPUT, SSC_ARRAY, "clearsky_to_measured_dni_od", "Ratio of clearsky to measured DNI", "", "", "weather", "sim_type=1&is_rec_clearsky_control=1", "", ""},
// Flux
{ SSC_INPUT, SSC_MATRIX, "flux_map_od", "rows: timestep, columns: panels. Flux *after* rec reflectance losses", "W/m2", "", "Flux", "sim_type=1", "", ""},
// Receiver control
Expand Down
20 changes: 10 additions & 10 deletions ssc/cmod_pv6parmod.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
static var_info _cm_vtab_pv6parmod[] = {

/* VARTYPE DATATYPE NAME LABEL UNITS META GROUP REQUIRED_IF CONSTRAINTS UI_HINTS*/
{ SSC_INPUT, SSC_ARRAY, "poa_beam", "Incident direct normal radiation","W/m2", "", "Weather", "*", "", "" },
{ SSC_INPUT, SSC_ARRAY, "poa_skydiff", "Incident sky diffuse radiation", "W/m2", "", "Weather", "*", "LENGTH_EQUAL=poa_beam", "" },
{ SSC_INPUT, SSC_ARRAY, "poa_gnddiff", "Incident ground diffuse irradiance","W/m2","", "Weather", "*", "LENGTH_EQUAL=poa_beam", "" },
{ SSC_INPUT, SSC_ARRAY, "tdry", "Dry bulb temperature", "'C", "", "Weather", "*", "LENGTH_EQUAL=poa_beam", "" },
{ SSC_INPUT, SSC_ARRAY, "wspd", "Wind speed", "m/s", "", "Weather", "*", "LENGTH_EQUAL=poa_beam", "" },
{ SSC_INPUT, SSC_ARRAY, "wdir", "Wind direction", "deg", "", "Weather", "*", "LENGTH_EQUAL=poa_beam", "" },
{ SSC_INPUT, SSC_ARRAY, "sun_zen", "Sun zenith angle", "deg", "", "Weather", "*", "LENGTH_EQUAL=poa_beam", "" },
{ SSC_INPUT, SSC_ARRAY, "incidence", "Incidence angle to surface", "deg", "", "Weather", "*", "LENGTH_EQUAL=poa_beam", "" },
{ SSC_INPUT, SSC_ARRAY, "surf_tilt", "Surface tilt angle", "deg", "", "Weather", "*", "LENGTH_EQUAL=poa_beam", "" },
{ SSC_INPUT, SSC_NUMBER, "elev", "Site elevation", "m", "", "Weather", "*", "", "" },
{ SSC_INPUT, SSC_ARRAY, "poa_beam", "Incident direct normal radiation","W/m2", "", "weather", "*", "", "" },
{ SSC_INPUT, SSC_ARRAY, "poa_skydiff", "Incident sky diffuse radiation", "W/m2", "", "weather", "*", "LENGTH_EQUAL=poa_beam", "" },
{ SSC_INPUT, SSC_ARRAY, "poa_gnddiff", "Incident ground diffuse irradiance","W/m2","", "weather", "*", "LENGTH_EQUAL=poa_beam", "" },
{ SSC_INPUT, SSC_ARRAY, "tdry", "Dry bulb temperature", "'C", "", "weather", "*", "LENGTH_EQUAL=poa_beam", "" },
{ SSC_INPUT, SSC_ARRAY, "wspd", "Wind speed", "m/s", "", "weather", "*", "LENGTH_EQUAL=poa_beam", "" },
{ SSC_INPUT, SSC_ARRAY, "wdir", "Wind direction", "deg", "", "weather", "*", "LENGTH_EQUAL=poa_beam", "" },
{ SSC_INPUT, SSC_ARRAY, "sun_zen", "Sun zenith angle", "deg", "", "weather", "*", "LENGTH_EQUAL=poa_beam", "" },
{ SSC_INPUT, SSC_ARRAY, "incidence", "Incidence angle to surface", "deg", "", "weather", "*", "LENGTH_EQUAL=poa_beam", "" },
{ SSC_INPUT, SSC_ARRAY, "surf_tilt", "Surface tilt angle", "deg", "", "weather", "*", "LENGTH_EQUAL=poa_beam", "" },
{ SSC_INPUT, SSC_NUMBER, "elev", "Site elevation", "m", "", "weather", "*", "", "" },


{ SSC_INPUT, SSC_ARRAY, "opvoltage", "Module operating voltage", "Volt", "", "CEC 6 Parameter PV Module Model", "?" "", "" },
Expand Down
2 changes: 1 addition & 1 deletion ssc/cmod_pvwattsv0.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -955,7 +955,7 @@ static double perez( double dn,double df,double alb,double inc,double tilt,doubl

static var_info _cm_vtab_pvwattsv0[] = {
/* VARTYPE DATATYPE NAME LABEL UNITS META GROUP REQUIRED_IF CONSTRAINTS UI_HINTS*/
{ SSC_INPUT, SSC_STRING, "file_name", "local weather file path", "", "", "Weather", "*", "LOCAL_FILE", "" },
{ SSC_INPUT, SSC_STRING, "file_name", "local weather file path", "", "", "weather", "*", "LOCAL_FILE", "" },

{ SSC_INPUT, SSC_NUMBER, "system_size", "Nameplate capacity", "kW", "", "PVWatts", "*", "", "" },
{ SSC_INPUT, SSC_NUMBER, "derate", "System derate value", "frac", "", "PVWatts", "*", "MIN=0,MAX=1", "" },
Expand Down
2 changes: 1 addition & 1 deletion ssc/cmod_pvwattsv1.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

static var_info _cm_vtab_pvwattsv1[] = {
/* VARTYPE DATATYPE NAME LABEL UNITS META GROUP REQUIRED_IF CONSTRAINTS UI_HINTS*/
{ SSC_INPUT, SSC_STRING, "solar_resource_file", "local weather file path", "", "", "Weather", "*", "LOCAL_FILE", "" },
{ SSC_INPUT, SSC_STRING, "solar_resource_file", "local weather file path", "", "", "weather", "*", "LOCAL_FILE", "" },

{ SSC_INPUT, SSC_NUMBER, "albedo", "Albedo (ground reflectance)", "frac", "", "PVWatts", "?", "", "" },
{ SSC_INPUT, SSC_NUMBER, "system_size", "Nameplate capacity", "kW", "", "PVWatts", "*", "", "" },
Expand Down
14 changes: 7 additions & 7 deletions ssc/cmod_pvwattsv1_poa.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
static var_info _cm_vtab_pvwatts[] = {

/* VARTYPE DATATYPE NAME LABEL UNITS META GROUP REQUIRED_IF CONSTRAINTS UI_HINTS*/
{ SSC_INPUT, SSC_ARRAY, "beam", "Direct normal radiation", "W/m2", "", "Weather", "*", "", "" },
{ SSC_INPUT, SSC_ARRAY, "poa_beam", "Incident direct normal radiation","W/m2", "", "Weather", "*", "LENGTH_EQUAL=beam", "" },
{ SSC_INPUT, SSC_ARRAY, "poa_skydiff", "Incident sky diffuse radiation", "W/m2", "", "Weather", "*", "LENGTH_EQUAL=beam", "" },
{ SSC_INPUT, SSC_ARRAY, "poa_gnddiff", "Incident ground diffuse irradiance","W/m2","", "Weather", "*", "LENGTH_EQUAL=beam", "" },
{ SSC_INPUT, SSC_ARRAY, "tdry", "Dry bulb temperature", "'C", "", "Weather", "*", "LENGTH_EQUAL=beam", "" },
{ SSC_INPUT, SSC_ARRAY, "wspd", "Wind speed", "m/s", "", "Weather", "*", "LENGTH_EQUAL=beam", "" },
{ SSC_INPUT, SSC_ARRAY, "incidence", "Incidence angle to surface", "deg", "", "Weather", "*", "LENGTH_EQUAL=beam", "" },
{ SSC_INPUT, SSC_ARRAY, "beam", "Direct normal radiation", "W/m2", "", "weather", "*", "", "" },
{ SSC_INPUT, SSC_ARRAY, "poa_beam", "Incident direct normal radiation","W/m2", "", "weather", "*", "LENGTH_EQUAL=beam", "" },
{ SSC_INPUT, SSC_ARRAY, "poa_skydiff", "Incident sky diffuse radiation", "W/m2", "", "weather", "*", "LENGTH_EQUAL=beam", "" },
{ SSC_INPUT, SSC_ARRAY, "poa_gnddiff", "Incident ground diffuse irradiance","W/m2","", "weather", "*", "LENGTH_EQUAL=beam", "" },
{ SSC_INPUT, SSC_ARRAY, "tdry", "Dry bulb temperature", "'C", "", "weather", "*", "LENGTH_EQUAL=beam", "" },
{ SSC_INPUT, SSC_ARRAY, "wspd", "Wind speed", "m/s", "", "weather", "*", "LENGTH_EQUAL=beam", "" },
{ SSC_INPUT, SSC_ARRAY, "incidence", "Incidence angle to surface", "deg", "", "weather", "*", "LENGTH_EQUAL=beam", "" },

{ SSC_INPUT, SSC_NUMBER, "step", "Time step of input data", "sec", "", "PVWatts", "?=3600", "POSITIVE", "" },
{ SSC_INPUT, SSC_NUMBER, "system_size", "Nameplate capacity", "kW", "", "PVWatts", "*", "MIN=0.5,MAX=100000", "" },
Expand Down
8 changes: 4 additions & 4 deletions ssc/cmod_tcsdish.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
static var_info _cm_vtab_tcsdish[] = {
// weather reader inputs
// VARTYPE DATATYPE NAME LABEL UNITS META GROUP REQUIRED_IF CONSTRAINTS UI_HINTS
{ SSC_INPUT, SSC_STRING, "file_name", "local weather file path", "", "", "Weather", "*", "LOCAL_FILE", "" },
//{ SSC_INPUT, SSC_NUMBER, "track_mode", "Tracking mode", "", "", "Weather", "*", "", "" },
//{ SSC_INPUT, SSC_NUMBER, "tilt", "Tilt angle of surface/axis", "", "", "Weather", "*", "", "" },
//{ SSC_INPUT, SSC_NUMBER, "azimuth", "Azimuth angle of surface/axis", "", "", "Weather", "*", "", "" },
{ SSC_INPUT, SSC_STRING, "file_name", "local weather file path", "", "", "weather", "*", "LOCAL_FILE", "" },
//{ SSC_INPUT, SSC_NUMBER, "track_mode", "Tracking mode", "", "", "weather", "*", "", "" },
//{ SSC_INPUT, SSC_NUMBER, "tilt", "Tilt angle of surface/axis", "", "", "weather", "*", "", "" },
//{ SSC_INPUT, SSC_NUMBER, "azimuth", "Azimuth angle of surface/axis", "", "", "weather", "*", "", "" },

{ SSC_INPUT, SSC_NUMBER, "system_capacity", "Nameplate capacity", "kW", "", "dish", "*", "", "" },

Expand Down
Loading

0 comments on commit 1113bcc

Please sign in to comment.