Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
a6781aa
Initial changes for solar resource UI form updates
cpaulgilman Mar 21, 2025
bfea365
Initial implementation of lat/lon parse in GeoTools
cpaulgilman Mar 25, 2025
5678ebe
Merge branch 'develop' into sam-1426-parse-lat-lon
cpaulgilman Mar 25, 2025
3a86ab9
Support coordinates in different formats
cpaulgilman Apr 4, 2025
bb772a1
Merge branch 'develop' into sam-1426-parse-lat-lon
cpaulgilman Apr 4, 2025
094285f
Merge branch 'develop' into sam-1426-parse-lat-lon
cpaulgilman Apr 4, 2025
049bec7
Use shorter double in string for lat/lon zip code search
cpaulgilman Apr 4, 2025
a806a99
Merge branch 'develop' into sam-1426-parse-lat-lon
cpaulgilman Apr 8, 2025
3e986b8
Merge branch 'develop' into sam-1426-parse-lat-lon
cpaulgilman Apr 17, 2025
15b116a
Merge branch 'develop' into sam-1426-parse-lat-lon
cpaulgilman Apr 24, 2025
75e7068
Merge branch 'develop' into sam-1426-parse-lat-lon
cpaulgilman Jul 11, 2025
dcbe2c7
Remove lat/lon inputs
cpaulgilman Aug 1, 2025
cd9fabb
test wchar_t for location inputs
cpaulgilman Aug 1, 2025
73efe5c
Merge branch 'develop' into sam-1426-parse-lat-lon
cpaulgilman Aug 1, 2025
9b178e2
adapted for new geocode/time zone API -- in progress
cpaulgilman Aug 5, 2025
c7454fa
Fix inconsistent string declarations
cpaulgilman Aug 14, 2025
8f7b912
Clean up code
cpaulgilman Aug 15, 2025
11f172e
Improve solar resource download UI form
cpaulgilman Aug 15, 2025
d12763d
Remove `n_location` "Type a location name, street address, or lat,lon…
cpaulgilman Aug 15, 2025
7ed5550
Merge branch 'develop' into sam-1426-parse-lat-lon
cpaulgilman Aug 15, 2025
76efdb8
Make divider object respond to show/hide
cpaulgilman Aug 18, 2025
4efecc4
Remove test solar resource file
cpaulgilman Aug 20, 2025
e16fff9
Update solar resource UI forms
cpaulgilman Aug 22, 2025
6fa6da1
Merge branch 'develop' into sam-1426-parse-lat-lon
cpaulgilman Sep 11, 2025
68dd4c5
Separate geocode and time zone functions
cpaulgilman Sep 12, 2025
33f4921
Initial implementation of solar resource UI redesign for PVWatts / No…
cpaulgilman Sep 12, 2025
b1fc809
NSRDB advanced download fixes
cpaulgilman Sep 12, 2025
b2350bf
Fix function declaration
cpaulgilman Sep 15, 2025
5c81e56
Update UI for Mac
cpaulgilman Sep 17, 2025
6682fe4
Adjust UI for Mac
cpaulgilman Sep 18, 2025
89926cc
Improve messaging when NSRDB Data Query fails
cpaulgilman Sep 19, 2025
196918a
Fix Solar Resource Download caption
cpaulgilman Sep 19, 2025
259b904
Revise weather file on disk UI messages
cpaulgilman Sep 22, 2025
83cd19b
clean up code comments
cpaulgilman Sep 23, 2025
32c4149
Implement solar resource UI for all techs
cpaulgilman Sep 23, 2025
a6a0eab
Delete Solar Resource Data.json
cpaulgilman Sep 23, 2025
bd9fda4
Remove `solar_data_file_name_load` from defaults
cpaulgilman Sep 23, 2025
da1c4b0
api_autogen updates for solar resource UI form name change
cpaulgilman Sep 23, 2025
c9862ce
Merge branch 'develop' into sam-1426-parse-lat-lon
cpaulgilman Sep 26, 2025
33501d3
Fix defaults for `solar_data_filename_load` and `prop_tax_cost_assess…
cpaulgilman Sep 30, 2025
36c5eef
Fix labels and text for Solar Resource options
cpaulgilman Oct 1, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"defaults": {
"SolarResourceData": {
"SolarResourceInformation": {
},
"PVWatts": {
"system_capacity": 1126.66
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"defaults": {
"SolarResourceData": {
"SolarResourceInformation": {
},
"PVWatts": {
"system_capacity": 1126.66
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"defaults": {
"SolarResourceData": {
"SolarResourceInformation": {
},
"PVWatts": {
"system_capacity": 1126.66
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"defaults": {
"SolarResourceData": {
"SolarResourceInformation": {
},
"PVWatts": {
"system_capacity": 1126.66
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"defaults": {
"SolarResourceData": {
"SolarResourceInformation": {
},
"PVWatts": {
"system_capacity": 1126.66
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"defaults": {
"SolarResourceData": {
"SolarResourceInformation": {
},
"PVWatts": {
"system_capacity": 1126.66
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"defaults": {
"SolarResourceData": {
"SolarResourceInformation": {
},
"PVWatts": {
"system_capacity": 1126.66
Expand Down
8 changes: 4 additions & 4 deletions api/include/SAM_Hcpv.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ extern "C"


//
// SolarResourceData parameters
// SolarResourceInformation parameters
//

/**
Expand All @@ -37,7 +37,7 @@ extern "C"
* constraints: LOCAL_FILE
* required if: *
*/
SAM_EXPORT void SAM_Hcpv_SolarResourceData_file_name_sset(SAM_table ptr, const char* str, SAM_error *err);
SAM_EXPORT void SAM_Hcpv_SolarResourceInformation_file_name_sset(SAM_table ptr, const char* str, SAM_error *err);


//
Expand Down Expand Up @@ -474,10 +474,10 @@ extern "C"


/**
* SolarResourceData Getters
* SolarResourceInformation Getters
*/

SAM_EXPORT const char* SAM_Hcpv_SolarResourceData_file_name_sget(SAM_table ptr, SAM_error *err);
SAM_EXPORT const char* SAM_Hcpv_SolarResourceInformation_file_name_sget(SAM_table ptr, SAM_error *err);


/**
Expand Down
4 changes: 2 additions & 2 deletions api/modules/SAM_Hcpv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ SAM_EXPORT int SAM_Hcpv_execute(SAM_table data, int verbosity, SAM_error* err){
return SAM_module_exec("hcpv", data, verbosity, err);
}

SAM_EXPORT void SAM_Hcpv_SolarResourceData_file_name_sset(SAM_table ptr, const char* str, SAM_error *err){
SAM_EXPORT void SAM_Hcpv_SolarResourceInformation_file_name_sset(SAM_table ptr, const char* str, SAM_error *err){
translateExceptions(err, [&]{
ssc_data_set_string(ptr, "file_name", str);
});
Expand Down Expand Up @@ -326,7 +326,7 @@ SAM_EXPORT void SAM_Hcpv_AdjustmentFactors_adjust_timeindex_aset(SAM_table ptr,
});
}

SAM_EXPORT const char* SAM_Hcpv_SolarResourceData_file_name_sget(SAM_table ptr, SAM_error *err){
SAM_EXPORT const char* SAM_Hcpv_SolarResourceInformation_file_name_sget(SAM_table ptr, SAM_error *err){
const char* result = nullptr;
translateExceptions(err, [&]{
result = ssc_data_get_string(ptr, "file_name");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"biopwr.feedstock.bagasse_c": 0.4695,
"biopwr.feedstock.bagasse_frac": 0.0,
"biopwr.feedstock.bagasse_h": 0.0547,
"biopwr.feedstock.bagasse_hhv": 8146.6050000000009,
"biopwr.feedstock.bagasse_hhv": 8146.605000000001,
"biopwr.feedstock.bagasse_lhv": 7894.760730000001,
"biopwr.feedstock.bagasse_moisture": 100.0,
"biopwr.feedstock.bagasse_moisture_wet": 50.0,
Expand Down Expand Up @@ -256,7 +256,7 @@
"biopwr.feedstock.total_h": 0.05368872073764044,
"biopwr.feedstock.total_hhv": 7668.698347232303,
"biopwr.feedstock.total_lhv": 7194.0304069514299,
"biopwr.feedstock.total_moisture": 0.36564341449200718,
"biopwr.feedstock.total_moisture": 0.3656434144920072,
"biopwr.feedstock.total_nameplate": 48535.59310191071,
"biopwr.feedstock.total_o": 0.5115152836845535,
"biopwr.feedstock.urban_ash": 0.0125,
Expand All @@ -266,7 +266,7 @@
"biopwr.feedstock.urban_h": 0.05988,
"biopwr.feedstock.urban_hhv": 7791.0,
"biopwr.feedstock.urban_lhv": 7399.0,
"biopwr.feedstock.urban_moisture": 13.636363636363635,
"biopwr.feedstock.urban_moisture": 13.636363636363637,
"biopwr.feedstock.urban_moisture_wet": 12.0,
"biopwr.feedstock.urban_o": 0.4449,
"biopwr.feedstock.urban_obtainable": 10.0,
Expand All @@ -279,7 +279,7 @@
"biopwr.feedstock.wheat_h": 0.0532,
"biopwr.feedstock.wheat_hhv": 7661.2479,
"biopwr.feedstock.wheat_lhv": 7107.9666,
"biopwr.feedstock.wheat_moisture": 13.636363636363635,
"biopwr.feedstock.wheat_moisture": 13.636363636363637,
"biopwr.feedstock.wheat_moisture_wet": 12.0,
"biopwr.feedstock.wheat_o": 0.4914,
"biopwr.feedstock.wheat_obtainable": 10.0,
Expand Down Expand Up @@ -482,7 +482,7 @@
"const_per_upfront_rate5": 0.0,
"construction_financing_cost": 5254747.836993514,
"cost_dev_fee_percent": 3.0,
"cost_dev_fee_tax_liability": 1593239.5441764335,
"cost_dev_fee_tax_liability": 1593239.5441764338,
"cost_dev_fee_value": 6005426.099421159,
"cost_equity_closing": 300000.0,
"cost_other_financing": 0.0,
Expand Down Expand Up @@ -18765,7 +18765,7 @@
"ibi_uti_percent_maxvalue": 1e38,
"ibi_uti_percent_tax_fed": 1.0,
"ibi_uti_percent_tax_sta": 1.0,
"in_location": "Type a location name, street address, or lat,lon in decimal degrees",
"in_location": "",
"in_location_list": "|||",
"in_location_options": 0.0,
"in_nsrdb_options": 0.0,
Expand Down Expand Up @@ -19449,7 +19449,7 @@
"mera_name3": "Replacement Reserve 3",
"months_receivables_reserve": 0.0,
"months_working_reserve": 6.0,
"nominal_discount_rate": 9.060000000000003,
"nominal_discount_rate": 9.060000000000004,
"om_capacity": [
110.0
],
Expand Down Expand Up @@ -19536,7 +19536,6 @@
"show_ReserveAccounts": 1.0,
"show_construction_period": 1.0,
"solar_data_file_name": "fargo_nd_46.9_-96.8_mts1_60_tmy.csv",
"solar_data_file_name_load": "fargo_nd_46.9_-96.8_mts1_60_tmy.csv",
"solar_data_source": "TMY2",
"solar_resource": "fargo_nd_46.9_-96.8_mts1_60_tmy",
"solar_resource_file": "fargo_nd_46.9_-96.8_mts1_60_tmy.csv",
Expand Down
11 changes: 5 additions & 6 deletions deploy/runtime/defaults/Biopower_LCOE Calculator.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"biopwr.feedstock.bagasse_c": 0.4695,
"biopwr.feedstock.bagasse_frac": 0.0,
"biopwr.feedstock.bagasse_h": 0.0547,
"biopwr.feedstock.bagasse_hhv": 8146.6050000000009,
"biopwr.feedstock.bagasse_hhv": 8146.605000000001,
"biopwr.feedstock.bagasse_lhv": 7894.760730000001,
"biopwr.feedstock.bagasse_moisture": 100.0,
"biopwr.feedstock.bagasse_moisture_wet": 50.0,
Expand Down Expand Up @@ -217,7 +217,7 @@
"biopwr.feedstock.total_h": 0.05368872073764044,
"biopwr.feedstock.total_hhv": 7668.698347232303,
"biopwr.feedstock.total_lhv": 7194.0304069514299,
"biopwr.feedstock.total_moisture": 0.36564341449200718,
"biopwr.feedstock.total_moisture": 0.3656434144920072,
"biopwr.feedstock.total_nameplate": 48535.59310191071,
"biopwr.feedstock.total_o": 0.5115152836845535,
"biopwr.feedstock.urban_ash": 0.0125,
Expand All @@ -227,7 +227,7 @@
"biopwr.feedstock.urban_h": 0.05988,
"biopwr.feedstock.urban_hhv": 7791.0,
"biopwr.feedstock.urban_lhv": 7399.0,
"biopwr.feedstock.urban_moisture": 13.636363636363635,
"biopwr.feedstock.urban_moisture": 13.636363636363637,
"biopwr.feedstock.urban_moisture_wet": 12.0,
"biopwr.feedstock.urban_o": 0.4449,
"biopwr.feedstock.urban_obtainable": 10.0,
Expand All @@ -240,7 +240,7 @@
"biopwr.feedstock.wheat_h": 0.0532,
"biopwr.feedstock.wheat_hhv": 7661.2479,
"biopwr.feedstock.wheat_lhv": 7107.9666,
"biopwr.feedstock.wheat_moisture": 13.636363636363635,
"biopwr.feedstock.wheat_moisture": 13.636363636363637,
"biopwr.feedstock.wheat_moisture_wet": 12.0,
"biopwr.feedstock.wheat_o": 0.4914,
"biopwr.feedstock.wheat_obtainable": 10.0,
Expand Down Expand Up @@ -9124,7 +9124,7 @@
1e38
],
"grid_interconnection_limit_kwac": 20000.0,
"in_location": "Type a location name, street address, or lat,lon in decimal degrees",
"in_location": "",
"in_location_list": "|||",
"in_location_options": 0.0,
"in_nsrdb_options": 0.0,
Expand All @@ -9135,7 +9135,6 @@
"library_paths": "",
"lon": -96.8,
"solar_data_file_name": "fargo_nd_46.9_-96.8_mts1_60_tmy.csv",
"solar_data_file_name_load": "fargo_nd_46.9_-96.8_mts1_60_tmy.csv",
"solar_data_source": "TMY2",
"solar_resource": "fargo_nd_46.9_-96.8_mts1_60_tmy",
"solar_resource_file": "fargo_nd_46.9_-96.8_mts1_60_tmy.csv",
Expand Down
15 changes: 7 additions & 8 deletions deploy/runtime/defaults/Biopower_Leveraged Partnership Flip.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"biopwr.feedstock.bagasse_c": 0.4695,
"biopwr.feedstock.bagasse_frac": 0.0,
"biopwr.feedstock.bagasse_h": 0.0547,
"biopwr.feedstock.bagasse_hhv": 8146.6050000000009,
"biopwr.feedstock.bagasse_hhv": 8146.605000000001,
"biopwr.feedstock.bagasse_lhv": 7894.760730000001,
"biopwr.feedstock.bagasse_moisture": 100.0,
"biopwr.feedstock.bagasse_moisture_wet": 50.0,
Expand Down Expand Up @@ -256,7 +256,7 @@
"biopwr.feedstock.total_h": 0.05368872073764044,
"biopwr.feedstock.total_hhv": 7668.698347232303,
"biopwr.feedstock.total_lhv": 7194.0304069514299,
"biopwr.feedstock.total_moisture": 0.36564341449200718,
"biopwr.feedstock.total_moisture": 0.3656434144920072,
"biopwr.feedstock.total_nameplate": 48535.59310191071,
"biopwr.feedstock.total_o": 0.5115152836845535,
"biopwr.feedstock.urban_ash": 0.0125,
Expand All @@ -266,7 +266,7 @@
"biopwr.feedstock.urban_h": 0.05988,
"biopwr.feedstock.urban_hhv": 7791.0,
"biopwr.feedstock.urban_lhv": 7399.0,
"biopwr.feedstock.urban_moisture": 13.636363636363635,
"biopwr.feedstock.urban_moisture": 13.636363636363637,
"biopwr.feedstock.urban_moisture_wet": 12.0,
"biopwr.feedstock.urban_o": 0.4449,
"biopwr.feedstock.urban_obtainable": 10.0,
Expand All @@ -279,7 +279,7 @@
"biopwr.feedstock.wheat_h": 0.0532,
"biopwr.feedstock.wheat_hhv": 7661.2479,
"biopwr.feedstock.wheat_lhv": 7107.9666,
"biopwr.feedstock.wheat_moisture": 13.636363636363635,
"biopwr.feedstock.wheat_moisture": 13.636363636363637,
"biopwr.feedstock.wheat_moisture_wet": 12.0,
"biopwr.feedstock.wheat_o": 0.4914,
"biopwr.feedstock.wheat_obtainable": 10.0,
Expand Down Expand Up @@ -484,7 +484,7 @@
"cost_debt_closing": 0.0,
"cost_debt_fee": 2.75,
"cost_dev_fee_percent": 3.0,
"cost_dev_fee_tax_liability": 1593239.5441764335,
"cost_dev_fee_tax_liability": 1593239.5441764338,
"cost_dev_fee_value": 6005426.099421159,
"cost_equity_closing": 300000.0,
"cost_other_financing": 0.0,
Expand Down Expand Up @@ -18773,7 +18773,7 @@
"ibi_uti_percent_maxvalue": 1e38,
"ibi_uti_percent_tax_fed": 1.0,
"ibi_uti_percent_tax_sta": 1.0,
"in_location": "Type a location name, street address, or lat,lon in decimal degrees",
"in_location": "",
"in_location_list": "|||",
"in_location_options": 0.0,
"in_nsrdb_options": 0.0,
Expand Down Expand Up @@ -19458,7 +19458,7 @@
"mera_name3": "Replacement Reserve 3",
"months_receivables_reserve": 0.0,
"months_working_reserve": 6.0,
"nominal_discount_rate": 9.060000000000003,
"nominal_discount_rate": 9.060000000000004,
"om_capacity": [
110.0
],
Expand Down Expand Up @@ -19547,7 +19547,6 @@
"show_ReserveAccounts": 1.0,
"show_construction_period": 1.0,
"solar_data_file_name": "fargo_nd_46.9_-96.8_mts1_60_tmy.csv",
"solar_data_file_name_load": "fargo_nd_46.9_-96.8_mts1_60_tmy.csv",
"solar_data_source": "TMY2",
"solar_resource": "fargo_nd_46.9_-96.8_mts1_60_tmy",
"solar_resource_file": "fargo_nd_46.9_-96.8_mts1_60_tmy.csv",
Expand Down
15 changes: 7 additions & 8 deletions deploy/runtime/defaults/Biopower_Merchant Plant.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"biopwr.feedstock.bagasse_c": 0.4695,
"biopwr.feedstock.bagasse_frac": 0.0,
"biopwr.feedstock.bagasse_h": 0.0547,
"biopwr.feedstock.bagasse_hhv": 8146.6050000000009,
"biopwr.feedstock.bagasse_hhv": 8146.605000000001,
"biopwr.feedstock.bagasse_lhv": 7894.760730000001,
"biopwr.feedstock.bagasse_moisture": 100.0,
"biopwr.feedstock.bagasse_moisture_wet": 50.0,
Expand Down Expand Up @@ -256,7 +256,7 @@
"biopwr.feedstock.total_h": 0.05368872073764044,
"biopwr.feedstock.total_hhv": 7668.698347232303,
"biopwr.feedstock.total_lhv": 7194.0304069514299,
"biopwr.feedstock.total_moisture": 0.36564341449200718,
"biopwr.feedstock.total_moisture": 0.3656434144920072,
"biopwr.feedstock.total_nameplate": 48535.59310191071,
"biopwr.feedstock.total_o": 0.5115152836845535,
"biopwr.feedstock.urban_ash": 0.0125,
Expand All @@ -266,7 +266,7 @@
"biopwr.feedstock.urban_h": 0.05988,
"biopwr.feedstock.urban_hhv": 7791.0,
"biopwr.feedstock.urban_lhv": 7399.0,
"biopwr.feedstock.urban_moisture": 13.636363636363635,
"biopwr.feedstock.urban_moisture": 13.636363636363637,
"biopwr.feedstock.urban_moisture_wet": 12.0,
"biopwr.feedstock.urban_o": 0.4449,
"biopwr.feedstock.urban_obtainable": 10.0,
Expand All @@ -279,7 +279,7 @@
"biopwr.feedstock.wheat_h": 0.0532,
"biopwr.feedstock.wheat_hhv": 7661.2479,
"biopwr.feedstock.wheat_lhv": 7107.9666,
"biopwr.feedstock.wheat_moisture": 13.636363636363635,
"biopwr.feedstock.wheat_moisture": 13.636363636363637,
"biopwr.feedstock.wheat_moisture_wet": 12.0,
"biopwr.feedstock.wheat_o": 0.4914,
"biopwr.feedstock.wheat_obtainable": 10.0,
Expand Down Expand Up @@ -502,7 +502,7 @@
],
"cp_capacity_payment_esc": 0.0,
"cp_capacity_payment_type": 0.0,
"cp_system_nameplate": 48.535593101910709,
"cp_system_nameplate": 48.53559310191071,
"debt_message": "",
"debt_option": 1.0,
"debt_percent": 50.0,
Expand Down Expand Up @@ -9379,7 +9379,7 @@
"ibi_uti_percent_maxvalue": 1e38,
"ibi_uti_percent_tax_fed": 1.0,
"ibi_uti_percent_tax_sta": 1.0,
"in_location": "Type a location name, street address, or lat,lon in decimal degrees",
"in_location": "",
"in_location_list": "|||",
"in_location_options": 0.0,
"in_nsrdb_options": 0.0,
Expand Down Expand Up @@ -666550,7 +666550,7 @@
],
"mp_error_msg": "",
"mp_market_percent_gen": 100.0,
"nominal_discount_rate": 9.060000000000003,
"nominal_discount_rate": 9.060000000000004,
"om_capacity": [
110.0
],
Expand Down Expand Up @@ -666634,7 +666634,6 @@
"show_ReserveAccounts": 1.0,
"show_construction_period": 1.0,
"solar_data_file_name": "fargo_nd_46.9_-96.8_mts1_60_tmy.csv",
"solar_data_file_name_load": "fargo_nd_46.9_-96.8_mts1_60_tmy.csv",
"solar_data_source": "TMY2",
"solar_resource": "fargo_nd_46.9_-96.8_mts1_60_tmy",
"solar_resource_file": "fargo_nd_46.9_-96.8_mts1_60_tmy.csv",
Expand Down
Loading
Loading