Skip to content

Commit 7858d40

Browse files
d3j331d3j331
authored
Merge pull request #177 from pnnl/develop
Merge develop to main
2 parents 1dcd35e + 10e9073 commit 7858d40

File tree

424 files changed

+1350245
-53146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

424 files changed

+1350245
-53146
lines changed

‎.gitignore

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,15 @@ fabric.properties
7676
.idea/caches/build_file_checksums.ser
7777
src/tesp_support/tesp_support/.idea
7878
TESP_demo-checkpoint.ipynb
79+
tesp.code-workspace
80+
81+
# Ignore individual run folders
82+
examples/analysis/dsot/code/*/
83+
84+
# Ignore data download
85+
examples/analysis/dsot/data/
86+
87+
# Ignore installation files
88+
repository/
89+
tenv/
90+
.vscode/

‎DISCLAIMER.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
This material was prepared as an account of work sponsored by an agency of the United States Government. Neither the United States Government nor the United States Department of Energy, nor Battelle, nor any of their employees, nor any jurisdiction or organization that has cooperated in the development of these materials, makes any warranty, express or implied, or assumes any legal liability or responsibility for the accuracy, completeness, or usefulness or any information, apparatus, product, software, or process disclosed, or represents that its use would not infringe privately owned rights.
2+
Reference herein to any specific commercial product, process, or service by trade name, trademark, manufacturer, or otherwise does not necessarily constitute or imply its endorsement, recommendation, or favoring by the United States Government or any agency thereof, or Battelle Memorial Institute. The views and opinions of authors expressed herein do not necessarily state or reflect those of the United States Government or any agency thereof.
3+
4+
PACIFIC NORTHWEST NATIONAL LABORATORY
5+
operated by
6+
BATTELLE
7+
for the
8+
UNITED STATES DEPARTMENT OF ENERGY
9+
under Contract DE-AC05-76RL01830

‎LICENSE

Lines changed: 8 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,19 @@
1-
TESP License
2-
Version 1.0, April 2017
3-
https://github.com/pnnl/tesp
1+
Copyright 2017-2024 Battelle Memorial Institute
42

5-
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
3+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
64

7-
1. Battelle Memorial Institute (hereinafter Battelle) hereby grants
8-
permission to any person or entity lawfully obtaining a copy of
9-
this software and associated documentation files (hereinafter "the
10-
Software") to redistribute and use the Software in source and
11-
binary forms, with or without modification. Such person or entity
12-
may use, copy, modify, merge, publish, distribute, sublicense,
13-
and/or sell copies of the Software, and may permit others to do so,
14-
subject to the following conditions:
15-
- Redistributions of source code must retain the above copyright
16-
notice, this list of conditions and the following disclaimers.
17-
- Redistributions in binary form must reproduce the above copyright
18-
notice, this list of conditions and the following disclaimer in
19-
the documentation and/or other materials provided with the
20-
distribution.
21-
- Other than as used herein, neither the name Battelle Memorial
22-
Institute or Battelle may be used in any form whatsoever without
23-
the express written consent of Battelle.
5+
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
246

25-
2. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
26-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
27-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
28-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BATTELLE OR
29-
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
30-
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
31-
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
32-
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
33-
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
34-
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
35-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7+
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
8+
9+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3610

37-
3. The Software was produced by Battelle under Contract No.
38-
DE-AC05-76RL01830 with the Department of Energy. The U.S. Government
39-
is granted for itself and others acting on its behalf a nonexclusive,
40-
paid-up, irrevocable worldwide license in this data to reproduce,
41-
prepare derivative works, distribute copies to the public, perform
42-
publicly and display publicly, and to permit others to do so. The
43-
specific term of the license can be identified by inquiry made to
44-
Battelle or DOE. Neither the United States nor the United States
45-
Department of Energy, nor any of their employees, makes any warranty,
46-
express or implied, or assumes any legal liability or responsibility
47-
for the accuracy, completeness or usefulness of any data, apparatus,
48-
product or process disclosed, or represents that its use would not
49-
infringe privately owned rights.
5011

5112
END TERMS AND CONDITIONS
5213

5314
For interested users: This software system was developed at PNNL with
54-
DOE funding [from the Office of Electricity], and PNNL also developed
15+
DOE funding from the Office of Electricity, and PNNL also developed
5516
utility applications that are patent-protected and available for
5617
licensing for commercial use. More information can be found at PNNL’s
5718
Available Technologies site: http://availabletechnologies.pnnl.gov/ or by
58-
contacting peter.christensen@pnnl.gov
19+
contacting allan.tuan@pnnl.gov

‎README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,6 @@ Change log:
2828
- v1.2.2 Fixed the installation for Ubuntu 22.04.
2929
- v1.3.0 Refactor the TESP PyPI api. Upgrade all models(GridLAB-D, EnergyPlus, NS3) to work with HELICS 3.4. Add modifier.py for GridLAB-D models.
3030
- v1.3.2 Updated model and modifier for GridLAB-D models, added readme for GLM modifier and Store examples.
31-
- v1.3.3 Add tesp_component download in tesp_support pypi, change directory structure. Add dockerfile for each module getting ready for dockerize COSU Simulations
31+
- v1.3.3 Add tesp_component download in tesp_support pypi, change directory structure. Add dockerfile for each module getting ready for dockerize COSU Simulations
32+
- v1.3.5 Minor changes and bugs fixes
33+
- v1.3.6 Updated versions for grid applications GridLAB-D and HELICS, new tools to modify GLM files and RECS implementation for GLM residential and commercial feeder

‎data/feeders/GC_12_47_1_pos.json

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
{
2+
"GC_12_47_1_cap_1": [
3+
518.34,
4+
840.31
5+
],
6+
"GC_12_47_1_load_1": [
7+
613.35,
8+
965.16
9+
],
10+
"GC_12_47_1_load_2": [
11+
611.29,
12+
838.46
13+
],
14+
"GC_12_47_1_load_3": [
15+
422.46,
16+
1039.3
17+
],
18+
"GC_12_47_1_meter_1": [
19+
598.22,
20+
954.19
21+
],
22+
"GC_12_47_1_meter_2": [
23+
599.36,
24+
852.3
25+
],
26+
"GC_12_47_1_meter_3": [
27+
428.17,
28+
1021.7
29+
],
30+
"GC_12_47_1_meter_4": [
31+
1257.8,
32+
61.058
33+
],
34+
"GC_12_47_1_node_27": [
35+
1247.7,
36+
76.08
37+
],
38+
"GC_12_47_1_node_1": [
39+
1082.1,
40+
183.28
41+
],
42+
"GC_12_47_1_node_2": [
43+
962.92,
44+
259.06
45+
],
46+
"GC_12_47_1_node_3": [
47+
888.9,
48+
299.1
49+
],
50+
"GC_12_47_1_node_4": [
51+
774.59,
52+
427.29
53+
],
54+
"GC_12_47_1_node_24": [
55+
893.93,
56+
316.22
57+
],
58+
"GC_12_47_1_node_5": [
59+
657.89,
60+
552.23
61+
],
62+
"GC_12_47_1_node_6": [
63+
576.09,
64+
657.0
65+
],
66+
"GC_12_47_1_node_21": [
67+
523.57,
68+
858.74
69+
],
70+
"GC_12_47_1_node_7": [
71+
433.49,
72+
1003.8
73+
],
74+
"GC_12_47_1_node_8": [
75+
583.08,
76+
942.7
77+
],
78+
"GC_12_47_1_node_9": [
79+
585.55,
80+
864.6
81+
],
82+
"GC_12_47_1_node_10": [
83+
388.25,
84+
925.07
85+
],
86+
"GC_12_47_1_node_25": [
87+
370.2,
88+
920.49
89+
],
90+
"GC_12_47_1_node_11": [
91+
442.96,
92+
947.43
93+
],
94+
"GC_12_47_1_node_12": [
95+
441.44,
96+
968.24
97+
],
98+
"GC_12_47_1_node_22": [
99+
424.52,
100+
937.99
101+
],
102+
"GC_12_47_1_node_13": [
103+
461.21,
104+
937.93
105+
],
106+
"GC_12_47_1_node_14": [
107+
478.7,
108+
929.04
109+
],
110+
"GC_12_47_1_node_15": [
111+
549.6,
112+
914.28
113+
],
114+
"GC_12_47_1_node_16": [
115+
535.12,
116+
898.43
117+
],
118+
"GC_12_47_1_node_17": [
119+
552.47,
120+
889.09
121+
],
122+
"GC_12_47_1_node_19": [
123+
517.41,
124+
909.34
125+
],
126+
"GC_12_47_1_node_18": [
127+
499.91,
128+
918.64
129+
],
130+
"GC_12_47_1_node_20": [
131+
528.35,
132+
878.24
133+
],
134+
"GC_12_47_1_node_23": [
135+
406.36,
136+
930.8
137+
],
138+
"GC_12_47_1_node_26": [
139+
1208.9,
140+
108.34
141+
],
142+
"GC_12_47_1_node_28": [
143+
1264.6,
144+
44.3
145+
]
146+
}

0 commit comments

Comments
 (0)