Skip to content

Commit bd32aaa

Browse files
dguittetdguittet
committed
use "beam", "glob" and "diff" for irrad inputs for weather readers
1 parent aef7180 commit bd32aaa

9 files changed

+47
-47
lines changed

‎api/include/SAM_Irradproc.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@ extern "C"
8080
SAM_EXPORT void SAM_Irradproc_IrradianceProcessor_day_aset(SAM_table ptr, double* arr, int length, SAM_error *err);
8181

8282
/**
83-
* Set diffuse: Diffuse horizontal irradiance [W/m2]
83+
* Set diff: Diffuse horizontal irradiance [W/m2]
8484
* options: None
8585
* constraints: LENGTH_EQUAL=beam
8686
* required if: irrad_mode~1
8787
*/
88-
SAM_EXPORT void SAM_Irradproc_IrradianceProcessor_diffuse_aset(SAM_table ptr, double* arr, int length, SAM_error *err);
88+
SAM_EXPORT void SAM_Irradproc_IrradianceProcessor_diff_aset(SAM_table ptr, double* arr, int length, SAM_error *err);
8989

9090
/**
9191
* Set elevation: Elevation [m]
@@ -104,12 +104,12 @@ extern "C"
104104
SAM_EXPORT void SAM_Irradproc_IrradianceProcessor_gcr_nset(SAM_table ptr, double number, SAM_error *err);
105105

106106
/**
107-
* Set global: Global horizontal irradiance [W/m2]
107+
* Set glob: Global horizontal irradiance [W/m2]
108108
* options: None
109109
* constraints: LENGTH_EQUAL=beam
110110
* required if: irrad_mode~0
111111
*/
112-
SAM_EXPORT void SAM_Irradproc_IrradianceProcessor_global_aset(SAM_table ptr, double* arr, int length, SAM_error *err);
112+
SAM_EXPORT void SAM_Irradproc_IrradianceProcessor_glob_aset(SAM_table ptr, double* arr, int length, SAM_error *err);
113113

114114
/**
115115
* Set hour: Hour [hr]
@@ -240,13 +240,13 @@ extern "C"
240240

241241
SAM_EXPORT double* SAM_Irradproc_IrradianceProcessor_day_aget(SAM_table ptr, int* length, SAM_error *err);
242242

243-
SAM_EXPORT double* SAM_Irradproc_IrradianceProcessor_diffuse_aget(SAM_table ptr, int* length, SAM_error *err);
243+
SAM_EXPORT double* SAM_Irradproc_IrradianceProcessor_diff_aget(SAM_table ptr, int* length, SAM_error *err);
244244

245245
SAM_EXPORT double SAM_Irradproc_IrradianceProcessor_elevation_nget(SAM_table ptr, SAM_error *err);
246246

247247
SAM_EXPORT double SAM_Irradproc_IrradianceProcessor_gcr_nget(SAM_table ptr, SAM_error *err);
248248

249-
SAM_EXPORT double* SAM_Irradproc_IrradianceProcessor_global_aget(SAM_table ptr, int* length, SAM_error *err);
249+
SAM_EXPORT double* SAM_Irradproc_IrradianceProcessor_glob_aget(SAM_table ptr, int* length, SAM_error *err);
250250

251251
SAM_EXPORT double* SAM_Irradproc_IrradianceProcessor_hour_aget(SAM_table ptr, int* length, SAM_error *err);
252252

‎api/include/SAM_TcsgenericSolar.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ extern "C"
733733

734734
SAM_EXPORT double* SAM_TcsgenericSolar_Outputs_gen_aget(SAM_table ptr, int* length, SAM_error *err);
735735

736-
SAM_EXPORT double* SAM_TcsgenericSolar_Outputs_global_aget(SAM_table ptr, int* length, SAM_error *err);
736+
SAM_EXPORT double* SAM_TcsgenericSolar_Outputs_glob_aget(SAM_table ptr, int* length, SAM_error *err);
737737

738738
SAM_EXPORT double* SAM_TcsgenericSolar_Outputs_hour_aget(SAM_table ptr, int* length, SAM_error *err);
739739

‎api/include/SAM_Wfreader.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ extern "C"
6767

6868
SAM_EXPORT double SAM_Wfreader_Outputs_annual_beam_nget(SAM_table ptr, SAM_error *err);
6969

70-
SAM_EXPORT double SAM_Wfreader_Outputs_annual_diffuse_nget(SAM_table ptr, SAM_error *err);
70+
SAM_EXPORT double SAM_Wfreader_Outputs_annual_diff_nget(SAM_table ptr, SAM_error *err);
7171

72-
SAM_EXPORT double SAM_Wfreader_Outputs_annual_global_nget(SAM_table ptr, SAM_error *err);
72+
SAM_EXPORT double SAM_Wfreader_Outputs_annual_glob_nget(SAM_table ptr, SAM_error *err);
7373

7474
SAM_EXPORT double SAM_Wfreader_Outputs_annual_snow_nget(SAM_table ptr, SAM_error *err);
7575

@@ -87,13 +87,13 @@ extern "C"
8787

8888
SAM_EXPORT const char* SAM_Wfreader_Outputs_description_sget(SAM_table ptr, SAM_error *err);
8989

90-
SAM_EXPORT double* SAM_Wfreader_Outputs_diffuse_aget(SAM_table ptr, int* length, SAM_error *err);
90+
SAM_EXPORT double* SAM_Wfreader_Outputs_diff_aget(SAM_table ptr, int* length, SAM_error *err);
9191

9292
SAM_EXPORT double SAM_Wfreader_Outputs_elev_nget(SAM_table ptr, SAM_error *err);
9393

9494
SAM_EXPORT const char* SAM_Wfreader_Outputs_format_sget(SAM_table ptr, SAM_error *err);
9595

96-
SAM_EXPORT double* SAM_Wfreader_Outputs_global_aget(SAM_table ptr, int* length, SAM_error *err);
96+
SAM_EXPORT double* SAM_Wfreader_Outputs_glob_aget(SAM_table ptr, int* length, SAM_error *err);
9797

9898
SAM_EXPORT double* SAM_Wfreader_Outputs_hour_aget(SAM_table ptr, int* length, SAM_error *err);
9999

‎api/modules/SAM_Irradproc.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ SAM_EXPORT void SAM_Irradproc_IrradianceProcessor_day_aset(SAM_table ptr, double
5555
});
5656
}
5757

58-
SAM_EXPORT void SAM_Irradproc_IrradianceProcessor_diffuse_aset(SAM_table ptr, double* arr, int length, SAM_error *err){
58+
SAM_EXPORT void SAM_Irradproc_IrradianceProcessor_diff_aset(SAM_table ptr, double* arr, int length, SAM_error *err){
5959
translateExceptions(err, [&]{
60-
ssc_data_set_array(ptr, "diffuse", arr, length);
60+
ssc_data_set_array(ptr, "diff", arr, length);
6161
});
6262
}
6363

@@ -73,9 +73,9 @@ SAM_EXPORT void SAM_Irradproc_IrradianceProcessor_gcr_nset(SAM_table ptr, double
7373
});
7474
}
7575

76-
SAM_EXPORT void SAM_Irradproc_IrradianceProcessor_global_aset(SAM_table ptr, double* arr, int length, SAM_error *err){
76+
SAM_EXPORT void SAM_Irradproc_IrradianceProcessor_glob_aset(SAM_table ptr, double* arr, int length, SAM_error *err){
7777
translateExceptions(err, [&]{
78-
ssc_data_set_array(ptr, "global", arr, length);
78+
ssc_data_set_array(ptr, "glob", arr, length);
7979
});
8080
}
8181

@@ -232,12 +232,12 @@ SAM_EXPORT double* SAM_Irradproc_IrradianceProcessor_day_aget(SAM_table ptr, int
232232

233233

234234

235-
SAM_EXPORT double* SAM_Irradproc_IrradianceProcessor_diffuse_aget(SAM_table ptr, int* length, SAM_error *err){
235+
SAM_EXPORT double* SAM_Irradproc_IrradianceProcessor_diff_aget(SAM_table ptr, int* length, SAM_error *err){
236236
double* result = nullptr;
237237
translateExceptions(err, [&]{
238-
result = ssc_data_get_array(ptr, "diffuse", length);
238+
result = ssc_data_get_array(ptr, "diff", length);
239239
if (!result)
240-
make_access_error("SAM_Irradproc", "diffuse");
240+
make_access_error("SAM_Irradproc", "diff");
241241
});
242242
return result;
243243
}
@@ -266,12 +266,12 @@ SAM_EXPORT double SAM_Irradproc_IrradianceProcessor_gcr_nget(SAM_table ptr, SAM_
266266

267267

268268

269-
SAM_EXPORT double* SAM_Irradproc_IrradianceProcessor_global_aget(SAM_table ptr, int* length, SAM_error *err){
269+
SAM_EXPORT double* SAM_Irradproc_IrradianceProcessor_glob_aget(SAM_table ptr, int* length, SAM_error *err){
270270
double* result = nullptr;
271271
translateExceptions(err, [&]{
272-
result = ssc_data_get_array(ptr, "global", length);
272+
result = ssc_data_get_array(ptr, "glob", length);
273273
if (!result)
274-
make_access_error("SAM_Irradproc", "global");
274+
make_access_error("SAM_Irradproc", "glob");
275275
});
276276
return result;
277277
}

‎api/modules/SAM_TcsgenericSolar.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1373,12 +1373,12 @@ SAM_EXPORT double* SAM_TcsgenericSolar_Outputs_gen_aget(SAM_table ptr, int* leng
13731373

13741374

13751375

1376-
SAM_EXPORT double* SAM_TcsgenericSolar_Outputs_global_aget(SAM_table ptr, int* length, SAM_error *err){
1376+
SAM_EXPORT double* SAM_TcsgenericSolar_Outputs_glob_aget(SAM_table ptr, int* length, SAM_error *err){
13771377
double* result = nullptr;
13781378
translateExceptions(err, [&]{
1379-
result = ssc_data_get_array(ptr, "global", length);
1379+
result = ssc_data_get_array(ptr, "glob", length);
13801380
if (!result)
1381-
make_access_error("SAM_TcsgenericSolar", "global");
1381+
make_access_error("SAM_TcsgenericSolar", "glob");
13821382
});
13831383
return result;
13841384
}

‎api/modules/SAM_Wfreader.cpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -88,22 +88,22 @@ SAM_EXPORT double SAM_Wfreader_Outputs_annual_beam_nget(SAM_table ptr, SAM_error
8888

8989

9090

91-
SAM_EXPORT double SAM_Wfreader_Outputs_annual_diffuse_nget(SAM_table ptr, SAM_error *err){
91+
SAM_EXPORT double SAM_Wfreader_Outputs_annual_diff_nget(SAM_table ptr, SAM_error *err){
9292
double result;
9393
translateExceptions(err, [&]{
94-
if (!ssc_data_get_number(ptr, "annual_diffuse", &result))
95-
make_access_error("SAM_Wfreader", "annual_diffuse");
94+
if (!ssc_data_get_number(ptr, "annual_diff", &result))
95+
make_access_error("SAM_Wfreader", "annual_diff");
9696
});
9797
return result;
9898
}
9999

100100

101101

102-
SAM_EXPORT double SAM_Wfreader_Outputs_annual_global_nget(SAM_table ptr, SAM_error *err){
102+
SAM_EXPORT double SAM_Wfreader_Outputs_annual_glob_nget(SAM_table ptr, SAM_error *err){
103103
double result;
104104
translateExceptions(err, [&]{
105-
if (!ssc_data_get_number(ptr, "annual_global", &result))
106-
make_access_error("SAM_Wfreader", "annual_global");
105+
if (!ssc_data_get_number(ptr, "annual_glob", &result))
106+
make_access_error("SAM_Wfreader", "annual_glob");
107107
});
108108
return result;
109109
}
@@ -203,12 +203,12 @@ SAM_EXPORT const char* SAM_Wfreader_Outputs_description_sget(SAM_table ptr, SAM_
203203

204204

205205

206-
SAM_EXPORT double* SAM_Wfreader_Outputs_diffuse_aget(SAM_table ptr, int* length, SAM_error *err){
206+
SAM_EXPORT double* SAM_Wfreader_Outputs_diff_aget(SAM_table ptr, int* length, SAM_error *err){
207207
double* result = nullptr;
208208
translateExceptions(err, [&]{
209-
result = ssc_data_get_array(ptr, "diffuse", length);
209+
result = ssc_data_get_array(ptr, "diff", length);
210210
if (!result)
211-
make_access_error("SAM_Wfreader", "diffuse");
211+
make_access_error("SAM_Wfreader", "diff");
212212
});
213213
return result;
214214
}
@@ -238,12 +238,12 @@ SAM_EXPORT const char* SAM_Wfreader_Outputs_format_sget(SAM_table ptr, SAM_error
238238

239239

240240

241-
SAM_EXPORT double* SAM_Wfreader_Outputs_global_aget(SAM_table ptr, int* length, SAM_error *err){
241+
SAM_EXPORT double* SAM_Wfreader_Outputs_glob_aget(SAM_table ptr, int* length, SAM_error *err){
242242
double* result = nullptr;
243243
translateExceptions(err, [&]{
244-
result = ssc_data_get_array(ptr, "global", length);
244+
result = ssc_data_get_array(ptr, "glob", length);
245245
if (!result)
246-
make_access_error("SAM_Wfreader", "global");
246+
make_access_error("SAM_Wfreader", "glob");
247247
});
248248
return result;
249249
}

‎deploy/runtime/ui/Solar Resource Data Old.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1997,7 +1997,7 @@ equations{'file_name'} = define() {
19971997
// for compatibility with most SSC APIs
19981998
return ${solar_resource_file};
19991999
};
2000-
10429
2000+
10424
20012001

20022002
on_load{'Solar Resource Data'} = define() {
20032003
on_change{'use_specific_weather_file'}();
@@ -2020,9 +2020,9 @@ on_change{'solar_data_file_name'} = define() {
20202020
ssc_var( obj, 'file_name', wf );
20212021
if ( 0 == ssc_exec( obj, 'wfreader' ) )
20222022
{
2023-
value( 'annual_global', ssc_var(obj, 'annual_global') );
2023+
value( 'annual_global', ssc_var(obj, 'annual_glob') );
20242024
value( 'annual_beam', ssc_var(obj, 'annual_beam') );
2025-
value( 'annual_diffuse', ssc_var(obj, 'annual_diffuse') );
2025+
value( 'annual_diffuse', ssc_var(obj, 'annual_diff') );
20262026
value( 'annual_tdry', ssc_var(obj, 'annual_tdry') );
20272027
value( 'annual_wspd', ssc_var(obj, 'annual_wspd') );
20282028
value( 'annual_snow', ssc_var(obj, 'annual_snow') );

‎deploy/runtime/ui/Solar Resource Data.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2624,7 +2624,7 @@ equations{'ui_step_minutes'} = define() {
26242624
return(${step}/60);
26252625
};
26262626

2627-
32190
2627+
32185
26282628
on_load{'Solar Resource Data'} = define() {
26292629
//msgbox('on load');
26302630
//hide legacy data for 2020.2.29 Patch 3
@@ -2917,9 +2917,9 @@ function update_info( ctxt )
29172917
result = ssc_exec( obj, 'wfreader' );
29182918
if ( 0 == result )
29192919
{
2920-
value( 'annual_global', ssc_var(obj, 'annual_global') );
2920+
value( 'annual_global', ssc_var(obj, 'annual_glob') );
29212921
value( 'annual_beam', ssc_var(obj, 'annual_beam') );
2922-
value( 'annual_diffuse', ssc_var(obj, 'annual_diffuse') );
2922+
value( 'annual_diffuse', ssc_var(obj, 'annual_diff') );
29232923
value( 'annual_tdry', ssc_var(obj, 'annual_tdry') );
29242924
value( 'annual_wspd', ssc_var(obj, 'annual_wspd') );
29252925
value( 'annual_snow', ssc_var(obj, 'annual_snow') );

‎src/invoke.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ static void fcall_dview_solar_data_file( lk::invoke_t &cxt )
179179
// this information is consistent with the variable definitions in the wfreader module
180180
wfvec vars[] = {
181181
{ "beam", "Beam irradiance - DNI", "W/m2" },
182-
{ "diffuse","Diffuse irradiance - DHI", "W/m2" },
183-
{ "global", "Global irradiance - GHI", "W/m2" },
182+
{ "diff","Diffuse irradiance - DHI", "W/m2" },
183+
{ "glob", "Global irradiance - GHI", "W/m2" },
184184
{ "poa", "Plane of array irradiance -POA", "W/m2" },
185185
{ "wspd", "Wind speed", "m/s" },
186186
{ "wdir", "Wind direction", "deg" },
@@ -589,7 +589,7 @@ static void fcall_metric_row(lk::invoke_t& cxt)
589589
int deci = wxAtoi(decis[i]);
590590
md.deci = deci;
591591
}
592-
592+
593593
if ( i < thouseps.GetCount()) {
594594
wxString mm = thouseps[i];
595595
mm.MakeLower();
@@ -2925,7 +2925,7 @@ void fcall_urdb_get(lk::invoke_t &cxt)
29252925
// URLs
29262926
cxt.result().hash_item("rateurl").assign(rate.Header.RateURL);
29272927
cxt.result().hash_item("jsonurl").assign(rate.Header.JSONURL);
2928-
2928+
29292929
// metering option
29302930
// "Net Metering", "Net Billing Instantaneous", "Net Billing Hourly", or "Buy All Sell All"
29312931
if (rate.DgRules == "Net Metering")
@@ -2941,7 +2941,7 @@ void fcall_urdb_get(lk::invoke_t &cxt)
29412941
cxt.result().hash_item("metering_option").assign(0.0);
29422942
rate_notes.append(wxString::Format("Metering option not provided with rate data.\n"));
29432943
}
2944-
2944+
29452945
// fixed charges
29462946
// "$/day", "$/month" or "$/year" TO DO handle $/day and $/year
29472947
double fixed_charges = rate.FixedChargeFirstMeter + rate.FixedChargeAddlMeter;

0 commit comments

Comments
 (0)