Skip to content

Commit

Permalink
Merge branch 'develop' into help-2024-12-12
Browse files Browse the repository at this point in the history
  • Loading branch information
@sjanzou
sjanzou committed Dec 8, 2024
2 parents 789ba5c + 59e91c5 commit f12f191
Show file tree
Hide file tree
Showing 71 changed files with 1,506 additions and 1,026 deletions.
8 changes: 8 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ if (UNIX)
COMMAND mkdir -p ${SAM_APP}/Contents/runtime
COMMAND mkdir -p ${SAM_APP}/Contents/runtime/bin
COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/Sandia/osx/lhs.bin ${SAM_APP}/Contents/runtime/bin
COMMAND cp $ENV{SSCDIR}/ssc/sscapi.h ${SAM_APP}/Contents/runtime
COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/Sandia/osx/stepwise.bin ${SAM_APP}/Contents/runtime/bin
COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/build_resources/Info-${SAM_NAME}.plist ${SAM_APP}/Contents/Info.plist
COMMAND mkdir -p ${SAM_APP}/Contents/Frameworks
Expand All @@ -338,6 +339,7 @@ if (UNIX)
COMMAND rsync -a -v ${CMAKE_CURRENT_SOURCE_DIR}/deploy/* ${SAM_APP}
COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/Sandia/linux/lhs.bin ${SAM_APP}/runtime/bin
COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/Sandia/linux/stepwise.bin ${SAM_APP}/runtime/bin
COMMAND cp $ENV{SSCDIR}/ssc/sscapi.h ${SAM_APP}/runtime
# COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/build_linux/GtkTheme ${SAM_APP}/linux_64
COMMAND cp ${SSC_SO} ${SAM_APP}/linux_64
)
Expand Down Expand Up @@ -402,5 +404,11 @@ else()
COMMAND ${CMAKE_COMMAND}
ARGS -E copy ${SSC_DLL} ${SSC_LIB} ${SAMEXE_DIR}
)
add_custom_command(
TARGET ${SAM_EXE}
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy $ENV{SSCDIR}/ssc/sscapi.h ${CMAKE_CURRENT_SOURCE_DIR}/deploy/runtime
)
endif()

2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/Battery_CustomGenerationBatteryCommercial.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@
"dispatch_manual_system_charge_first": 0
},
"SystemCosts": {
"om_batt_replacement_cost": [184.000000],
"om_batt_replacement_cost": [280.000000],
"om_batt_variable_cost": [0.000000],
"om_production_escal": 0,
"om_replacement_cost_escal": 0
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/Battery_CustomGenerationBatteryHostDeveloper.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@
"dispatch_manual_system_charge_first": 0
},
"SystemCosts": {
"om_batt_replacement_cost": [184.000000],
"om_batt_replacement_cost": [280.000000],
"om_batt_variable_cost": [0.000000],
"om_production_escal": 0,
"om_replacement_cost_escal": 0
Expand Down
2 changes: 1 addition & 1 deletion ...brary/defaults/Battery_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
"dispatch_manual_system_charge_first": 0
},
"SystemCosts": {
"om_batt_replacement_cost": [184.000000],
"om_batt_replacement_cost": [280.000000],
"om_batt_variable_cost": [0.000000],
"om_production_escal": 0,
"om_replacement_cost_escal": 0
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/Battery_MEwaveBatterySingleOwner.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
"batt_minimum_SOC": 30,
"batt_minimum_modetime": 10,
"batt_resistance": 0.001155,
"batt_room_temperature_celsius": [20.000000],
"batt_room_temperature_celsius": [25.000000],
"batt_voltage_choice": 0,
"batt_voltage_matrix": [
[0.000000, 1.200000],
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_PVWattsWindBatteryHybridHostDeveloper.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,10 +331,10 @@
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000],
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000]
],
"dispatch_manual_system_charge_first": 1
"dispatch_manual_system_charge_first": 0
},
"SystemCosts": {
"om_batt_replacement_cost": [184.000000],
"om_batt_replacement_cost": [280.000000],
"om_batt_variable_cost": [0.000000],
"om_production_escal": 0,
"om_replacement_cost_escal": 0
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/Battery_PVWattsWindFuelCellBatteryHybridHostDeveloper.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
"dispatch_manual_system_charge_first": 0
},
"SystemCosts": {
"om_batt_replacement_cost": [184.000000],
"om_batt_replacement_cost": [280.000000],
"om_batt_variable_cost": [0.000000],
"om_production_escal": 0,
"om_replacement_cost_escal": 0
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/Battery_PhotovoltaicWindBatteryHybridHostDeveloper.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
"dispatch_manual_system_charge_first": 0
},
"SystemCosts": {
"om_batt_replacement_cost": [184.000000],
"om_batt_replacement_cost": [280.000000],
"om_batt_variable_cost": [0.000000],
"om_production_escal": 0,
"om_replacement_cost_escal": 0
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/Battery_StandaloneBatteryCommercial.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@
"dispatch_manual_system_charge_first": 0
},
"SystemCosts": {
"om_batt_replacement_cost": [184.000000],
"om_batt_replacement_cost": [280.000000],
"om_batt_variable_cost": [0.000000],
"om_production_escal": 0,
"om_replacement_cost_escal": 0
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/Battery_StandaloneBatteryHostDeveloper.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@
"dispatch_manual_system_charge_first": 0
},
"SystemCosts": {
"om_batt_replacement_cost": [184.000000],
"om_batt_replacement_cost": [280.000000],
"om_batt_variable_cost": [0.000000],
"om_production_escal": 0,
"om_replacement_cost_escal": 0
Expand Down
14 changes: 7 additions & 7 deletions api/api_autogen/library/defaults/CashloanHeat_MSLFIPHCommercial.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@
"defaults": {
"FinancialParameters": {
"analysis_period": 25,
"debt_fraction": 50,
"debt_fraction": 60,
"federal_tax_rate": [21.000000],
"inflation_rate": 2.5,
"insurance_rate": 0.5,
"loan_rate": 6,
"loan_term": 30,
"loan_rate": 7,
"loan_term": 25,
"prop_tax_assessed_decline": 0,
"prop_tax_cost_assessed_percent": 100,
"property_tax_rate": 0,
"real_discount_rate": 6.4,
"salvage_percentage": 0,
"state_tax_rate": [7.000000],
"system_capacity": 279880
"system_capacity": 5000
},
"SystemCosts": {
"om_capacity_escal": 0,
"om_capacity_heat": [66.000000],
"om_capacity_heat": [33.000000],
"om_fixed": [0.000000],
"om_fixed_escal": 0,
"om_production_escal": 0,
"om_production_heat": [4.000000],
"total_installed_cost": 4.34851e+08
"total_installed_cost": 6.3373e+06
},
"LandLease": {
},
Expand All @@ -39,7 +39,7 @@
"itc_fed_amount": [0.000000],
"itc_fed_amount_deprbas_fed": 1,
"itc_fed_amount_deprbas_sta": 1,
"itc_fed_percent": [30.000000],
"itc_fed_percent": [0.000000],
"itc_fed_percent_deprbas_fed": 1,
"itc_fed_percent_deprbas_sta": 1,
"itc_fed_percent_maxvalue": [99999999999999997748809823456034029568.000000],
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/CashloanHeat_PhysicalTroughIPHCommercial.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"itc_fed_amount": [0.000000],
"itc_fed_amount_deprbas_fed": 1,
"itc_fed_amount_deprbas_sta": 1,
"itc_fed_percent": [30.000000],
"itc_fed_percent": [0.000000],
"itc_fed_percent_deprbas_fed": 1,
"itc_fed_percent_deprbas_sta": 1,
"itc_fed_percent_maxvalue": [99999999999999997748809823456034029568.000000],
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/Cashloan_CustomGenerationBatteryCommercial.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"om_batt_capacity_cost": [5.250000],
"om_batt_fixed_cost": [0.000000],
"om_batt_nameplate": 1200.21,
"om_batt_replacement_cost": [184.000000],
"om_batt_replacement_cost": [280.000000],
"om_batt_variable_cost": [0.000000],
"om_capacity": [25.000000],
"om_capacity_escal": 0,
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/Cashloan_CustomGenerationBatteryResidential.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"SystemCosts": {
"add_om_num_types": 1,
"om_batt_capacity_cost": [14.810000],
"om_batt_capacity_cost": [15.000000],
"om_batt_fixed_cost": [0.000000],
"om_batt_nameplate": 12.474,
"om_batt_replacement_cost": [434.000000],
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/Cashloan_PVBatteryCommercial.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"om_batt_capacity_cost": [5.250000],
"om_batt_fixed_cost": [0.000000],
"om_batt_nameplate": 1200.21,
"om_batt_replacement_cost": [184.000000],
"om_batt_replacement_cost": [280.000000],
"om_batt_variable_cost": [0.000000],
"om_capacity": [22.000000],
"om_capacity_escal": 0,
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/Cashloan_PVBatteryResidential.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"SystemCosts": {
"add_om_num_types": 1,
"om_batt_capacity_cost": [14.810000],
"om_batt_capacity_cost": [15.000000],
"om_batt_fixed_cost": [0.000000],
"om_batt_nameplate": 12.474,
"om_batt_replacement_cost": [434.000000],
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/Cashloan_StandaloneBatteryCommercial.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"om_batt_capacity_cost": [12.000000],
"om_batt_fixed_cost": [0.000000],
"om_batt_nameplate": 1200.21,
"om_batt_replacement_cost": [184.000000],
"om_batt_replacement_cost": [280.000000],
"om_batt_variable_cost": [0.000000],
"om_capacity_escal": 0,
"om_fixed_escal": 0,
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Communitysolar_PVWattsCommunitySolar.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"defaults": {
"FinancialParameters": {
"analysis_period": 25,
"construction_financing_cost": 119189,
"construction_financing_cost": 118611,
"cost_debt_closing": 0,
"cost_debt_fee": 2.75,
"cost_other_financing": 0,
Expand Down Expand Up @@ -45,7 +45,7 @@
"om_fixed_escal": 0,
"om_production": [0.000000],
"om_production_escal": 0,
"total_installed_cost": 4.54052e+06
"total_installed_cost": 4.51851e+06
},
"LandLease": {
"land_area": 13.0055,
Expand Down
Loading

0 comments on commit f12f191

Please sign in to comment.