Merge pull request #177 from pnnl/develop

Merge develop to main

.gitignore

@@ -76,3 +76,15 @@ fabric.properties
 .idea/caches/build_file_checksums.ser
 src/tesp_support/tesp_support/.idea
 TESP_demo-checkpoint.ipynb
+tesp.code-workspace
+
+# Ignore individual run folders
+examples/analysis/dsot/code/*/
+
+# Ignore data download
+examples/analysis/dsot/data/
+
+# Ignore installation files
+repository/
+tenv/
+.vscode/

DISCLAIMER.txt

@@ -0,0 +1,9 @@
+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.
+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.
+
+PACIFIC NORTHWEST NATIONAL LABORATORY
+operated by
+BATTELLE
+for the
+UNITED STATES DEPARTMENT OF ENERGY
+under Contract DE-AC05-76RL01830

LICENSE

@@ -1,58 +1,19 @@
-TESP License
-Version 1.0, April 2017
-https://github.com/pnnl/tesp
+Copyright 2017-2024 Battelle Memorial Institute
 
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-1. Battelle Memorial Institute (hereinafter Battelle) hereby grants
-   permission to any person or entity lawfully obtaining a copy of
-   this software and associated documentation files (hereinafter "the
-   Software") to redistribute and use the Software in source and
-   binary forms, with or without modification.  Such person or entity
-   may use, copy, modify, merge, publish, distribute, sublicense,
-   and/or sell copies of the Software, and may permit others to do so,
-   subject to the following conditions:
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimers.
-   - 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.
-   - Other than as used herein, neither the name Battelle Memorial
-     Institute or Battelle may be used in any form whatsoever without
-     the express written consent of Battelle.
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
-2. 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 BATTELLE 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.
+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.
+
+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.
 
-3. The Software was produced by Battelle under Contract No.
-   DE-AC05-76RL01830 with the Department of Energy.  The U.S. Government
-   is granted for itself and others acting on its behalf a nonexclusive,
-   paid-up, irrevocable worldwide license in this data to reproduce,
-   prepare derivative works, distribute copies to the public, perform
-   publicly and display publicly, and to permit others to do so.  The
-   specific term of the license can be identified by inquiry made to
-   Battelle or DOE.  Neither the United States nor the United States
-   Department of Energy, nor any of their employees, makes any warranty,
-   express or implied, or assumes any legal liability or responsibility
-   for the accuracy, completeness or usefulness of any data, apparatus,
-   product or process disclosed, or represents that its use would not
-   infringe privately owned rights.
 
 END TERMS AND CONDITIONS
 
 For interested users:  This software system was developed at PNNL with 
-DOE funding [from the Office of Electricity], and PNNL also developed 
+DOE funding from the Office of Electricity, and PNNL also developed 
 utility applications that are patent-protected and available for 
 licensing for commercial use. More information can be found at PNNL’s 
 Available Technologies site: http://availabletechnologies.pnnl.gov/ or by 
-contacting peter.christensen@pnnl.gov
+contacting allan.tuan@pnnl.gov

README.md

@@ -28,4 +28,6 @@ Change log:
 - v1.2.2  Fixed the installation for Ubuntu 22.04.
 - 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.
 - v1.3.2  Updated model and modifier for GridLAB-D models, added readme for GLM modifier and Store examples.
-- 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
+- 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
+- v1.3.5  Minor changes and bugs fixes
+- 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

@@ -0,0 +1,146 @@
+{
+    "GC_12_47_1_cap_1": [
+        518.34,
+        840.31
+    ],
+    "GC_12_47_1_load_1": [
+        613.35,
+        965.16
+    ],
+    "GC_12_47_1_load_2": [
+        611.29,
+        838.46
+    ],
+    "GC_12_47_1_load_3": [
+        422.46,
+        1039.3
+    ],
+    "GC_12_47_1_meter_1": [
+        598.22,
+        954.19
+    ],
+    "GC_12_47_1_meter_2": [
+        599.36,
+        852.3
+    ],
+    "GC_12_47_1_meter_3": [
+        428.17,
+        1021.7
+    ],
+    "GC_12_47_1_meter_4": [
+        1257.8,
+        61.058
+    ],
+    "GC_12_47_1_node_27": [
+        1247.7,
+        76.08
+    ],
+    "GC_12_47_1_node_1": [
+        1082.1,
+        183.28
+    ],
+    "GC_12_47_1_node_2": [
+        962.92,
+        259.06
+    ],
+    "GC_12_47_1_node_3": [
+        888.9,
+        299.1
+    ],
+    "GC_12_47_1_node_4": [
+        774.59,
+        427.29
+    ],
+    "GC_12_47_1_node_24": [
+        893.93,
+        316.22
+    ],
+    "GC_12_47_1_node_5": [
+        657.89,
+        552.23
+    ],
+    "GC_12_47_1_node_6": [
+        576.09,
+        657.0
+    ],
+    "GC_12_47_1_node_21": [
+        523.57,
+        858.74
+    ],
+    "GC_12_47_1_node_7": [
+        433.49,
+        1003.8
+    ],
+    "GC_12_47_1_node_8": [
+        583.08,
+        942.7
+    ],
+    "GC_12_47_1_node_9": [
+        585.55,
+        864.6
+    ],
+    "GC_12_47_1_node_10": [
+        388.25,
+        925.07
+    ],
+    "GC_12_47_1_node_25": [
+        370.2,
+        920.49
+    ],
+    "GC_12_47_1_node_11": [
+        442.96,
+        947.43
+    ],
+    "GC_12_47_1_node_12": [
+        441.44,
+        968.24
+    ],
+    "GC_12_47_1_node_22": [
+        424.52,
+        937.99
+    ],
+    "GC_12_47_1_node_13": [
+        461.21,
+        937.93
+    ],
+    "GC_12_47_1_node_14": [
+        478.7,
+        929.04
+    ],
+    "GC_12_47_1_node_15": [
+        549.6,
+        914.28
+    ],
+    "GC_12_47_1_node_16": [
+        535.12,
+        898.43
+    ],
+    "GC_12_47_1_node_17": [
+        552.47,
+        889.09
+    ],
+    "GC_12_47_1_node_19": [
+        517.41,
+        909.34
+    ],
+    "GC_12_47_1_node_18": [
+        499.91,
+        918.64
+    ],
+    "GC_12_47_1_node_20": [
+        528.35,
+        878.24
+    ],
+    "GC_12_47_1_node_23": [
+        406.36,
+        930.8
+    ],
+    "GC_12_47_1_node_26": [
+        1208.9,
+        108.34
+    ],
+    "GC_12_47_1_node_28": [
+        1264.6,
+        44.3
+    ]
+}