Skip to content

Commit 30c9c48

Browse files
committed
Update GridLabD to master 5.2, removed unnecessary calls in model and modify for GLM in tesp_support api
1 parent ad750a8 commit 30c9c48

File tree

16 files changed

+167
-15934
lines changed

16 files changed

+167
-15934
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ Change log:
2727
- v1.2.1 Fixed python shell files, fixed complex python to use helics complex.
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
30+
- v1.3.2 Updated model and modifier for GridLAB-D models, added readme for GLM modifier and Store examples

examples/capabilities/gld_modifier/feeder_generator_demo.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import sys
1818
import networkx as nx
1919

20-
from tesp_support.api.modifier import GLMModifier
20+
from tesp_support.api.modify_GLM import GLMModifier
2121
from tesp_support.api.data import feeders_path
2222

2323
# Getting all the existing tesp_support stuff
@@ -56,8 +56,9 @@ def data(self, message, *args, **kws):
5656
def _auto_run(args):
5757
feeder_path = os.path.join(args.feeder_path, args.feeder_file)
5858
glmMod = GLMModifier()
59-
glmMod.read_model(feeder_path)
60-
glm = glmMod.glm
59+
glm, success = glmMod.read_model(feeder_path)
60+
if not success:
61+
print('File not found or file not supported, exiting!')
6162

6263
glmMod.add_module("residential", [])
6364

scripts/build/fncs.patch

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17521,7 +17521,7 @@ index 86c796a..8cfbba5 100644
1752117521

1752217522
/* Version number of package */
1752317523
diff --git a/configure b/configure
17524-
index 855abed..3471e94 100755
17524+
index 855abed..81ce984 100755
1752517525
--- a/configure
1752617526
+++ b/configure
1752717527
@@ -1,11 +1,12 @@
@@ -32544,7 +32544,7 @@ index 855abed..3471e94 100755
3254432544
ltmain=$ac_aux_dir/ltmain.sh
3254532545

3254632546

32547-
@@ -25622,44 +26774,43 @@ if test "$no_create" != yes; then
32547+
@@ -25622,44 +26774,45 @@ if test "$no_create" != yes; then
3254832548
$ac_cs_success || as_fn_exit 1
3254932549
fi
3255032550
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
@@ -32590,7 +32590,6 @@ index 855abed..3471e94 100755
3259032590
-$as_echo "$as_me: ZIP_EXT=$ZIP_EXT" >&6;}
3259132591
-{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
3259232592
-$as_echo "$as_me: " >&6;}
32593-
-
3259432593
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: " >&5
3259532594
+printf "%s\n" "$as_me: " >&6;}
3259632595
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: **************************************************************" >&5
@@ -32625,6 +32624,8 @@ index 855abed..3471e94 100755
3262532624
+printf "%s\n" "$as_me: ZIP_EXT=$ZIP_EXT" >&6;}
3262632625
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: " >&5
3262732626
+printf "%s\n" "$as_me: " >&6;}
32627+
+
32628+
3262832629
diff --git a/m4/libtool.m4 b/m4/libtool.m4
3262932630
deleted file mode 100644
3263032631
index a3bc337..0000000

scripts/build/gridlab-d.id

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4ea6109ea53692fe00c19ced4f57f0a7db2fca52
1+
72dc7b044362fe4600d9fc462c325c77382735ef

0 commit comments

Comments
 (0)