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

Catch up main to develop #28

Merged
merged 113 commits into from
Nov 6, 2023
Merged

Catch up main to develop #28

merged 113 commits into from
Nov 6, 2023

Conversation

paulf81
Copy link
Collaborator

@paulf81 paulf81 commented Nov 6, 2023

Doing a crude catch up of main to develop

Paul Fleming and others added 30 commits January 27, 2023 14:42
new example
1549909
Update input
a860642
Updates
e8aa465
Update runscript
be6a572
Ignore csv files
81bd0fa
move files out of src folder
01c4b75
Move files out of source
65d560d
clean up
2fea3bd
Make first example simulation folder
ef79bc0
move example folders
66bde05
move example folders
179fc57
move initial scripts over to intial work folders
5c3c312
Move files to intial work folders
2371984
Drop refs to srf folder
47e46b5
rename app.py to front_end_dash.py
be726e9
rename app to front_end_dash
a5bc0ff
move sequence.py
e00966c
Set up new example run
0639e08
move testclient to initial work folder
083acf2
delete zmq server
f742fa6
update example batch
74a7877
@paulf81
package setup
0e812a6
@paulf81
New file structure
c894e5d
@genevievestarke
First addition for py sims
5b1305a
@paulf81
Fix federate link
c9c4c82
@paulf81
add .py
f0dcc4f
@paulf81
updates
fc8ea52
quick control center changed
9c55da4
Merge branch 'develop' of github.com:NREL/emu_python into develop
630883f
Explaining order of operations for reference.
b5da5e0
misi9170 and others added 28 commits April 26, 2023 09:58
@misi9170
example_04 largely redundant, but updated for completeness.
f4748cf
@jfrederik-nrel
Merge pull request #16 from dvaidhyn/develop
fac8ed7 
Update for global HELICS_PORT
@jfrederik-nrel
Update README.md
4f041a2 
Corrected typo
@paulf81
rename to hercules (#17)
0c14cea
@paulf81
Update README.md
c07fd58 
Update to hercules
@paulf81
Update conda environment name
0aa073a
@paulf81
Update prefixes
181adfd
@paulf81
cleanout initial work
d876372
@paulf81
Small clean up
3af95fa
@paulf81
change logs
1d1d4b8
@paulf81
change logs
4c682a2
@paulf81
job name
bb6faec
@paulf81
Remove python version
9e68e95
@paulf81
Readme updates
d3b5570
@paulf81
repair example 8
ce6055a
@paulf81
Update example
fa08961
@paulf81
clean up
a0636c8
Add 01/02 examples
15ac936
clean up
eb151ca
All ports to 32000
09fa187
Add check for no pysims
71b81d6
re-arrange examples
98c1f47
Add 3 and 4 examples
4c6a457
@paulf81
Merge pull request #19 from NREL/feature/reorganize_examples
f6b5871 
Feature/reorganize examples
@genevievestarke
Adding electrolzyer example
754fcc7
@genevievestarke
Renaming input_dict as main_dict
abbed50
@paulf81
Merge pull request #22 from genevievestarke/feature/electrolyzer
78b2302 
Feature/electrolyzer
Add empty needed inputs
65e0fe8
@paulf81 paulf81 merged commit 044029b into main Nov 6, 2023
@genevievestarke genevievestarke mentioned this pull request Dec 20, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@paulf81 @genevievestarke @dvaidhyn @misi9170 @jfrederik-nrel