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.

Sign up for GitHub

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

Jump to bottom

24 03 06 merge patch into develop #1731

Merged
merged 102 commits into from
Mar 7, 2024
Merged

24 03 06 merge patch into develop #1731

merged 102 commits into from
Mar 7, 2024

Conversation

tyneises
Copy link
Collaborator

@tyneises tyneises commented Mar 6, 2024

No description provided.

dguittet and others added 30 commits October 6, 2023 12:12
@dguittet
update CSP entries for PySAM config_to_cmod_name table
d637d3b
@dguittet
Merge branch 'develop' into pysam_hybrids
04b781c
@dguittet
Merge branch 'develop' into pysam_hybrids
ba368e6
@sjanzou
Code generation almost working for JSON option #1515
8dc9f0e 
Need support for SSC_DATA_ARRAY and SSC_TABLE types for all supported hybrid generation.
@sjanzou
Tested Values vartable for variable updates for base case for code ge…
b0e4572 
…neration
@sjanzou
Merge branch 'develop' into SAM_1515
b943b5a
@sjanzou
Add SSC_DATARR support to CodeGen_json::Input
d8bedc1
@dguittet
update export_config
b80b99a
@dguittet
Merge branch 'develop' into pysam_hybrids
84cbf5d
@dguittet
update pysam files
c6b4378
@dguittet
Merge branch 'develop' into pysam_hybrids
757d000
@dguittet
remove print statement
10cfc6e
@dguittet
fix run_defaults_diff.py
3ac496e
@sjanzou
Fix broken config_extractor build on Windows
ec2cacf
@dguittet
use sscapi for adding hybrid vartable
f7f3d6d
@dguittet
Merge branch 'develop' into pysam_hybrids
03f23da
@dguittet
update library
d18ad81
@dguittet
Merge branch 'develop' into pysam_hybrids
c099aa2
@dguittet
update pysam files
28258a6
@dguittet
Merge branch 'develop' into pysam_hybrids
946c523
@dguittet
update AdjustmentFactors
adde2ee
@dguittet
Merge branch 'develop' into pysam_hybrids
89f4625
@dguittet
Merge branch 'adjust_api' into pysam_hybrids
fbb22b0
@dguittet
Update SAMapi files
0de809c
@dguittet
Merge branch 'pysam_hybrids' of https://github.com/NREL/SAM into pysa…
a1b6ab9 
…m_hybrids
@dguittet
adjustment factors default to 0
91bd4c9
@dguittet
fix tcsmslf
3f3a86c
@dguittet
update pysam docs generation
6a513a2
@janinefreeman
updated git attributes file to correctly ignore subfolders for github…
b166bd2 
… linguist language calculations, and added samples folder to be ignored (#1669)
@taylorbrown75
Remove nSCA as an input for CSP and IPH models. Add as design output.
e62f0ac
taylorbrown75 and others added 26 commits February 29, 2024 10:34
@taylorbrown75
Fix trough loop configuration label. (#1709)
baf3b21
@mjprilliman
Merge branch 'patch' into me-wave-file-reader
e6bc92b
@sjanzou
Merge branch 'patch' into SAM_1515
21a1302
@sjanzou
Limit code generation to compute module inputs only
48c6c6a
@mjprilliman
Automatically scan downloads folder for wave and tidal files
799d6bf
@cpaulgilman
Help updates for SAM 2023.12.17 r1
7e69cdd 
Clean up window reference topics.

Detailed PV time series results, also note lat/long/elev/tz pass through from weather file

Fix PV land area and GCR descriptions.

Revise Solar Resource topic

Electric Load subhourly weather file available via solar resource Advanced Donwload option.
@mjprilliman
Merge pull request #1701 from NREL/me-wave-file-reader
e6e3861 
Wave File Reader error handling, header reading
@cpaulgilman
Improve description array orientation convention
ef25bb7
@sjanzou
Merge pull request #1725 from NREL/help-2023-patch-1
87aa262 
Help updates for SAM 2023.12.17 r1
@sjanzou
Merge branch 'patch' into pysam_hybrids
977bee6
@sjanzou
Merge branch 'pysam_hybrids' into SAM_1515
a05b87c
@sjanzou
Update build_C_API.cpp for C++11 in patch and update code generator f…
2723ded 
…or hybridized inputs only
@sjanzou
Updates from all patch merges for Patch 1
cd4cade
@sjanzou
Update results for failing GitHub Actions.
fd397a2 
Note that hybrid configurations will have to be reevaluated for changes before merging into patch
@sjanzou
Merge pull request #1727 from NREL/Windows_defaults_updates
07d3687 
Updates from all patch merges for Patch 1
@sjanzou
2023.12.17.r1.ssc.290 patch 1 candidate built 3/4/2024
2ac0e8d
@dguittet
Merge branch 'SAM_1515' into pysam_hybrids
da6d81f
@dguittet
fix codegenerator
71940c6
@dguittet
Merge branch 'SAM_1515' into pysam_hybrids
da1d203
@dguittet
Merge branch 'patch' into pysam_hybrids
49b6106
@dguittet
fix codegenerator for hybrids
513ec26
@sjanzou
Merge pull request #1730 from NREL/2023.12.17.r1.ssc.290
54b86fd 
2023.12.17.r1.ssc.290 patch 1 candidate built 3/4/2024
@dguittet
update test_results_win64.csv
b2d14ae
@sjanzou
Clean and build and run on Windows
4ea27ba
@sjanzou
Merge pull request #1584 from NREL/pysam_hybrids
5f9f0e6 
Pysam hybrids
@tyneises
Merge branch 'patch' into 24-03-06-merge-develop
6c4faf1
@tyneises tyneises requested a review from sjanzou March 6, 2024 20:43
sjanzou
sjanzou approved these changes Mar 7, 2024
View reviewed changes
Copy link
Collaborator

@sjanzou sjanzou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, that was a lot of changes

@sjanzou sjanzou merged commit fbad0d3 into develop Mar 7, 2024
4 of 6 checks passed
@sjanzou sjanzou deleted the 24-03-06-merge-patch-into-develop branch March 7, 2024 07:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sjanzou sjanzou sjanzou approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@tyneises @sjanzou @dguittet @janinefreeman @taylorbrown75 @mjprilliman @cpaulgilman @qualand