Skip to content

Bugfix/gld5.0 support #34

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

Open
afisher1 wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Bugfix/gld5.0 support #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5465c90
Removing Deprecated properties from Solar and
afisher1 Nov 8, 2022
2b0c18c
Merge branch 'develop' of github.com:GRIDAPPSD/CIMHub into bugfix/gld…
afisher1 Nov 9, 2022
0b91761
updated to version 1.0.2
poorva1209 Nov 9, 2022
77566a6
updated version to 1.0.3
poorva1209 Nov 10, 2022
88ad8a6
removing more deprecated class attributes that were deleted
afisher1 Nov 10, 2022
96e651d
updated version to 1.0.4
poorva1209 Nov 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cimhub/lib.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Bundle-Version: 1.0.1
Bundle-Version: 1.0.4
Private-Package: \
gov.pnnl.gridappsd.cimhub.components,\
gov.pnnl.gridappsd.cimhub.queryhandler.impl
Expand Down
2 changes: 0 additions & 2 deletions cimhub/src/main/java/gov/pnnl/gridappsd/cimhub/components/DistSolar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ public String GetGLM() {
buf.append (" Q_Out " + df3.format (q) + ";\n");
buf.append (" object solar {\n");
buf.append (" name \"pv_" + name + "\";\n");
buf.append (" generator_mode SUPPLY_DRIVEN;\n");
buf.append (" generator_status ONLINE;\n");
buf.append (" panel_type SINGLE_CRYSTAL_SILICON;\n");
buf.append (" efficiency 0.2;\n");
buf.append (" rated_power " + df3.format (ratedS) + ";\n");
Expand Down
2 changes: 0 additions & 2 deletions cimhub/src/main/java/gov/pnnl/gridappsd/cimhub/components/DistStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ public String GetGLM() {
buf.append (" phases " + phases.replace (":", "") + ";\n");
}
buf.append (" generator_status ONLINE;\n");
buf.append (" generator_mode CONSTANT_PQ;\n");
buf.append (" inverter_type FOUR_QUADRANT;\n");
buf.append (" four_quadrant_control_mode CONSTANT_PQ; // LOAD_FOLLOWING;\n");
buf.append (" charge_lockout_time 1;\n");
Expand All @@ -132,7 +131,6 @@ public String GetGLM() {
buf.append (" state_of_charge " + df4.format (storedE / ratedE) + ";\n");
buf.append (" use_internal_battery_model true;\n");
buf.append (" generator_mode CONSTANT_PQ;\n");
buf.append (" generator_status ONLINE;\n");
buf.append (" battery_type LI_ION;\n");
buf.append (" round_trip_efficiency 0.86;\n");
buf.append (" rated_power " + df3.format (ratedS) + ";\n");
Expand Down
2 changes: 0 additions & 2 deletions cimhub/src/main/java/gov/pnnl/gridappsd/cimhub/components/DistSyncMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ public String GetGLM() {
buf.append (" parent \"" + bus + "_dgmtr\";\n");
String Sphase;
if (phases.contains ("S")) {
buf.append(" phases " + phases.replace (":", "") + ";\n");
if (q < 0.0) {
Sphase = df2.format(p) + "-" + df2.format(-q) + "j";
} else {
Expand All @@ -99,7 +98,6 @@ public String GetGLM() {
buf.append (" power_out_C " + Sphase + ";\n");
}
} else {
buf.append(" phases " + phases.replace (":", "") + "N;\n");
if (q < 0.0) {
Sphase = df2.format(p/3.0) + "-" + df2.format(-q/3.0) + "j";
} else {
Expand Down
2 changes: 1 addition & 1 deletion cimhub/src/main/java/gov/pnnl/gridappsd/cimhub/dto/packageinfo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version 0.2.3
version 0.0.1
2 changes: 1 addition & 1 deletion cimhub/src/main/java/gov/pnnl/gridappsd/cimhub/packageinfo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version 0.2.3
version 1.0.0
2 changes: 1 addition & 1 deletion cimhub/src/main/java/gov/pnnl/gridappsd/cimhub/queryhandler/packageinfo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version 0.2.3
version 0.0.1
Binary file added cnf/release/cimhub.lib/cimhub.lib-1.0.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added cnf/release/cimhub.lib/cimhub.lib-1.0.3.jar
View file
Open in desktop
Binary file not shown.
Binary file added cnf/release/cimhub.lib/cimhub.lib-1.0.4.jar
View file
Open in desktop
Binary file not shown.
188 changes: 187 additions & 1 deletion cnf/release/index.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<repository increment="1660940483776" name="Release" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
<repository increment="1668125131199" name="Release" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
<resource>
<capability namespace="osgi.identity">
<attribute name="osgi.identity" value="cimhub.lib"/>
Expand Down Expand Up @@ -535,4 +535,190 @@
<directive name="filter" value="(&amp;(osgi.ee=JavaSE)(version=1.8))"/>
</requirement>
</resource>
<resource>
<capability namespace="osgi.identity">
<attribute name="osgi.identity" value="cimhub.lib"/>
<attribute name="type" value="osgi.bundle"/>
<attribute name="version" type="Version" value="1.0.2"/>
</capability>
<capability namespace="osgi.content">
<attribute name="osgi.content" value="cef3bcb00f8266a3cb4ab9cc99a27cfa22f57a556345f61410200c8b05b93996"/>
<attribute name="url" value="cimhub.lib/cimhub.lib-1.0.2.jar"/>
<attribute name="size" type="Long" value="306970"/>
<attribute name="mime" value="application/vnd.osgi.bundle"/>
</capability>
<capability namespace="osgi.wiring.bundle">
<attribute name="osgi.wiring.bundle" value="cimhub.lib"/>
<attribute name="bundle-version" type="Version" value="1.0.2"/>
</capability>
<capability namespace="osgi.wiring.host">
<attribute name="osgi.wiring.host" value="cimhub.lib"/>
<attribute name="bundle-version" type="Version" value="1.0.2"/>
</capability>
<capability namespace="osgi.wiring.package">
<attribute name="osgi.wiring.package" value="gov.pnnl.gridappsd.cimhub.queryhandler"/>
<attribute name="version" type="Version" value="0.2.3"/>
<attribute name="bundle-symbolic-name" value="cimhub.lib"/>
<attribute name="bundle-version" type="Version" value="1.0.2"/>
<directive name="uses" value="org.apache.jena.query"/>
</capability>
<capability namespace="osgi.wiring.package">
<attribute name="osgi.wiring.package" value="gov.pnnl.gridappsd.cimhub"/>
<attribute name="version" type="Version" value="0.2.3"/>
<attribute name="bundle-symbolic-name" value="cimhub.lib"/>
<attribute name="bundle-version" type="Version" value="1.0.2"/>
<directive name="uses" value="gov.pnnl.gridappsd.cimhub.dto,gov.pnnl.gridappsd.cimhub.queryhandler"/>
</capability>
<capability namespace="osgi.wiring.package">
<attribute name="osgi.wiring.package" value="gov.pnnl.gridappsd.cimhub.dto"/>
<attribute name="version" type="Version" value="0.2.3"/>
<attribute name="bundle-symbolic-name" value="cimhub.lib"/>
<attribute name="bundle-version" type="Version" value="1.0.2"/>
</capability>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=gov.pnnl.gridappsd.cimhub.dto)(version&gt;=0.2.0)(!(version&gt;=1.0.0)))"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(osgi.wiring.package=javax.xml.parsers)"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=org.apache.commons.math3.complex)(version&gt;=3.6.0)(!(version&gt;=4.0.0)))"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=org.apache.jena.query)(version&gt;=3.7.0)(!(version&gt;=4.0.0)))"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=org.apache.jena.rdf.model)(version&gt;=3.7.0)(!(version&gt;=4.0.0)))"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(osgi.wiring.package=org.w3c.dom)"/>
</requirement>
<requirement namespace="osgi.ee">
<directive name="filter" value="(&amp;(osgi.ee=JavaSE)(version=1.8))"/>
</requirement>
</resource>
<resource>
<capability namespace="osgi.identity">
<attribute name="osgi.identity" value="cimhub.lib"/>
<attribute name="type" value="osgi.bundle"/>
<attribute name="version" type="Version" value="1.0.3"/>
</capability>
<capability namespace="osgi.content">
<attribute name="osgi.content" value="82c81c63008ba1889d56f7c7b525c0c4f8b11c073d51ad0bf70ca1f97d260658"/>
<attribute name="url" value="cimhub.lib/cimhub.lib-1.0.3.jar"/>
<attribute name="size" type="Long" value="306898"/>
<attribute name="mime" value="application/vnd.osgi.bundle"/>
</capability>
<capability namespace="osgi.wiring.bundle">
<attribute name="osgi.wiring.bundle" value="cimhub.lib"/>
<attribute name="bundle-version" type="Version" value="1.0.3"/>
</capability>
<capability namespace="osgi.wiring.host">
<attribute name="osgi.wiring.host" value="cimhub.lib"/>
<attribute name="bundle-version" type="Version" value="1.0.3"/>
</capability>
<capability namespace="osgi.wiring.package">
<attribute name="osgi.wiring.package" value="gov.pnnl.gridappsd.cimhub.queryhandler"/>
<attribute name="version" type="Version" value="0.0.1"/>
<attribute name="bundle-symbolic-name" value="cimhub.lib"/>
<attribute name="bundle-version" type="Version" value="1.0.3"/>
<directive name="uses" value="org.apache.jena.query"/>
</capability>
<capability namespace="osgi.wiring.package">
<attribute name="osgi.wiring.package" value="gov.pnnl.gridappsd.cimhub"/>
<attribute name="version" type="Version" value="1.0.0"/>
<attribute name="bundle-symbolic-name" value="cimhub.lib"/>
<attribute name="bundle-version" type="Version" value="1.0.3"/>
<directive name="uses" value="gov.pnnl.gridappsd.cimhub.dto,gov.pnnl.gridappsd.cimhub.queryhandler"/>
</capability>
<capability namespace="osgi.wiring.package">
<attribute name="osgi.wiring.package" value="gov.pnnl.gridappsd.cimhub.dto"/>
<attribute name="version" type="Version" value="0.0.1"/>
<attribute name="bundle-symbolic-name" value="cimhub.lib"/>
<attribute name="bundle-version" type="Version" value="1.0.3"/>
</capability>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=gov.pnnl.gridappsd.cimhub.dto)(version&gt;=0.0.0)(!(version&gt;=1.0.0)))"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(osgi.wiring.package=javax.xml.parsers)"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=org.apache.commons.math3.complex)(version&gt;=3.6.0)(!(version&gt;=4.0.0)))"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=org.apache.jena.query)(version&gt;=3.7.0)(!(version&gt;=4.0.0)))"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=org.apache.jena.rdf.model)(version&gt;=3.7.0)(!(version&gt;=4.0.0)))"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(osgi.wiring.package=org.w3c.dom)"/>
</requirement>
<requirement namespace="osgi.ee">
<directive name="filter" value="(&amp;(osgi.ee=JavaSE)(version=1.8))"/>
</requirement>
</resource>
<resource>
<capability namespace="osgi.identity">
<attribute name="osgi.identity" value="cimhub.lib"/>
<attribute name="type" value="osgi.bundle"/>
<attribute name="version" type="Version" value="1.0.4"/>
</capability>
<capability namespace="osgi.content">
<attribute name="osgi.content" value="1216f2a78da2a4c404bfbc3704de3056330b70090238cf6dc390bddd21cb8ce3"/>
<attribute name="url" value="cimhub.lib/cimhub.lib-1.0.4.jar"/>
<attribute name="size" type="Long" value="306816"/>
<attribute name="mime" value="application/vnd.osgi.bundle"/>
</capability>
<capability namespace="osgi.wiring.bundle">
<attribute name="osgi.wiring.bundle" value="cimhub.lib"/>
<attribute name="bundle-version" type="Version" value="1.0.4"/>
</capability>
<capability namespace="osgi.wiring.host">
<attribute name="osgi.wiring.host" value="cimhub.lib"/>
<attribute name="bundle-version" type="Version" value="1.0.4"/>
</capability>
<capability namespace="osgi.wiring.package">
<attribute name="osgi.wiring.package" value="gov.pnnl.gridappsd.cimhub.queryhandler"/>
<attribute name="version" type="Version" value="0.2.3"/>
<attribute name="bundle-symbolic-name" value="cimhub.lib"/>
<attribute name="bundle-version" type="Version" value="1.0.4"/>
<directive name="uses" value="org.apache.jena.query"/>
</capability>
<capability namespace="osgi.wiring.package">
<attribute name="osgi.wiring.package" value="gov.pnnl.gridappsd.cimhub"/>
<attribute name="version" type="Version" value="0.2.3"/>
<attribute name="bundle-symbolic-name" value="cimhub.lib"/>
<attribute name="bundle-version" type="Version" value="1.0.4"/>
<directive name="uses" value="gov.pnnl.gridappsd.cimhub.dto,gov.pnnl.gridappsd.cimhub.queryhandler"/>
</capability>
<capability namespace="osgi.wiring.package">
<attribute name="osgi.wiring.package" value="gov.pnnl.gridappsd.cimhub.dto"/>
<attribute name="version" type="Version" value="0.2.3"/>
<attribute name="bundle-symbolic-name" value="cimhub.lib"/>
<attribute name="bundle-version" type="Version" value="1.0.4"/>
</capability>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=gov.pnnl.gridappsd.cimhub.dto)(version&gt;=0.2.0)(!(version&gt;=1.0.0)))"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(osgi.wiring.package=javax.xml.parsers)"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=org.apache.commons.math3.complex)(version&gt;=3.6.0)(!(version&gt;=4.0.0)))"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=org.apache.jena.query)(version&gt;=3.7.0)(!(version&gt;=4.0.0)))"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=org.apache.jena.rdf.model)(version&gt;=3.7.0)(!(version&gt;=4.0.0)))"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(osgi.wiring.package=org.w3c.dom)"/>
</requirement>
<requirement namespace="osgi.ee">
<directive name="filter" value="(&amp;(osgi.ee=JavaSE)(version=1.8))"/>
</requirement>
</resource>
</repository>
Binary file added cnf/release/index.xml.gz
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions cnf/release/index.xml.gz.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
570c7e9f9a66937b5cd3f8210b00e67b81e561b8ad1032ab2ee74b8b6dfc62c9
2 changes: 1 addition & 1 deletion cnf/release/index.xml.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5df953f68c911bd2779040a046f0ffdc0b42df2508728a994c986b0519d7f3a3
0ace8992ca035dca7d14488cc54c20dc2350148f37accedabebfaf32b2306eca