Skip to content

Commit 1113bcc

Browse files
brtietzbrtietz
authored
Merge pull request #998 from NREL/pysam_138
Fix pysam issue 138 - change all weather group names to "weather" case sensitive
2 parents 173e663 + 5e909be commit 1113bcc

15 files changed

+60
-60
lines changed

‎ssc/cmod_linear_fresnel_dsg_iph.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ static var_info _cm_vtab_linear_fresnel_dsg_iph[] = {
4949
// VARTYPE DATATYPE NAME LABEL UNITS META GROUP REQUIRED_IF CONSTRAINTS UI_HINTS
5050

5151
// Weather File
52-
{ SSC_INPUT, SSC_STRING, "file_name", "local weather file path", "", "", "Weather", "*", "LOCAL_FILE", "" },
53-
{ SSC_INPUT, SSC_TABLE, "solar_resource_data", "Weather resource data in memory", "", "", "Weather", "?", "", "" },
52+
{ SSC_INPUT, SSC_STRING, "file_name", "local weather file path", "", "", "weather", "*", "LOCAL_FILE", "" },
53+
{ SSC_INPUT, SSC_TABLE, "solar_resource_data", "Weather resource data in memory", "", "", "weather", "?", "", "" },
5454

5555

5656
// System Design

‎ssc/cmod_mspt_sf_and_rec_isolated.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ static var_info _cm_vtab_mspt_sf_and_rec_isolated[] = {
8989
// Time
9090
{ SSC_INPUT, SSC_ARRAY, "timestep_od", "Timestep", "s", "", "Timeseries", "sim_type=1", "", ""},
9191
// Weather
92-
{ SSC_INPUT, SSC_ARRAY, "P_amb_od", "Ambient pressure", "mbar", "", "Weather", "sim_type=1", "", ""},
93-
{ SSC_INPUT, SSC_ARRAY, "T_amb_od", "Ambient temperature", "C", "", "Weather", "sim_type=1", "", ""},
94-
{ SSC_INPUT, SSC_ARRAY, "deltaT_sky_od", "Difference between ambient and sky temps", "C", "", "Weather", "sim_type=1", "", ""},
95-
{ SSC_INPUT, SSC_ARRAY, "v_wind_10_od", "Wind speed at 10 meters", "m/s", "", "Weather", "sim_type=1", "", ""},
96-
{ SSC_INPUT, SSC_ARRAY, "clearsky_to_measured_dni_od", "Ratio of clearsky to measured DNI", "", "", "Weather", "sim_type=1&is_rec_clearsky_control=1", "", ""},
92+
{ SSC_INPUT, SSC_ARRAY, "P_amb_od", "Ambient pressure", "mbar", "", "weather", "sim_type=1", "", ""},
93+
{ SSC_INPUT, SSC_ARRAY, "T_amb_od", "Ambient temperature", "C", "", "weather", "sim_type=1", "", ""},
94+
{ SSC_INPUT, SSC_ARRAY, "deltaT_sky_od", "Difference between ambient and sky temps", "C", "", "weather", "sim_type=1", "", ""},
95+
{ SSC_INPUT, SSC_ARRAY, "v_wind_10_od", "Wind speed at 10 meters", "m/s", "", "weather", "sim_type=1", "", ""},
96+
{ SSC_INPUT, SSC_ARRAY, "clearsky_to_measured_dni_od", "Ratio of clearsky to measured DNI", "", "", "weather", "sim_type=1&is_rec_clearsky_control=1", "", ""},
9797
// Flux
9898
{ SSC_INPUT, SSC_MATRIX, "flux_map_od", "rows: timestep, columns: panels. Flux *after* rec reflectance losses", "W/m2", "", "Flux", "sim_type=1", "", ""},
9999
// Receiver control

‎ssc/cmod_pv6parmod.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4444
static var_info _cm_vtab_pv6parmod[] = {
4545

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

5858

5959
{ SSC_INPUT, SSC_ARRAY, "opvoltage", "Module operating voltage", "Volt", "", "CEC 6 Parameter PV Module Model", "?" "", "" },

‎ssc/cmod_pvwattsv0.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@ static double perez( double dn,double df,double alb,double inc,double tilt,doubl
955955

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

960960
{ SSC_INPUT, SSC_NUMBER, "system_size", "Nameplate capacity", "kW", "", "PVWatts", "*", "", "" },
961961
{ SSC_INPUT, SSC_NUMBER, "derate", "System derate value", "frac", "", "PVWatts", "*", "MIN=0,MAX=1", "" },

‎ssc/cmod_pvwattsv1.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4444

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

4949
{ SSC_INPUT, SSC_NUMBER, "albedo", "Albedo (ground reflectance)", "frac", "", "PVWatts", "?", "", "" },
5050
{ SSC_INPUT, SSC_NUMBER, "system_size", "Nameplate capacity", "kW", "", "PVWatts", "*", "", "" },

‎ssc/cmod_pvwattsv1_poa.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4444
static var_info _cm_vtab_pvwatts[] = {
4545

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

5555
{ SSC_INPUT, SSC_NUMBER, "step", "Time step of input data", "sec", "", "PVWatts", "?=3600", "POSITIVE", "" },
5656
{ SSC_INPUT, SSC_NUMBER, "system_size", "Nameplate capacity", "kW", "", "PVWatts", "*", "MIN=0.5,MAX=100000", "" },

‎ssc/cmod_tcsdish.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3939
static var_info _cm_vtab_tcsdish[] = {
4040
// weather reader inputs
4141
// VARTYPE DATATYPE NAME LABEL UNITS META GROUP REQUIRED_IF CONSTRAINTS UI_HINTS
42-
{ SSC_INPUT, SSC_STRING, "file_name", "local weather file path", "", "", "Weather", "*", "LOCAL_FILE", "" },
43-
//{ SSC_INPUT, SSC_NUMBER, "track_mode", "Tracking mode", "", "", "Weather", "*", "", "" },
44-
//{ SSC_INPUT, SSC_NUMBER, "tilt", "Tilt angle of surface/axis", "", "", "Weather", "*", "", "" },
45-
//{ SSC_INPUT, SSC_NUMBER, "azimuth", "Azimuth angle of surface/axis", "", "", "Weather", "*", "", "" },
42+
{ SSC_INPUT, SSC_STRING, "file_name", "local weather file path", "", "", "weather", "*", "LOCAL_FILE", "" },
43+
//{ SSC_INPUT, SSC_NUMBER, "track_mode", "Tracking mode", "", "", "weather", "*", "", "" },
44+
//{ SSC_INPUT, SSC_NUMBER, "tilt", "Tilt angle of surface/axis", "", "", "weather", "*", "", "" },
45+
//{ SSC_INPUT, SSC_NUMBER, "azimuth", "Azimuth angle of surface/axis", "", "", "weather", "*", "", "" },
4646

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

0 commit comments

Comments
 (0)