-
Notifications
You must be signed in to change notification settings - Fork 5
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
Circuit sharing and pausing for Panels project TEA #119
Draft
JingWang-CUB
wants to merge
53
commits into
dev
Choose a base branch
from
panel-tea
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
53 commits
Select commit
Hold shift + click to select a range
5d56a12
Run multiple script for panels project, runnable initial version
JingWang-CUB 5c644a8
Script for running multiple EV profiles
JingWang-CUB 68c192b
updating EV inputs for randomization
mnblonsky 117ab8c
Merge branch 'ev-batt-bugs' of https://github.com/NREL/OCHRE into pan…
JingWang-CUB b956e61
Resolve conflicts
JingWang-CUB 2fb64c8
Add tested circuit sharing and pausing control code
JingWang-CUB 6eca453
include csv containing all control scenarios and panel sizes
JingWang-CUB 594ae80
force to use ideal capacity for variable speed HVAC devices
JingWang-CUB 9502348
1. change timestep 2. add timestamp of dryer interruption 3. not use …
JingWang-CUB f16323e
Add scenarios list w/o duplicated building ids
JingWang-CUB 88279b8
Changes to run control scenarios from reading a file
JingWang-CUB 14d1358
align end use names with OCHRE
JingWang-CUB 4ac85b2
resolve conflict
JingWang-CUB 6ecf4f2
change level2 EV charger power
JingWang-CUB ea1e91e
ingore "hot_water_showers" schedule (for now)
jmaguire1 3ad06c8
merge dev
JingWang-CUB 3d6916c
Initial creation of 120V HPWH model
jmaguire1 a5cac45
parse 120V HPWH based on temp logic in HPXML for panels branch
jmaguire1 212c4df
Trying to add a tempering valve, still some hard coded things for panels
jmaguire1 0ba3e01
More 120V HPWH changes, update test run
jmaguire1 314e900
Merge remote-tracking branch 'remotes/origin/dev' into 120V_hpwh
jmaguire1 1411e40
A couple of bug fixes on the initial attempt
jmaguire1 a1f26fb
merge 120V_hpwh
JingWang-CUB 29bc8ba
Process schedule for low power appliances
JingWang-CUB 78df804
remove unnecessary equipment auguments
JingWang-CUB 75c8a9b
remove simulation_name argument when initializing dwelling
JingWang-CUB acbda73
update output path
JingWang-CUB ce59ce5
bug fix for accumulating draw_total values
JingWang-CUB 1174c46
Issue with the tempering valve that accumulated hot draws. Thanks @Ji…
jmaguire1 fccbfc8
add spreadsheet for timed out circuit sharing scenarios
JingWang-CUB c5b150a
Revert "add spreadsheet for timed out circuit sharing scenarios"
JingWang-CUB 20f697f
add right timedout spreadsheet
JingWang-CUB 8dd4a52
replace spreadsheet
JingWang-CUB a6578ad
change some end use power to avoid unrealistic peaks
JingWang-CUB 09f4b3a
code for postprocessing results
JingWang-CUB 93acd03
update log file
JingWang-CUB cc3fc99
Add in flat garage roofs
jmaguire1 c08345a
Match roof insulation properties to .idf files
jmaguire1 9650140
add EV controller
JingWang-CUB fd375ab
Merge branch 'panel-tea' of https://github.com/NREL/OCHRE into panel-tea
JingWang-CUB 8592674
test sh file for sbatch test run
JingWang-CUB b781132
adding shower draw for unmet loads
mnblonsky 49350c6
moved some low power HPWH inputs to hpxml.py
mnblonsky f099d2a
set default tempering valve to off
mnblonsky 03f2a8a
merge 120V_hpwh
JingWang-CUB 90d12f2
uncomment to use hot_water_showers
JingWang-CUB 9aa89c3
prepare for HPC run
JingWang-CUB deeec2f
Revert "set default tempering valve to off"
jmaguire1 344fea7
Merge remote-tracking branch 'origin/120V_hpwh' into panel-tea
JingWang-CUB aeb1c72
One more tempering valve fix
jmaguire1 ef5f15f
Merge remote-tracking branch 'origin/120V_hpwh' into panel-tea
JingWang-CUB 41cfdc3
default the tempering valve to t_set
jmaguire1 a7ed790
Merge remote-tracking branch 'origin/120V_hpwh' into panel-tea
JingWang-CUB File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
# -*- coding: utf-8 -*- | ||
""" | ||
Created on Thu Jul 18 11:40:03 2024 | ||
|
||
@author: jwang5 | ||
""" | ||
|
||
import pandas as pd | ||
import os | ||
import numpy as np | ||
|
||
|
||
#%% identify unsimulated cases except timed out ones | ||
input_path=os.getcwd() | ||
|
||
df=pd.read_csv(os.path.join(input_path, 'simulation_log.csv')) | ||
df2=pd.read_csv(os.path.join(input_path, 'control_scenarios_processed.csv')) | ||
|
||
# order by upgrade and then building id | ||
df = df.sort_values(by=["Upgrade", "Building ID"], ascending=[True, True]) | ||
|
||
# double check duplicates | ||
consecutive_duplicates = df['Building ID'] == df['Building ID'].shift() | ||
|
||
for i in range(len(consecutive_duplicates)): | ||
if consecutive_duplicates.iloc[i]: | ||
print(f'Found duplicate at index {i}') | ||
# df = df.drop(i) | ||
|
||
# df.to_csv(os.path.join(input_path, 'simulation_log.csv'), index=False) | ||
|
||
# generate a spreadsheet for failed simulations to rerun | ||
filtered_df = df[df["Status"].str.contains("Completed")] | ||
# check if ochre_complete exists in result folder | ||
for i in range(len(filtered_df)): | ||
upgrade = filtered_df['Upgrade'].iloc[i] | ||
bldg_id = filtered_df['Building ID'].iloc[i] | ||
# result_path = os.path.join(os.getcwd(), '..', 'upgrade'+str(upgrade), 'results', 'simulation_output', 'up01', 'bldg'+str(bldg_id).zfill(7), 'run', 'ochre_output') | ||
result_path = os.path.join(os.getcwd(), 'upgrade'+str(upgrade), str(bldg_id), 'ochre_output') | ||
if not os.path.exists(os.path.join(result_path, 'OCHRE_complete')): | ||
filtered_df['Status'].iloc[i] = 'Failed' | ||
|
||
filtered_df = filtered_df[filtered_df["Status"].str.contains("Failed")] | ||
|
||
filtered_df2 = df2[df2["building_id"].isin(filtered_df["Building ID"])] | ||
filtered_df2.to_csv(os.path.join(input_path, 'control_scenarios_cs_failed.csv'), index=False) | ||
|
||
|
||
#%% code for analyzing results | ||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mnblonsky: Do you think it's useful to have an example of running level 1 and level 2 charging, or should we revert/comment this out if we're eventually going to merge this? Along with some other EV changes above.