Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix SAM issue #1417, tested macOS 14.0 #1504

Closed
wants to merge 146 commits into from
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
146 commits
Select commit Hold shift + click to select a range
d637d3b
update CSP entries for PySAM config_to_cmod_name table
dguittet Oct 6, 2023
04b781c
Merge branch 'develop' into pysam_hybrids
dguittet Oct 10, 2023
736ade5
Fix SAM issue #1417, tested macOS 14.0
sjanzou Oct 18, 2023
d26450a
Merge branch 'develop' into SAM_1417
sjanzou Oct 19, 2023
ba368e6
Merge branch 'develop' into pysam_hybrids
dguittet Oct 19, 2023
8dc9f0e
Code generation almost working for JSON option #1515
sjanzou Nov 7, 2023
b0e4572
Tested Values vartable for variable updates for base case for code ge…
sjanzou Nov 7, 2023
b943b5a
Merge branch 'develop' into SAM_1515
sjanzou Nov 14, 2023
d8bedc1
Add SSC_DATARR support to CodeGen_json::Input
sjanzou Nov 14, 2023
b80b99a
update export_config
dguittet Nov 16, 2023
84cbf5d
Merge branch 'develop' into pysam_hybrids
dguittet Nov 16, 2023
c6b4378
update pysam files
dguittet Nov 16, 2023
757d000
Merge branch 'develop' into pysam_hybrids
dguittet Nov 16, 2023
10cfc6e
remove print statement
dguittet Nov 16, 2023
3ac496e
fix run_defaults_diff.py
dguittet Nov 17, 2023
ec2cacf
Fix broken config_extractor build on Windows
sjanzou Nov 26, 2023
f7f3d6d
use sscapi for adding hybrid vartable
dguittet Dec 4, 2023
03f23da
Merge branch 'develop' into pysam_hybrids
dguittet Dec 5, 2023
d18ad81
update library
dguittet Dec 5, 2023
c099aa2
Merge branch 'develop' into pysam_hybrids
dguittet Dec 5, 2023
28258a6
update pysam files
dguittet Dec 5, 2023
946c523
Merge branch 'develop' into pysam_hybrids
dguittet Dec 11, 2023
adde2ee
update AdjustmentFactors
dguittet Dec 12, 2023
89f4625
Merge branch 'develop' into pysam_hybrids
dguittet Dec 13, 2023
fbb22b0
Merge branch 'adjust_api' into pysam_hybrids
dguittet Dec 13, 2023
0de809c
Update SAMapi files
dguittet Dec 13, 2023
a1b6ab9
Merge branch 'pysam_hybrids' of https://github.com/NREL/SAM into pysa…
dguittet Dec 13, 2023
91bd4c9
adjustment factors default to 0
dguittet Dec 18, 2023
3f3a86c
fix tcsmslf
dguittet Dec 18, 2023
6a513a2
update pysam docs generation
dguittet Dec 19, 2023
b166bd2
updated git attributes file to correctly ignore subfolders for github…
janinefreeman Jan 2, 2024
e62f0ac
Remove nSCA as an input for CSP and IPH models. Add as design output.
taylorbrown75 Jan 3, 2024
eb42034
Merge pull request #1675 from NREL/fix-trough-dispatch
tyneises Jan 15, 2024
01d9b0d
Update file generation process to catch bad weather files, return error
mjprilliman Jan 25, 2024
9b33dd0
Add DC loss factor checks to PV, PV + battery report template
mjprilliman Feb 5, 2024
da88612
Clean up PV subhourly clipping losses correction UI (#1689)
cpaulgilman Feb 7, 2024
69cd639
Update array sizing for battery thermal fixed option, add label for
mjprilliman Feb 8, 2024
780af34
Update PV land area calcs to be based on total module area and gcr
mjprilliman Feb 12, 2024
6965816
Reset adjust periods to three zero columns when no custom period is set
mjprilliman Feb 13, 2024
81116be
Clean up UI Save / Load buttons (#1695)
cpaulgilman Feb 13, 2024
6ee3366
Fix PV shading diagrams (#1696)
cpaulgilman Feb 13, 2024
113be3c
Merge branch 'patch' into me-wave-file-reader
mjprilliman Feb 14, 2024
357ee27
Add error message for errors in reading wave time series file for jpd
mjprilliman Feb 14, 2024
2586636
Update ground area variable label
cpaulgilman Feb 15, 2024
3c68673
Merge branch 'patch' into pysam_hybrids
sjanzou Feb 19, 2024
3cbafaf
update defaults maneuvering for hybrids
dguittet Feb 19, 2024
081a9b1
Fix solar resource download geocoding issues (#1692)
cpaulgilman Feb 19, 2024
29c97b9
Merge pull request #1698 from NREL/adjust-periods-reset
mjprilliman Feb 19, 2024
781ec2c
update defaults maneuvering for hybrids
dguittet Feb 19, 2024
ee1d735
Fix failing Windows build and export_config updates
sjanzou Feb 20, 2024
54cfe4b
Merge branch 'patch' into SAM_1515
sjanzou Feb 20, 2024
ce26386
Merge branch 'pysam_hybrids' of https://github.com/nrel/SAM into pysa…
dguittet Feb 20, 2024
b9de64c
Update JSON code generation and test for hybrids in ssc
sjanzou Feb 21, 2024
2f7b3d9
Update Solar Resource Data to not have valid solar_resource_file if s…
sjanzou Feb 22, 2024
87ad92c
update windows results
dguittet Feb 22, 2024
2809cb8
Create equations to fail with library value blank
sjanzou Feb 25, 2024
7518a81
Update Tower SolarPilot Solar Field.json
qualand Feb 26, 2024
adc23a7
Merge pull request #1697 from NREL/land-area-update
mjprilliman Feb 26, 2024
6ef95eb
Address issue list from meeting
mjprilliman Feb 26, 2024
954d848
Merge pull request #1711 from NREL/sam-1672-fix
qualand Feb 26, 2024
beb911f
Merge branch 'patch' into battery-thermal-array
mjprilliman Feb 26, 2024
aaa03ce
Merge branch 'patch' into dc-degradation-pv-report-template
mjprilliman Feb 26, 2024
10ec4a6
Fix issues with curtailment and degradation in pv + pv+batt report;
mjprilliman Feb 26, 2024
d769713
Merge pull request #1710 from NREL/SAM_1314
sjanzou Feb 27, 2024
1362e95
Merge pull request #1694 from NREL/battery-thermal-array
mjprilliman Feb 27, 2024
cda0828
Merge pull request #1690 from NREL/dc-degradation-pv-report-template
mjprilliman Feb 27, 2024
9debef4
Fix PV time series shading (#1712)
cpaulgilman Feb 27, 2024
73ff4a9
Update `fuelcell_dispatch_excl` when opening old Fuel Cell cases (#1707)
cpaulgilman Feb 27, 2024
db99724
update export config for hybrids
dguittet Feb 27, 2024
106f974
Merge branch 'patch' into SAM_1515
sjanzou Feb 28, 2024
3202f3b
Fix URL to SAM forum from Help window (#1716)
cpaulgilman Feb 28, 2024
d5918fa
Update test results for change in cost defaults
mjprilliman Feb 28, 2024
c891277
Fix #1682 PVWatts land area calculation (#1721)
cpaulgilman Feb 29, 2024
bb20186
Merge pull request #1718 from NREL/SAM_1515
sjanzou Feb 29, 2024
2b9bc3a
Merge branch 'patch' into pysam_hybrids
dguittet Feb 29, 2024
e83363d
Fix battery life defaults (#1715)
cpaulgilman Feb 29, 2024
59eae61
Add support for MSG V1.0.0 NSRDB API endpoint (#1720)
cpaulgilman Feb 29, 2024
c2a3cc2
Improve REopt calls (#1714)
cpaulgilman Feb 29, 2024
baf3b21
Fix trough loop configuration label. (#1709)
taylorbrown75 Feb 29, 2024
e6bc92b
Merge branch 'patch' into me-wave-file-reader
mjprilliman Feb 29, 2024
21a1302
Merge branch 'patch' into SAM_1515
sjanzou Mar 1, 2024
48c6c6a
Limit code generation to compute module inputs only
sjanzou Mar 1, 2024
799d6bf
Automatically scan downloads folder for wave and tidal files
mjprilliman Mar 1, 2024
7e69cdd
Help updates for SAM 2023.12.17 r1
cpaulgilman Mar 1, 2024
e6e3861
Merge pull request #1701 from NREL/me-wave-file-reader
mjprilliman Mar 1, 2024
ef25bb7
Improve description array orientation convention
cpaulgilman Mar 1, 2024
87aa262
Merge pull request #1725 from NREL/help-2023-patch-1
sjanzou Mar 3, 2024
977bee6
Merge branch 'patch' into pysam_hybrids
sjanzou Mar 3, 2024
a05b87c
Merge branch 'pysam_hybrids' into SAM_1515
sjanzou Mar 3, 2024
2723ded
Update build_C_API.cpp for C++11 in patch and update code generator f…
sjanzou Mar 3, 2024
cd4cade
Updates from all patch merges for Patch 1
sjanzou Mar 3, 2024
fd397a2
Update results for failing GitHub Actions.
sjanzou Mar 4, 2024
07d3687
Merge pull request #1727 from NREL/Windows_defaults_updates
sjanzou Mar 4, 2024
2ac0e8d
2023.12.17.r1.ssc.290 patch 1 candidate built 3/4/2024
sjanzou Mar 4, 2024
da6d81f
Merge branch 'SAM_1515' into pysam_hybrids
dguittet Mar 4, 2024
71940c6
fix codegenerator
dguittet Mar 4, 2024
da1d203
Merge branch 'SAM_1515' into pysam_hybrids
dguittet Mar 4, 2024
49b6106
Merge branch 'patch' into pysam_hybrids
dguittet Mar 4, 2024
513ec26
fix codegenerator for hybrids
dguittet Mar 4, 2024
54b86fd
Merge pull request #1730 from NREL/2023.12.17.r1.ssc.290
sjanzou Mar 5, 2024
b2d14ae
update test_results_win64.csv
dguittet Mar 5, 2024
4ea27ba
Clean and build and run on Windows
sjanzou Mar 6, 2024
5f9f0e6
Merge pull request #1584 from NREL/pysam_hybrids
sjanzou Mar 6, 2024
3de25c8
remove PySAM set_data_ptr (#1737)
dguittet Mar 12, 2024
ef2fc15
update names of config_to_cmod for PySAM
dguittet Mar 15, 2024
e981acb
Merge branch 'patch' of https://github.com/nrel/SAM into patch
dguittet Mar 15, 2024
b2a7ae3
Update startup.lk
tyneises Mar 15, 2024
927ffb9
Merge pull request #1741 from NREL/fix-typo-emprical-empirical
tyneises Mar 15, 2024
6c56552
Add link to TMY3 files to EULP script readme (#1743)
cpaulgilman Mar 18, 2024
5491c70
Fix subscriber share of generation references (#1744)
cpaulgilman Mar 21, 2024
2d1e600
Fix `adjust_periods` upgrade for PV (#1749)
cpaulgilman Apr 4, 2024
695a9d0
Fix PDF report for battery dispatch (#1750)
cpaulgilman Apr 4, 2024
3627f79
Update Advanced NSRDB Downloads for latest NSRDB (#1746)
cpaulgilman Apr 4, 2024
4fef112
Add checkboxes and working on saving updates for #1362
sjanzou Apr 7, 2024
737fdc4
Update UI when loading and clear results with checkboxes #1362
sjanzou Apr 8, 2024
ccfa4ed
Address and test both #1681 and #1734
sjanzou Apr 8, 2024
fc60b59
Merge pull request #1754 from NREL/SAM_1681_1734
sjanzou Apr 8, 2024
74eaed5
Address feedback on #1753
sjanzou Apr 8, 2024
f8b5c37
Merge pull request #1753 from NREL/SAM_1362
sjanzou Apr 9, 2024
976d567
Address SAM issue #1706
sjanzou Apr 10, 2024
817c85a
Merge pull request #1755 from NREL/SAM_1706
sjanzou Apr 12, 2024
721eacf
Update fcall_parsim to address SAM issue #1693
sjanzou Apr 14, 2024
0a37ce3
Fix issue with Stochastic simulations for issue #1683
sjanzou Apr 15, 2024
4d986e9
Add json and csv to list of definitely text files
brtietz Apr 15, 2024
c53abfb
Merge pull request #1758 from NREL/SAM_1683
sjanzou Apr 16, 2024
89c70ff
Merge pull request #1757 from NREL/SAM_1693
sjanzou Apr 16, 2024
3627884
Update version upgrade to show warnings at top - address issue #1635
sjanzou Apr 16, 2024
f3360b3
Update discounted payback calculation to match cmod_cashloan - partia…
sjanzou Apr 16, 2024
26ea7f8
Merge pull request #1760 from NREL/lf_endings_json_csv
brtietz Apr 16, 2024
cc0aca0
Merge pull request #1761 from NREL/SAM_1635
sjanzou Apr 17, 2024
3acb79d
Merge remote-tracking branch 'origin/patch' into SAM_1563
sjanzou Apr 17, 2024
8ec91a1
Add improved OLE automation feedback and fix #1563
sjanzou Apr 17, 2024
23ab02b
Add example code and data for adding snotel data to a weather file
brtietz Apr 18, 2024
e29343a
Save workbook with cursor in Cell A1 for all sheets
cpaulgilman Apr 18, 2024
c47b139
Revise instructions and change "SNOWTEL" to "SNOTEL"
cpaulgilman Apr 18, 2024
7e49955
Update readme.md
cpaulgilman Apr 18, 2024
cddf732
Merge pull request #1762 from NREL/SAM_1563
sjanzou Apr 19, 2024
3e5aef0
Merge pull request #1763 from NREL/snow_depth_example_code
brtietz Apr 19, 2024
4572b39
Merge branch 'patch' into SAM_1515
sjanzou Apr 24, 2024
7478d72
Merge pull request #1765 from NREL/SAM_1515
sjanzou Apr 24, 2024
779e15c
remove snappy package due to GPL 2.0 license, EULP script runs fine w…
brtietz May 3, 2024
56f3bdd
Merge pull request #1768 from NREL/remove_snappy_for_licensing
brtietz May 3, 2024
1ed59e9
Fix wind loss descriptions (#1770)
cpaulgilman May 13, 2024
e575dea
Merge branch 'patch' into SAM_1417
sjanzou May 28, 2024
926395f
Change from wxExecute to system call to address #1417
sjanzou May 28, 2024
1899582
testing wxExecure with more feedback - working with updated stepwise.…
sjanzou Jun 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/parametric.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2830,8 +2830,7 @@ bool ParametricGridData::RunSimulations_multi()
if (VarValue *vv = &m_par.Setup[col].Values[i])
{
// set for simulation
// m_par.Runs[i]->Override(m_var_names[col], *vv, m_par.Setup[col].ndxHybrid); // TODO: hybrids
m_par.Runs[i]->Override(m_par.Setup[col].varName, *vv, m_par.Setup[col].ndxHybrid); // TODO: hybrids
m_par.Runs[i]->Override(m_par.Setup[col].varName, *vv, m_par.Setup[col].ndxHybrid);
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions src/stochastic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2288,6 +2288,8 @@ void StochasticPanel::Simulate()
{
Simulation *s = new Simulation(m_case, wxString::Format("Stochastic #%d", (int)(i + 1)));
m_sims.push_back(s);

s->Clear(); // resizes inputs for Override to work

for (size_t j = 0; j < m_sd.InputDistributions.size(); j++)
{
Expand All @@ -2299,12 +2301,12 @@ void StochasticPanel::Simulate()
if (!GetWeatherFileForSum(m_input_data(i, j), &weather_file))
continue;
weather_file = m_folder->GetValue() + "/" + weather_file;
s->Override("use_specific_weather_file", VarValue(true), 0); // TODO:hybrids
s->Override("use_specific_weather_file", VarValue(true), 0); // TODO:hybrids NOT currently supported
s->Override("user_specified_weather_file", VarValue(weather_file), 0);
s->Override("use_specific_wf_wind", VarValue(true), 0);
s->Override("user_specified_wf_wind", VarValue(weather_file), 0);
}
else if (m_case->Values(0).Get(iname)->Length() == 1)
else if (m_case->Values(0).Get(iname)->Length() == 1)// hybrids
{
double val[1];
val[0] = (double)m_input_data(i, j);
Expand Down