From 5e909bed730da284c32785ece98932166d8c41a1 Mon Sep 17 00:00:00 2001 From: sjanzou Date: Tue, 21 Feb 2023 02:44:37 -0700 Subject: [PATCH] Fix pysam issue 138 - change all weather group names to "weather" case sensitive --- ssc/cmod_linear_fresnel_dsg_iph.cpp | 4 ++-- ssc/cmod_mspt_sf_and_rec_isolated.cpp | 10 +++++----- ssc/cmod_pv6parmod.cpp | 20 ++++++++++---------- ssc/cmod_pvwattsv0.cpp | 2 +- ssc/cmod_pvwattsv1.cpp | 2 +- ssc/cmod_pvwattsv1_poa.cpp | 14 +++++++------- ssc/cmod_tcsdish.cpp | 8 ++++---- ssc/cmod_tcsgeneric_solar.cpp | 8 ++++---- ssc/cmod_tcslinear_fresnel.cpp | 8 ++++---- ssc/cmod_tcsmslf.cpp | 8 ++++---- ssc/cmod_tcstrough_empirical.cpp | 8 ++++---- ssc/cmod_tcstrough_physical.cpp | 8 ++++---- ssc/cmod_tcstrough_physical_csp_solver.cpp | 8 ++++---- ssc/cmod_trough_physical.cpp | 2 +- ssc/cmod_trough_physical_iph.cpp | 10 +++++----- 15 files changed, 60 insertions(+), 60 deletions(-) diff --git a/ssc/cmod_linear_fresnel_dsg_iph.cpp b/ssc/cmod_linear_fresnel_dsg_iph.cpp index 9b9e1d15e..63c8f73a6 100644 --- a/ssc/cmod_linear_fresnel_dsg_iph.cpp +++ b/ssc/cmod_linear_fresnel_dsg_iph.cpp @@ -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 diff --git a/ssc/cmod_mspt_sf_and_rec_isolated.cpp b/ssc/cmod_mspt_sf_and_rec_isolated.cpp index e37456f90..23808dce5 100644 --- a/ssc/cmod_mspt_sf_and_rec_isolated.cpp +++ b/ssc/cmod_mspt_sf_and_rec_isolated.cpp @@ -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 diff --git a/ssc/cmod_pv6parmod.cpp b/ssc/cmod_pv6parmod.cpp index 6cb39c3c6..2530e488b 100644 --- a/ssc/cmod_pv6parmod.cpp +++ b/ssc/cmod_pv6parmod.cpp @@ -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", "?" "", "" }, diff --git a/ssc/cmod_pvwattsv0.cpp b/ssc/cmod_pvwattsv0.cpp index a4dfa7ec6..612bd039b 100644 --- a/ssc/cmod_pvwattsv0.cpp +++ b/ssc/cmod_pvwattsv0.cpp @@ -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", "" }, diff --git a/ssc/cmod_pvwattsv1.cpp b/ssc/cmod_pvwattsv1.cpp index 8d18df7a1..5da59a510 100644 --- a/ssc/cmod_pvwattsv1.cpp +++ b/ssc/cmod_pvwattsv1.cpp @@ -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", "*", "", "" }, diff --git a/ssc/cmod_pvwattsv1_poa.cpp b/ssc/cmod_pvwattsv1_poa.cpp index 32655eb13..910244273 100644 --- a/ssc/cmod_pvwattsv1_poa.cpp +++ b/ssc/cmod_pvwattsv1_poa.cpp @@ -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", "" }, diff --git a/ssc/cmod_tcsdish.cpp b/ssc/cmod_tcsdish.cpp index 42c933d83..07ab59a06 100644 --- a/ssc/cmod_tcsdish.cpp +++ b/ssc/cmod_tcsdish.cpp @@ -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", "*", "", "" }, diff --git a/ssc/cmod_tcsgeneric_solar.cpp b/ssc/cmod_tcsgeneric_solar.cpp index b6547548a..42c46d97b 100644 --- a/ssc/cmod_tcsgeneric_solar.cpp +++ b/ssc/cmod_tcsgeneric_solar.cpp @@ -40,10 +40,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. static var_info _cm_vtab_tcsgeneric_solar[] = { // 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", "", "generic solar", "*", "", "" }, diff --git a/ssc/cmod_tcslinear_fresnel.cpp b/ssc/cmod_tcslinear_fresnel.cpp index 1d624f7c9..c2ca347bc 100644 --- a/ssc/cmod_tcslinear_fresnel.cpp +++ b/ssc/cmod_tcslinear_fresnel.cpp @@ -44,10 +44,10 @@ static var_info _cm_vtab_tcslinear_fresnel[] = { */ // 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", "", "linear fresnelr", "*", "", "" }, // TOU diff --git a/ssc/cmod_tcsmslf.cpp b/ssc/cmod_tcsmslf.cpp index 523ca7747..cc5ea87a6 100644 --- a/ssc/cmod_tcsmslf.cpp +++ b/ssc/cmod_tcsmslf.cpp @@ -37,10 +37,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. static var_info _cm_vtab_tcsmslf[] = { // 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", "", "mslf", "*", "", "" }, // TOU diff --git a/ssc/cmod_tcstrough_empirical.cpp b/ssc/cmod_tcstrough_empirical.cpp index f649cdda5..4022f12bd 100644 --- a/ssc/cmod_tcstrough_empirical.cpp +++ b/ssc/cmod_tcstrough_empirical.cpp @@ -38,10 +38,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. static var_info _cm_vtab_tcstrough_empirical[] = { /* 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", "", "trough", "*", "", "" }, // { SSC_INPUT, SSC_NUMBER, "SolarAz", "Solar azimuth angle reported by the Type15 weather file", "deg", "", "solarfield", "*", "", "" }, diff --git a/ssc/cmod_tcstrough_physical.cpp b/ssc/cmod_tcstrough_physical.cpp index 02bc9c365..f4debf99b 100644 --- a/ssc/cmod_tcstrough_physical.cpp +++ b/ssc/cmod_tcstrough_physical.cpp @@ -42,10 +42,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. static var_info _cm_vtab_tcstrough_physical[] = { // weather reader inputs // VARTYPE DATATYPE NAME LABEL UNITS META GROUP REQUIRED_IF CONSTRAINTS UI_HINTS - { SSC_INPUT, SSC_STRING, "file_name", "Local weather file with path", "none", "", "Weather", "*", "LOCAL_FILE", "" }, - { SSC_INPUT, SSC_NUMBER, "track_mode", "Tracking mode", "none", "", "Weather", "*", "", "" }, - { SSC_INPUT, SSC_NUMBER, "tilt", "Tilt angle of surface/axis", "none", "", "Weather", "*", "", "" }, - { SSC_INPUT, SSC_NUMBER, "azimuth", "Azimuth angle of surface/axis", "none", "", "Weather", "*", "", "" }, + { SSC_INPUT, SSC_STRING, "file_name", "Local weather file with path", "none", "", "weather", "*", "LOCAL_FILE", "" }, + { SSC_INPUT, SSC_NUMBER, "track_mode", "Tracking mode", "none", "", "weather", "*", "", "" }, + { SSC_INPUT, SSC_NUMBER, "tilt", "Tilt angle of surface/axis", "none", "", "weather", "*", "", "" }, + { SSC_INPUT, SSC_NUMBER, "azimuth", "Azimuth angle of surface/axis", "none", "", "weather", "*", "", "" }, { SSC_INPUT, SSC_NUMBER, "system_capacity", "Nameplate capacity", "kW", "", "trough", "*", "", "" }, // solar field (type 250) inputs diff --git a/ssc/cmod_tcstrough_physical_csp_solver.cpp b/ssc/cmod_tcstrough_physical_csp_solver.cpp index c7e49b140..ff5249226 100644 --- a/ssc/cmod_tcstrough_physical_csp_solver.cpp +++ b/ssc/cmod_tcstrough_physical_csp_solver.cpp @@ -48,10 +48,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. static var_info _cm_vtab_trough_physical_csp_solver[] = { // weather reader inputs // VARTYPE DATATYPE NAME LABEL UNITS META GROUP REQUIRED_IF CONSTRAINTS UI_HINTS - { SSC_INPUT, SSC_STRING, "file_name", "Local weather file with path", "none", "", "Weather", "*", "LOCAL_FILE", "" }, - { SSC_INPUT, SSC_NUMBER, "track_mode", "Tracking mode", "none", "", "Weather", "*", "", "" }, - { SSC_INPUT, SSC_NUMBER, "tilt", "Tilt angle of surface/axis", "none", "", "Weather", "*", "", "" }, - { SSC_INPUT, SSC_NUMBER, "azimuth", "Azimuth angle of surface/axis", "none", "", "Weather", "*", "", "" }, + { SSC_INPUT, SSC_STRING, "file_name", "Local weather file with path", "none", "", "weather", "*", "LOCAL_FILE", "" }, + { SSC_INPUT, SSC_NUMBER, "track_mode", "Tracking mode", "none", "", "weather", "*", "", "" }, + { SSC_INPUT, SSC_NUMBER, "tilt", "Tilt angle of surface/axis", "none", "", "weather", "*", "", "" }, + { SSC_INPUT, SSC_NUMBER, "azimuth", "Azimuth angle of surface/axis", "none", "", "weather", "*", "", "" }, { SSC_INPUT, SSC_NUMBER, "system_capacity", "Nameplate capacity", "kW", "", "trough", "*", "", "" }, { SSC_INPUT, SSC_NUMBER, "ppa_multiplier_model", "PPA multiplier model", "0/1", "0=diurnal,1=timestep", "Time of Delivery", "?=0", "INTEGER,MIN=0", "" }, diff --git a/ssc/cmod_trough_physical.cpp b/ssc/cmod_trough_physical.cpp index 3dd0cd547..f85186ea7 100644 --- a/ssc/cmod_trough_physical.cpp +++ b/ssc/cmod_trough_physical.cpp @@ -58,7 +58,7 @@ static var_info _cm_vtab_trough_physical[] = { /* VARTYPE DATATYPE NAME LABEL UNITS META GROUP REQUIRED_IF CONSTRAINTS UI_HINTS*/ // Weather Reader { SSC_INPUT, SSC_STRING, "file_name", "Local weather file with path", "none", "", "weather", "?", "LOCAL_FILE", "" }, - { SSC_INPUT, SSC_TABLE, "solar_resource_data", "Weather resource data in memory", "", "", "Weather", "?", "", "" }, + { SSC_INPUT, SSC_TABLE, "solar_resource_data", "Weather resource data in memory", "", "", "weather", "?", "", "" }, //{ SSC_INPUT, SSC_NUMBER, "track_mode", "Tracking mode", "none", "", "weather", "*", "", "" }, // Solar Field, Trough diff --git a/ssc/cmod_trough_physical_iph.cpp b/ssc/cmod_trough_physical_iph.cpp index 9a54a1f79..bd1ed1733 100644 --- a/ssc/cmod_trough_physical_iph.cpp +++ b/ssc/cmod_trough_physical_iph.cpp @@ -57,11 +57,11 @@ static var_info _cm_vtab_trough_physical_process_heat[] = { // weather reader inputs // VARTYPE DATATYPE NAME LABEL UNITS META GROUP REQUIRED_IF CONSTRAINTS UI_HINTS - { SSC_INPUT, SSC_STRING, "file_name", "Local weather file with path", "none", "", "Weather", "?", "LOCAL_FILE", "" }, - { SSC_INPUT, SSC_TABLE, "solar_resource_data", "Weather resource data in memory", "", "", "Weather", "?", "", "" }, - { SSC_INPUT, SSC_NUMBER, "track_mode", "Tracking mode", "none", "", "Weather", "*", "", "" }, - { SSC_INPUT, SSC_NUMBER, "tilt", "Tilt angle of surface/axis", "none", "", "Weather", "*", "", "" }, - { SSC_INPUT, SSC_NUMBER, "azimuth", "Azimuth angle of surface/axis", "none", "", "Weather", "*", "", "" }, + { SSC_INPUT, SSC_STRING, "file_name", "Local weather file with path", "none", "", "weather", "?", "LOCAL_FILE", "" }, + { SSC_INPUT, SSC_TABLE, "solar_resource_data", "Weather resource data in memory", "", "", "weather", "?", "", "" }, + { SSC_INPUT, SSC_NUMBER, "track_mode", "Tracking mode", "none", "", "weather", "*", "", "" }, + { SSC_INPUT, SSC_NUMBER, "tilt", "Tilt angle of surface/axis", "none", "", "weather", "*", "", "" }, + { SSC_INPUT, SSC_NUMBER, "azimuth", "Azimuth angle of surface/axis", "none", "", "weather", "*", "", "" }, //{ SSC_INPUT, SSC_NUMBER, "system_capacity", "Nameplate capacity", "kW", "", "trough", "*", "", "" },