Skip to content
This repository has been archived by the owner on Sep 27, 2023. It is now read-only.

Commit

Permalink
Fix error message when branch is not found in repo (#1214)
Browse files Browse the repository at this point in the history
* Fix error message when branch is not found in repo

* Update gridlabd-template

* Pole module fixes for validation (#1221)

* Fix json save (#1235)

* Add global variable initialization support

* Fix json globals to include initial value

* Add support for fast install (#1017)

* adjusted subcommand syntax due to unknown autoscan error

* tested restoring relevant shebang line

* adjusted script call method

* readjusted remaining subcommands

* reversed missed changes

* test variable useage

* adjusted shell subcommands python to use GLD_BIN variable for path

* Adjusted setup to track version build in each versions directory

* Updated build script for easier maintenance, readability, and error checking

* Updated Python Version to 3.9.13 to see if patch fixes occasional build bugs

* adjusted make commands for potential fix in script python build

* potential make fix

* added check to see if requirements is installing correctly

* changed test

* changed platform.h to error if PYTHON_EXEC is undefined

* adjusted python build to properly overwrite top bin links on new sourcebuild

* adjusted python hashbang for testing

* tweaked configure.ac

* added PYTHON_EXEC to CFLAGS

* updated configure, added check test notices

* adjusted variables and declaration order in configure

* changed to correct variable

* updated exec call

* Restored original hashbang point to opt/gridlabd/bin/python3

* additional python adjustments

* adjusted reference to python3-config location

* adjusted variable call in python3 script

* added echo to check output of various variables

* testing alternative variable

* adjusted variable call

* updated python makefile variables

* updated reference format for variable

* adjusted variables again

* adjusted additional variables

* more adjustments

* tweaked makefile

* testing variables

* further tests

* corrected syntax

* fixed additional makefile python references

* fixed another hardcoded python reference

* testing define

* adjusted calling command for python selector script

* appropriate replacement for python hashbang

* Implemented fix for variable python execution path

* added missed exec line in convert

* Corrected autotests to use version specific python version

* corrected more improper python references

* Final tweaks for dynamic python implementation.

* fully finished code cleanup for darwin installers

* updated missed improper python3 call format

* Cleaned up debian installers to use new variable system for faster script updates

* Minor version adjustments for packages in debian, updated ubuntu install script

* Updated documentation and made minor edits

* various tweaks

* added installs for docker containers, adjusted ldconfig for linux

* updated m4sh file to dynamically adjust between linux and darwin python installs

* bugfix

* fixed minor typo

* tweaked test

* updated linux images to only build from docker containers

* removed unused variable

* minor tweak to install-dev

* updated reference to find docker if in docker container

* added -r for cp, and rm for system files

* updated build-image to remove all default libraries from saved libs

* tweaked libraries linux fast install

* added link to /usr/local/bin for current gridlabd executable

* ensured g++ is installed for debian docker

* added autoconf build for debian 9 docker

* update ubuntu 20 install

* tweaks

* updated pandas version

* Updated install.sh script for web install to include latest updates from dev

* removed test output to prevent adding to repository

* created readme for fast-install

* updated readme, tweaked scripts

* Updated install to allow user to submit version for fast install

* added flags section to readme

* adjusted autoconf version

* minor adjustments to update autoconf version used in actions runner

* adjusted syntax

* added install for sudo package on runner

* attempting with apt-get instead of apt

* potential fix for github actions

* modified actions to use ubuntu container

* adjusted apt install order to circumvent tzdata location issue

* modified tzdata install line

* potential tzdata workaround

* potential workaround for git repository issue

* fix git repo owner issue on runner

* adjusted linux scripts for fast builds using a prepared container

* testing container for faster builds

* removed environment updates as not used in new container

* minor tweaks to enable faster builds

* adjusted check path for doxygen so test can actually work

* updated monterey x86 installer

* updated chown command for site packages

* added missing logic to make home/temp directory

* Added check for $USER variable to exist, to work around docker container bug

* updated fast install scripts with potential fix for python package issues

* added potential script for ubuntu 22

* minor tweak

* Adjusted chown for all gridlabd package dirs

* Added link to /usr/local/bin for installed gridlabd

* removed 22

* readd with permissions

* fixed minor missed element from build-aux

* fixed openssl install on arm to use arm Configure

* Added checks to update ownership for install in case of multi-user computers.

* Change file permissions/update readme

* Removed line from develop workflow due to fixed bug

* homebrew deprecated old install command, replaced

* testing

* adjusted

* brought install up to date with install-dev

* corrected a pair of bugs in the install script.

* minor tweak to optimize build image script

* Removed unnecessary extra install script

* Directory overhaul and major variable additions

* added creation of directory

* updated m4sh

* fixed minor structural issue

* fixed variable

* reorganized declarations

* adjusted definition method for vars

* reformatted to fix char and char const concat

* updated strcat for gld var

* adjusted syntax

* restructured getenv again

* adjusted var

* changed to braces?

* adjusted braces

* potential fix

* other fix?

* adjusted again

* adjustment

* use getenv without std

* other method

* wild fix attempt

* this hurts

* maybe?

* maybe?

* new version

* test

* added braces

* mirror potential fix

* hmmm

* test

* now? pls?

* chance?

* try

* hum?

* hoh?

* new try

* hmm

* giving up after this

* updated method for quick test

* updated install-dev, added brace

* more directory updates

* tried removing the -1 for testing

* adjusted char types

* additional char type mod

* removed the *

* ugh

* adjusted char type

* this?

* i

* minor adjust

* PLEASE

* test more fixes

* and awaaaaaay we go!

* additionals

* test configname fix

* probably wont work

* this wont work

* test fixies

* potential billing library fix

* test

* revert

* mayhaps

* revert

* adjusted script find function for ca-certs

* corrected ca-cert install to account for package version updates

* potential fix for module implementation

* test fix test for cert.pem

* change to -f

* corrected implementation in powerflow

* theoretical fix to gridlabd version subcommand

* corrected link typo in install.sh

* test

* changed basename to dirname

* potential fix install.sh

* changed from os.environ to os.getenv

* corrected python string syntax

* fixed remaining string needing f"

* fix path issue

* added updated cert check to all darwin installs

* fixed bug in change to fast install image build

* final fix install-dev

* bringing install.sh current with dev

* fixed build image for linux

* syntax correction

* adjust name

* potential fix to image build script bug on docker systems

* updated ldconfig command install-dev

* updated chown to default to root when user undefined

* adjusted fast install and build image to separate system libs from package libs

* made minor adjustments to scripts

* added procps to docker fast install. changed default branch for dev install to develop.

* updated readme documentation

* fixed mismatch

* updated docs, added -r to mac cp commands

* test variable passthrough to subshell

* retest

* test with export

* Added prefix support to script install

* potential fix install for configure

* adjusted directory issue with prefix settings

* testing configure update

* corrected syntax

* fixed minor bug

* adjusted variables for dynamic use

* potential configure fix

* corrected non-variable line in fire danger test

* adjusted darwin cp command to darwin standards

* updated install.md instructions

* updated cloud documentation

* fixed typo

* tweaked configure.ac to set minimum default python as 3.9

* removed link to python pymalloc

* updated ca-cert check to account for multiple directories available at one time

* adjusted unnecessary basename

* updated installation scripts to clean out unecessary code, package missing dependencies in intel macs

* link gettext to lib for dependency resolution

* updated install to match dev, and et defaults appropriately

* added error check to build image to exit out and prevent strange bugs if version does not exist when run

* added ownership update to install script

* tweaked command for install and tweaked message for post-install user actions

* updated installer scripts

* added extra ownership line to ensure smooth install

* tweaked install script

* tweaked install script

* Added a couple tweaks for m1 install and version.sh bug

* Update requirements.txt

Added pymysql to requirements per the TESS API tech transfer to-do list.

* added automated clean before install script runs

Co-authored-by: Thistleman <codes5096@gmail.com>
Co-authored-by: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com>

* Update load.cpp (#1239)

Co-authored-by: Alyona Teyber <Ivanova.alyona5@gmail.com>

* Add install tool (#1237)

* Add gridlabd install tool

* Update Makefile.mk

* Update install.py

* Update install.py

* Update install.py

* Update install.py

* Update install.py

* Update install.py

* Update install.py

* Update install.py

* Update install.py

* Update install.py

* Update install.py

Co-authored-by: Alyona Teyber <Ivanova.alyona5@gmail.com>

* Update cmdarg.cpp (#1211)

Co-authored-by: Alyona Teyber <Ivanova.alyona5@gmail.com>

* Develop update dockerbase (#1245)

* Updating base image to an ubuntu based image

* Update Dockerfile

* Bump ipython from 7.31.1 to 8.10.0 in /module/resilience/docs (#1249)

* Bump pillow from 9.0.1 to 9.3.0 in /converters (#1224)

Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.0.1 to 9.3.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](python-pillow/Pillow@9.0.1...9.3.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump ipython from 7.31.1 to 8.10.0 in /module/resilience/docs

Bumps [ipython](https://github.com/ipython/ipython) from 7.31.1 to 8.10.0.
- [Release notes](https://github.com/ipython/ipython/releases)
- [Commits](ipython/ipython@7.31.1...8.10.0)

---
updated-dependencies:
- dependency-name: ipython
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Cleaning up double-entered requirements

* More dependency clean up

* Update test_fire_danger.tif

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alyona Teyber <Ivanova.alyona5@gmail.com>

* Fix ICA violation test speed issues (#1183)

* Move node violation scan from sync to commit

* Update node.cpp

* Add check to avoid unneeded bus voltage fluctuation tests

---------

Co-authored-by: Alyona Teyber <Ivanova.alyona5@gmail.com>

* Reverting unwanted commit to develop 9f68226

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Alyona Teyber <Ivanova.alyona5@gmail.com>
Co-authored-by: Thistleman <codes5096@gmail.com>
Co-authored-by: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
5 people authored Mar 11, 2023
1 parent 9f68226 commit ea828ab
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 44 deletions.
39 changes: 2 additions & 37 deletions module/powerflow/node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,7 @@ double node::default_overvoltage_violation_threshold = 0.00;
double node::default_undervoltage_violation_threshold = 0.00;
double node::default_voltage_fluctuation_threshold = 0.03;
OBJECT* *node::DER_objectlist = NULL;
unsigned int *node::DER_buslist = NULL;
unsigned int node::DER_nodecount = 0;
unsigned int node::DER_buscount = 0;
enumeration node::DER_violation_test = DVT_ANY;

node::node(MODULE *mod) : powerflow_object(mod)
Expand Down Expand Up @@ -2849,7 +2847,7 @@ TIMESTAMP node::sync(TIMESTAMP t0)
NR_retval=t1;

// process DER voltage fluctuations
if ( DER_objectlist != NULL && NR_retval == t1 )
if ( DER_objectlist != NULL )
{
debug("starting DER voltage fluctuation checks...");

Expand All @@ -2870,42 +2868,9 @@ TIMESTAMP node::sync(TIMESTAMP t0)
}

// process every bus looking for DER to apply
if ( DER_buslist == NULL )
for ( unsigned int der = 0 ; der < NR_bus_count ; der++ )
{

// first count the busses we need to check
DER_buscount = 0;
for ( unsigned int der = 0 ; der < NR_bus_count ; der++ )
{
BUSDATA *der_bus = NR_busdata + der;
node *der_data = OBJECTDATA(der_bus->obj,node);
if ( der_bus->obj->parent != NULL && gl_object_isa(der_bus->obj->parent,"node") )
continue; // ignore child nodes because they're already included in parent node DER_value
if ( der_data->DER_value.r != 0.0 || der_data->DER_value.i != 0.0 )
{
DER_buscount++;
}
}

// then build the bus list
DER_buslist = new unsigned int[DER_buscount];
for ( unsigned int der = 0, ndx = 0 ; der < NR_bus_count ; der++ )
{
BUSDATA *der_bus = NR_busdata + der;
node *der_data = OBJECTDATA(der_bus->obj,node);
if ( der_bus->obj->parent != NULL && gl_object_isa(der_bus->obj->parent,"node") )
continue; // ignore child nodes because they're already included in parent node DER_value
if ( der_data->DER_value.r != 0.0 || der_data->DER_value.i != 0.0 )
{
DER_buslist[ndx++] = der;
}
}
}

// process every bus looking for DER to apply
for ( unsigned int ndx = 0 ; ndx < DER_buscount ; ndx++ )
{
unsigned int der = DER_buslist[ndx];
BUSDATA *der_bus = NR_busdata + der;
node *der_data = OBJECTDATA(der_bus->obj,node);
if ( der_bus->obj->parent != NULL && gl_object_isa(der_bus->obj->parent,"node") )
Expand Down
7 changes: 1 addition & 6 deletions module/powerflow/node.h
Original file line number Diff line number Diff line change
Expand Up @@ -137,16 +137,11 @@ class node : public powerflow_object
FUNCTIONADDR VFD_updating_function; ///< Address for VFD updating function, if it is present
OBJECT *VFD_object; ///< Object pointer for the VFD - for later function calls

public:

NRSOLVERMODE powerflow_type;

// DER globals
static unsigned int DER_nodecount; ///< count of DER nodes
static OBJECT **DER_objectlist; ///< list of DER objects to examine for voltage fluctuations violations
static unsigned int DER_buscount; ///< count of DER busses
static unsigned int *DER_buslist; ///< list of DER bus id to examine for voltage violations

public:
double frequency; ///< frequency (only valid on reference bus) */
object reference_bus; ///< reference bus from which frequency is defined */
static unsigned int n; ///< node count */
Expand Down
2 changes: 1 addition & 1 deletion subcommands/gridlabd-template
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ CACHEDIR="$DATADIR/.gridlabd-template"
GITPROJ="$GITHUB/$GITUSER/$GITREPO"
GITFILE="$GITHUBUSERCONTENT/$GITUSER/$GITREPO/$GITBRANCH"
COMMIT_INFO=$(curl -sL "$GITAPI/repos/$GITUSER/$GITREPO/branches/$GITBRANCH")
COMMIT_ID=$(echo $COMMIT_INFO | gridlabd json-get commit sha || error 1 $(echo $COMMIT_INFO | gridlabd json-get message))
COMMIT_ID=$(echo $COMMIT_INFO | gridlabd json-get commit sha 2>/dev/null || error 1 $(echo $COMMIT_INFO | gridlabd json-get message 2>/dev/null))
INDEX=$CACHEDIR/$COMMIT_ID

# process command
Expand Down

0 comments on commit ea828ab

Please sign in to comment.