diff --git a/.github/workflows/develop-image.yml b/.github/workflows/develop-image.yml index 8bdc5150d..285121648 100644 --- a/.github/workflows/develop-image.yml +++ b/.github/workflows/develop-image.yml @@ -178,6 +178,11 @@ jobs: - name: Run CF invalidation run: aws cloudfront create-invalidation --distribution-id ${{ secrets.DEV_CF_ID }} --paths '/*' + - name: Set output + run: | + echo "VERSION=Arras Energy HiPAS GridLAB-D $(./build-aux/version.sh --version) (Developer)" >> $GITHUB_ENV + echo "TAGNAME=gridlabd/$(./build-aux/version.sh --version)-$(./build-aux/version.sh --number)-$(./build-aux/version.sh --branch)" >> $GITHUB_ENV + - name: Install Packer run: | wget https://releases.hashicorp.com/packer/1.7.6/packer_1.7.6_linux_amd64.zip @@ -195,6 +200,8 @@ jobs: -var "aws_secret_key=${{ secrets.AWS_SECRET_ACCESS_KEY }}" \ -var "aws_region=${{ secrets.AWS_REGION }}" \ -var "dev_s3_url=${{ secrets.DEV_S3_URL }}" \ + -var "version=${{ env.VERSION }}" \ + -var "tagname=${{ env.TAGNAME }}" \ ./docker/packer/templateDevelop.pkr.hcl buildUbuntuDockerhub: diff --git a/.github/workflows/master-image.yml b/.github/workflows/master-image.yml index 08fbad2d8..e7bd24402 100644 --- a/.github/workflows/master-image.yml +++ b/.github/workflows/master-image.yml @@ -152,6 +152,11 @@ jobs: - name: Run CF invalidation run: aws cloudfront create-invalidation --distribution-id ${{ secrets.PROD_CF_ID }} --paths '/*' + - name: Set output + run: | + echo "VERSION=Arras Energy HiPAS GridLAB-D $(./build-aux/version.sh --version)" >> $GITHUB_ENV + echo "TAGNAME=gridlabd/$(./build-aux/version.sh --version)-$(./build-aux/version.sh --number)-$(./build-aux/version.sh --branch)" >> $GITHUB_ENV + - name: Install Packer run: | wget https://releases.hashicorp.com/packer/1.7.6/packer_1.7.6_linux_amd64.zip @@ -169,6 +174,8 @@ jobs: -var "aws_secret_key=${{ secrets.AWS_SECRET_ACCESS_KEY }}" \ -var "aws_region=${{ secrets.AWS_REGION }}" \ -var "prod_s3_url=${{ secrets.PROD_S3_URL }}" \ + -var "version=${{ env.VERSION }}" \ + -var "tagname=${{ env.TAGNAME }}" \ ./docker/packer/prod.pkr.hcl buildUbuntuDockerhub: @@ -184,7 +191,7 @@ jobs: - name: Set output run: | echo "VERSION=$(./build-aux/version.sh --version)" >> $GITHUB_ENV - + - name: Login to DockerHub uses: docker/login-action@v1 with: diff --git a/README.md b/README.md index e9eb0e6b2..b7995b687 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,13 @@ This is the last release of HiPAS GridLAB-D before it is transferred to LF Energ | Repository | Build | Deploy | | :---: | :---: | :---: | -| [GridLAB-D](https://github.com/slacgismo/gridlabd) | ![master](https://github.com/slacgismo/gridlabd/actions/workflows/master.yml/badge.svg?branch=master) ![develop](https://github.com/slacgismo/gridlabd/workflows/develop/badge.svg?branch=develop) | [![master-images](https://github.com/slacgismo/gridlabd/actions/workflows/master-image.yml/badge.svg)](https://github.com/slacgismo/gridlabd/actions/workflows/master-image.yml) [![develop-images](https://github.com/slacgismo/gridlabd/actions/workflows/develop-image.yml/badge.svg)](https://github.com/slacgismo/gridlabd/actions/workflows/develop-image.yml) | -| [Templates](https://github.com/slacgismo/gridlabd-template) | [![master](https://github.com/slacgismo/gridlabd-template/actions/workflows/master.yml/badge.svg)](https://github.com/slacgismo/gridlabd-template/actions/workflows/master.yml) [![develop](https://github.com/slacgismo/gridlabd-template/actions/workflows/develop.yml/badge.svg)](https://github.com/slacgismo/gridlabd-template/actions/workflows/develop.yml) -| [Weather](https://github.com/slacgismo/gridlabd-weather) | [![validate](https://github.com/slacgismo/gridlabd-weather/actions/workflows/validate.yml/badge.svg)](https://github.com/slacgismo/gridlabd-weather/actions/workflows/validate.yml) -| [Library](https://github.com/slacgismo/gridlabd-library) | [![validate](https://github.com/slacgismo/gridlabd-library/actions/workflows/master.yml/badge.svg)](https://github.com/slacgismo/gridlabd-library/actions/workflows/master.yml) [![validate](https://github.com/slacgismo/gridlabd-library/actions/workflows/develop.yml/badge.svg)](https://github.com/slacgismo/gridlabd-library/actions/workflows/develop.yml) -| [Models](https://github.com/slacgismo/gridlabd-models) | [![validate](https://github.com/slacgismo/gridlabd-models/actions/workflows/validate.yml/badge.svg)](https://github.com/slacgismo/gridlabd-models/actions/workflows/validate.yml) -| [Benchmarks](https://github.com/slacgismo/gridlabd-benchmarks) | Manual test (see [README.md](https://github.com/slacgismo/gridlabd-benchmarks/blob/main/README.md)) -| [Examples](https://github.com/slacgismo/gridlabd-examples) | Manual test (see [README.md](https://github.com/slacgismo/gridlabd-examples/blob/master/README.md)) +| [GridLAB-D](https://github.com/arras-energy/gridlabd) | ![master](https://github.com/arras-energy/gridlabd/actions/workflows/master.yml/badge.svg?branch=master) ![develop](https://github.com/arras-energy/gridlabd/workflows/develop/badge.svg?branch=develop) | [![master-images](https://github.com/arras-energy/gridlabd/actions/workflows/master-image.yml/badge.svg)](https://github.com/arras-energy/gridlabd/actions/workflows/master-image.yml) [![develop-images](https://github.com/arras-energy/gridlabd/actions/workflows/develop-image.yml/badge.svg)](https://github.com/arras-energy/gridlabd/actions/workflows/develop-image.yml) | +| [Templates](https://github.com/arras-energy/gridlabd-template) | [![master](https://github.com/arras-energy/gridlabd-template/actions/workflows/master.yml/badge.svg)](https://github.com/arras-energy/gridlabd-template/actions/workflows/master.yml) [![develop](https://github.com/arras-energy/gridlabd-template/actions/workflows/develop.yml/badge.svg)](https://github.com/arras-energy/gridlabd-template/actions/workflows/develop.yml) +| [Weather](https://github.com/arras-energy/gridlabd-weather) | [![validate](https://github.com/arras-energy/gridlabd-weather/actions/workflows/validate.yml/badge.svg)](https://github.com/arras-energy/gridlabd-weather/actions/workflows/validate.yml) +| [Library](https://github.com/arras-energy/gridlabd-library) | [![validate](https://github.com/arras-energy/gridlabd-library/actions/workflows/master.yml/badge.svg)](https://github.com/arras-energy/gridlabd-library/actions/workflows/master.yml) [![validate](https://github.com/arras-energy/gridlabd-library/actions/workflows/develop.yml/badge.svg)](https://github.com/arras-energy/gridlabd-library/actions/workflows/develop.yml) +| [Models](https://github.com/arras-energy/gridlabd-models) | [![validate](https://github.com/arras-energy/gridlabd-models/actions/workflows/validate.yml/badge.svg)](https://github.com/arras-energy/gridlabd-models/actions/workflows/validate.yml) +| [Benchmarks](https://github.com/arras-energy/gridlabd-benchmarks) | Manual test (see [README.md](https://github.com/arras-energy/gridlabd-benchmarks/blob/main/README.md)) +| [Examples](https://github.com/arras-energy/gridlabd-examples) | Manual test (see [README.md](https://github.com/arras-energy/gridlabd-examples/blob/master/README.md)) The documentation for this project is located at http://docs.gridlabd.us/. @@ -25,18 +25,18 @@ This respository contains the source code to HiPAS GridLAB-D, which is being dev # Quick start using Docker -The preferred method for running HiPAS GridLAB-D is to download the master image from docker hub (see https://hub.docker.com/repository/docker/slacgismo/gridlabd). You must install the docker daemon to use docker images. See https://www.docker.com/get-started for details. +The preferred method for running HiPAS GridLAB-D is to download the master image from docker hub (see https://hub.docker.com/repository/docker/arras-energy/gridlabd). You must install the docker daemon to use docker images. See https://www.docker.com/get-started for details. Once you have installed docker, you may issue the following commands to run GridLAB-D at the command line: ~~~ -docker run -it -v $PWD:/model slacgismo/gridlabd:latest gridlabd -W /model [LOADOPTIONS] [FILENAME.EXT] [RUNOPTIONS] +docker run -it -v $PWD:/model arras-energy/gridlabd:latest gridlabd -W /model [LOADOPTIONS] [FILENAME.EXT] [RUNOPTIONS] ~~~ On many systems, an alias can be used to make this a simple command that resembles the command you would normally issue to run a host-based installation: ~~~ -alias gridlabd='docker run -it -v $PWD:/tmp slacgismo/gridlabd:latest gridlabd' +alias gridlabd='docker run -it -v $PWD:/tmp arras-energy/gridlabd:latest gridlabd' ~~~ Note that this alias will interfere with any host-based installation. You may use the `gridlabd docker` command to manage the use of docker images concurrently with host-based installations. @@ -103,7 +103,7 @@ If you want to clone an alternate repository, use the following `git` command in git clone https://github.com/ORG/REPO [-b BRANCH] gridlabd ~~~ -If you do not specify the `--local` then by default the `setup.sh` source will match the `git` repository origin and branch if any. Otherwise the default source will be `slacgismo/gridlabd/master`. If you want to setup from a different origin, use the command `export GRIDLABD_ORIGIN=ORG/REPO/BRANCH` to specify an alternate source for `setup.sh`. The `build.sh` will also match the current `git` repository. +If you do not specify the `--local` then by default the `setup.sh` source will match the `git` repository origin and branch if any. Otherwise the default source will be `arras-energy/gridlabd/master`. If you want to setup from a different origin, use the command `export GRIDLABD_ORIGIN=ORG/REPO/BRANCH` to specify an alternate source for `setup.sh`. The `build.sh` will also match the current `git` repository. *Do not* run the `setup.sh` and `build.sh` scripts with `sudo`, as that will usually create a broken install. If necessary, you should give yourself permission to write `/usr/local` and `brew`'s install folder. If you have not already done so, add `brew` to your path. diff --git a/autotest/README.md b/autotest/README.md index f8480bf4e..61f427c78 100644 --- a/autotest/README.md +++ b/autotest/README.md @@ -1,5 +1,5 @@ # Autotest -This folder contains the DOE taxonomy feeder tests of GridLAB-D's powerflow solver. For more information on the feeder models, see https://github.com/slacgismo/gridlabd-models. +This folder contains the DOE taxonomy feeder tests of GridLAB-D's powerflow solver. For more information on the feeder models, see https://github.com/arras-energy/gridlabd-models. To run a validation test using this folder on, run the command `gridlabd -W autotest -T 0 --validate`. diff --git a/build-aux/version.sh b/build-aux/version.sh index bb21376cf..92008b771 100755 --- a/build-aux/version.sh +++ b/build-aux/version.sh @@ -18,7 +18,7 @@ ## --python the python version, e.g., 3.10 ## --parse INSTALL parses an install name into its constituents ## --docker the docker tag name, e.g., 4.3.1-230701-master-ubuntu_22-x86_64 -## --origin the origin of the source code, e.g., slacgismo/gridlabd/master +## --origin the origin of the source code, e.g., arras-energy/gridlabd/master ## ## This file is used by autoconf to generate the version string. ## It is assumed that this script is run from the top-level srcdir. diff --git a/cloud/servers/version.gridlabd.us/install.sh b/cloud/servers/version.gridlabd.us/install.sh index d56aefb63..51a2e6946 100644 --- a/cloud/servers/version.gridlabd.us/install.sh +++ b/cloud/servers/version.gridlabd.us/install.sh @@ -1,6 +1,6 @@ # EC2 server build script # -# See github:/slacgismo/gridlabd/cloud/servers/version.gridlabd.us/README.md for details +# See github:/arras-energy/gridlabd/cloud/servers/version.gridlabd.us/README.md for details # # Clone gridlabd diff --git a/cloud/websites/docs.gridlabd.us/index.html b/cloud/websites/docs.gridlabd.us/index.html index a9e405ac6..b6157a329 100644 --- a/cloud/websites/docs.gridlabd.us/index.html +++ b/cloud/websites/docs.gridlabd.us/index.html @@ -1,8 +1,8 @@ - + -Redirecting to http://docs.slacgismo.org/index.html?owner=slacgismo&project=gridlabd... +Redirecting to http://docs.arras-energy.org/index.html?owner=arras-energy&project=gridlabd... \ No newline at end of file diff --git a/cloud/websites/geodata.gridlabd.us/index.html b/cloud/websites/geodata.gridlabd.us/index.html index 127236e31..d05fc9303 100644 --- a/cloud/websites/geodata.gridlabd.us/index.html +++ b/cloud/websites/geodata.gridlabd.us/index.html @@ -1,6 +1,6 @@ - + Redirecting... diff --git a/cloud/websites/status.gridlabd.us/active.html b/cloud/websites/status.gridlabd.us/active.html index 86ca8fb82..7a1b89731 100644 --- a/cloud/websites/status.gridlabd.us/active.html +++ b/cloud/websites/status.gridlabd.us/active.html @@ -96,7 +96,7 @@ start = new Date(prompt("Enter report start date (yyyy-mm-dd): ",stop.getFullYear() + "-" + (stop.getMonth()+1) + "-01")); - r = run_query("/repos/slacgismo/gridlabd/issues?state=open&per_page=100&sort=updated&direction=asc&since="+start+"T00:00:00Z"); + r = run_query("/repos/arras-energy/gridlabd/issues?state=open&per_page=100&sort=updated&direction=asc&since="+start+"T00:00:00Z"); item_number = 1; if ( r.status == 200 ) { diff --git a/cloud/websites/status.gridlabd.us/issues-open.html b/cloud/websites/status.gridlabd.us/issues-open.html index 89349912b..58ed79334 100644 --- a/cloud/websites/status.gridlabd.us/issues-open.html +++ b/cloud/websites/status.gridlabd.us/issues-open.html @@ -94,7 +94,7 @@ set_default("token",token); } - r = run_query("/repos/slacgismo/gridlabd/issues?state=open&per_page=100&sort=updated&direction=desc"); + r = run_query("/repos/arras-energy/gridlabd/issues?state=open&per_page=100&sort=updated&direction=desc"); if ( r.status == 200 ) { report = "GridLAB-D Open Issues as of " + stop.getFullYear() + "-" + (stop.getMonth()+1) + "-" + stop.getDate() + "\n"; diff --git a/cloud/websites/status.gridlabd.us/pulls-closed.html b/cloud/websites/status.gridlabd.us/pulls-closed.html index 6fc9fee82..48ee7143e 100644 --- a/cloud/websites/status.gridlabd.us/pulls-closed.html +++ b/cloud/websites/status.gridlabd.us/pulls-closed.html @@ -95,7 +95,7 @@ start = new Date(prompt("Enter report start date (yyyy-mm-dd): ",stop.getFullYear() + "-" + (stop.getMonth()+1) + "-01")); - r = run_query("/repos/slacgismo/gridlabd/pulls?state=closed&per_page=100&sort=updated&direction=desc"); + r = run_query("/repos/arras-energy/gridlabd/pulls?state=closed&per_page=100&sort=updated&direction=desc"); if ( r.status == 200 ) { report = "GridLAB-D Pull Requests Completed for period " + start.getFullYear() + "-" + (start.getMonth()+1) + "-" + start.getDate() + " - " + stop.getFullYear() + "-" + (stop.getMonth()+1) + "-" + stop.getDate() + "\n"; diff --git a/cloud/websites/status.gridlabd.us/pulls-open.html b/cloud/websites/status.gridlabd.us/pulls-open.html index 7d617439c..6fbca2363 100644 --- a/cloud/websites/status.gridlabd.us/pulls-open.html +++ b/cloud/websites/status.gridlabd.us/pulls-open.html @@ -94,7 +94,7 @@ set_default("token",token); } - r = run_query("/repos/slacgismo/gridlabd/pulls?state=open&per_page=100&sort=updated&direction=desc"); + r = run_query("/repos/arras-energy/gridlabd/pulls?state=open&per_page=100&sort=updated&direction=desc"); if ( r.status == 200 ) { report = "GridLAB-D Open Pull Requests as of " + stop.getFullYear() + "-" + (stop.getMonth()+1) + "-" + stop.getDate() + "\n"; diff --git a/converters/json2html.py b/converters/json2html.py index 150c1c424..b3037b0fe 100644 --- a/converters/json2html.py +++ b/converters/json2html.py @@ -277,7 +277,7 @@ def get_popup(name,tag): label = item.title().replace("_"," ") try: module = data['classes'][value]['module'] - value = f'{value}' + value = f'{value}' except: pass popup += f'{label} {value}\n' diff --git a/docker/build.sh b/docker/build.sh index 9100f8d20..d80f5e15b 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -14,7 +14,7 @@ ## performed first ## ## --release Release the resulting image as the latest version of -## slacgismo/gridlabd. The master branch is released +## arras-energy/gridlabd. The master branch is released ## as 'latest'. Otherwise the branch name is used as the tag name. ## error () { echo "ERROR [docker/build.sh]: $*" ; exit 1; } @@ -54,7 +54,7 @@ if [ "$DOLATEST" = "yes" ]; then if [ "$BRANCH" = "master" ]; then BRANCH="latest" fi - IMAGE="slacgismo/gridlabd-$(build-aux/version.sh --machine)" + IMAGE="arras-energy/gridlabd-$(build-aux/version.sh --machine)" docker tag "$NAME:$TAG" "$IMAGE:$BRANCH" || error "tag latest failed" if [ "$DOPUSH" = "yes" ]; then docker push "$IMAGE:$BRANCH" || error "push latest failed" diff --git a/docker/packer/prod.pkr.hcl b/docker/packer/prod.pkr.hcl index 065f24f54..f65377efc 100644 --- a/docker/packer/prod.pkr.hcl +++ b/docker/packer/prod.pkr.hcl @@ -28,12 +28,22 @@ variable "prod_s3_url" { description = "S3 bucket URL" } +variable "version" { + type = string + description = "GridLAB-D Version" +} + +variable "tagname" { + type = string + description = "GridLAB-D Full Version Tag Name" +} + source "amazon-ebs" "ubuntu-22-04" { source_ami = "ami-014d05e6b24240371" region = var.aws_region instance_type = "t2.micro" ssh_username = "ubuntu" - ami_name = "HiPAS Gridlabd Ubuntu 22.04 {{timestamp}}" + ami_name = var.version ami_groups = ["all"] // This will make the AMI publicly available launch_block_device_mappings { @@ -44,7 +54,7 @@ source "amazon-ebs" "ubuntu-22-04" { } tags = { - Name = "HiPAS Gridlabd Ubuntu 22.04 {{timestamp}}" + Name = var.tagname CreatedBy = "Packer" Environment = "Prod" } diff --git a/docker/packer/templateDevelop.pkr.hcl b/docker/packer/templateDevelop.pkr.hcl index fbdf3be44..37c8885d6 100644 --- a/docker/packer/templateDevelop.pkr.hcl +++ b/docker/packer/templateDevelop.pkr.hcl @@ -28,12 +28,22 @@ variable "dev_s3_url" { description = "S3 bucket URL" } +variable "version" { + type = string + description = "GridLAB-D Version" +} + +variable "tagname" { + type = string + description = "GridLAB-D Full Version Tag Name" +} + source "amazon-ebs" "ubuntu-22-04" { source_ami = "ami-014d05e6b24240371" region = var.aws_region instance_type = "t2.micro" ssh_username = "ubuntu" - ami_name = "HiPAS Gridlabd Ubuntu Develop 22.04 {{timestamp}}" + ami_name = var.version launch_block_device_mappings { device_name = "/dev/sda1" @@ -43,7 +53,7 @@ source "amazon-ebs" "ubuntu-22-04" { } tags = { - Name = "HiPAS Gridlabd Ubuntu Develop 22.04 {{timestamp}}" + Name = var.tagname CreatedBy = "Packer" Environment = "Dev" } diff --git a/docs/Cloud/GithubActions.md b/docs/Cloud/GithubActions.md index e93275c36..73d6ef3a0 100644 --- a/docs/Cloud/GithubActions.md +++ b/docs/Cloud/GithubActions.md @@ -13,7 +13,7 @@ jobs: simulate: runs-on: ubuntu-latest - container: slacgismo/gridlabd:master + container: arras-energy/gridlabd:master steps: - uses: actions/checkout@v3 @@ -50,7 +50,7 @@ jobs: simulate: runs-on: ubuntu-latest - container: slacgismo/gridlabd:master + container: arras-energy/gridlabd:master steps: - uses: actions/checkout@v3 diff --git a/docs/Getting Started.md b/docs/Getting Started.md index fe702920e..ef640fa19 100644 --- a/docs/Getting Started.md +++ b/docs/Getting Started.md @@ -1,7 +1,7 @@ The preferred method for running GridLAB-D is using [Docker](www.docker.org). Once you have installed Docker, you can run GridLAB-D as follows. ~~~ -bash% docker run -it slacgismo/gridlabd:latest gridlabd +bash% docker run -it arras-energy/gridlabd:latest gridlabd ~~~ where ` +bash% docker run -vit $PWD:$PWD arras-energy/gridlabd:latest gridlabd -W $PWD ~~~ More information on using GridLAB-D docker containers can be found at [[/Install/Docker]]. diff --git a/docs/Install/Docker.md b/docs/Install/Docker.md index 85ecc169d..df73585d0 100644 --- a/docs/Install/Docker.md +++ b/docs/Install/Docker.md @@ -3,8 +3,8 @@ # Synopsis ~~~ -bash$ docker pull slacgismo/gridlabd:latest -bash$ docker run -it -v $(pwd):$(pwd) slacgismo/gridlabd:latest gridlabd -W $(pwd) <...> +bash$ docker pull arras-energy/gridlabd:latest +bash$ docker run -it -v $(pwd):$(pwd) arras-energy/gridlabd:latest gridlabd -W $(pwd) <...> ~~~ # Description @@ -12,13 +12,13 @@ bash$ docker run -it -v $(pwd):$(pwd) slacgismo/gridlabd:latest gridlabd -W $(pw To use the latest version of GridLAB-D with docker, install docker from see www.docker.com. Then run ~~~ -bash$ docker pull slacgismo/gridlabd:latest +bash$ docker pull arras-energy/gridlabd:latest ~~~ For convenience you may tag the image you wish to use by default: ~~~ -bash$ docker tag slacgismo/gridlabd:latest gridlabd +bash$ docker tag arras-energy/gridlabd:latest gridlabd ~~~ To get more information about available docker images, see https://hub.docker.com/u/gridlabd/. @@ -66,7 +66,7 @@ To get a list of available and active docker images: ~~~ bash$ gridlabd --docker status REPOSITORY TAG IMAGE ID CREATED SIZE -slacgismo/gridlabd latest 398e452f9a01 2 days ago 1.56GB +arras-energy/gridlabd latest 398e452f9a01 2 days ago 1.56GB gridlabd latest 398e452f9a01 2 days ago 1.56GB ~~~ @@ -92,10 +92,10 @@ bash$ docker system prune -a You can create an image locally with a specific branch (e.g., `develop`) instead of pulling from DockerHub (where the default branch is `master`). -Firsrt, clone the `https://github.com/slacgismo/gridlabd` and checkout the desired branch (e.g., `develop`). +Firsrt, clone the `https://github.com/arras-energy/gridlabd` and checkout the desired branch (e.g., `develop`). ~~~ -bash$ git clone https://github.com/slacgismo/gridlabd -b develop /usr/local/opt/gridlabd/src/gridlabd +bash$ git clone https://github.com/arras-energy/gridlabd -b develop /usr/local/opt/gridlabd/src/gridlabd ~~~ Then build the image locally: diff --git a/docs/Resources.md b/docs/Resources.md index 463647956..9b3d55bd6 100644 --- a/docs/Resources.md +++ b/docs/Resources.md @@ -1,26 +1,26 @@ The following resources are available to GridLAB-D users. -## [Models](https://github.com/slacgismo/gridlabd-models) +## [Models](https://github.com/arras-energy/gridlabd-models) This GitHub project contains numerous models used in the development, testing, and teaching of GridLAB-D. These models can also serve as examples of how to do some more exotic things using GridLAB-D. -## [Templates](https://github.com/slacgismo/gridlabd-templates) +## [Templates](https://github.com/arras-energy/gridlabd-templates) This GitHub project contains GLM templates that can be configured using CSV inputs to perform specific analyses on models. See [[/Subcommand/Template]] for details. -## [Converters](https://github.com/slacgismo/gridlabd-converters) +## [Converters](https://github.com/arras-energy/gridlabd-converters) This GitHub project contains converters that GridLAB-D uses to accept inputs or generate outputs of various formats. See [[/Converters/README]] for details. -## [Weather](https://github.com/slacgismo/gridlabd-weather) +## [Weather](https://github.com/arras-energy/gridlabd-weather) This GitHub project contains weather data that can be accessed using the `weather` subcommand. See [[/Subcommand/Weather]] for details. -## [Library](https://github.com/slacgismo/gridlabd-library) +## [Library](https://github.com/arras-energy/gridlabd-library) This GitHub project contains libraries of GLM object that can be used in GridLAB-D models. See [[/Subcommand/Library]] for details. -## [Examples](https://github.com/slacgismo/gridlabd-examples) +## [Examples](https://github.com/arras-energy/gridlabd-examples) This GitHub project contains example GLM files that illustrate various ways of using GridLAB-D. diff --git a/docs/Server/REST API.md b/docs/Server/REST API.md index 6e0f34023..e2dbf0045 100644 --- a/docs/Server/REST API.md +++ b/docs/Server/REST API.md @@ -168,7 +168,7 @@ In the event of an error, the JSON response is of the form ## Real-time models -Server mode is essential to the realtime mode. Together this allows a web-based application to access the global variable and properties of named objects of a real-time simulation to emulate a control room. See the [IEEE-123 Model](https://github.com/slacgismo/gridlabd-models/tree/master/ieee123) for an example. +Server mode is essential to the realtime mode. Together this allows a web-based application to access the global variable and properties of named objects of a real-time simulation to emulate a control room. See the [IEEE-123 Model](https://github.com/arras-energy/gridlabd-models/tree/master/ieee123) for an example. # See also diff --git a/docs/Subcommand/Weather.md b/docs/Subcommand/Weather.md index f7e89208f..005efa684 100644 --- a/docs/Subcommand/Weather.md +++ b/docs/Subcommand/Weather.md @@ -250,7 +250,7 @@ bash$ gridlabd weather config show GITHUB="https://github.com" GITHUBUSERCONTENT="https://raw.githubusercontent.com" COUNTRY="US" - GITUSER="slacgismo" + GITUSER="arras-energy" GITREPO="gridlabd-weather" GITBRANCH="master" diff --git a/python/README.md b/python/README.md index 15bd3cc7e..96f744930 100644 --- a/python/README.md +++ b/python/README.md @@ -16,5 +16,5 @@ The `priority` column indicates which modules are required to build `gridlabd` a # Documentation -See [Python Module Documentation](https://docs.gridlabd.us/index.html?owner=slacgismo&project=gridlabd&branch=master&folder=/Module&doc=/Module/Python.md) for details. +See [Python Module Documentation](https://docs.gridlabd.us/index.html?owner=arras-energy&project=gridlabd&branch=master&folder=/Module&doc=/Module/Python.md) for details. diff --git a/setup.sh b/setup.sh index ec170e6e6..145edefef 100755 --- a/setup.sh +++ b/setup.sh @@ -21,7 +21,7 @@ ## Environment variables ## ## GRIDLABD_ORIGIN Specifies the ORG/USER/BRANCH from which the downloads -## should obtained. Default is `slacgismo/gridlabd/master` +## should obtained. Default is `arras-energy/gridlabd/master` ## STDOUT=/dev/stdout STDERR=/dev/stderr @@ -29,7 +29,7 @@ error () { echo "ERROR [setup.sh]: $*" > $STDERR ; exit 1; } if [ -d $(dirname $0)/.git ]; then DEFAULT_ORIGIN=$(git remote get-url origin | sed -e 's|https://github.com/||' | sed -e 's|.git$||')/$(git rev-parse --abbrev-ref HEAD) else - DEFAULT_ORIGIN=slacgismo/gridlabd/master + DEFAULT_ORIGIN=arras-energy/gridlabd/master fi while [ $# -gt 0 ]; do case "$1" in diff --git a/setup/README.md b/setup/README.md index c3ca0a19d..bf90e63e8 100644 --- a/setup/README.md +++ b/setup/README.md @@ -19,7 +19,7 @@ curl -sL https://code.gridlabd.us/master/setup.sh | sh To setup for a development build, run the command: ~~~ -export GRIDLABD_ORIGIN=slacgismo/gridlabd/develop +export GRIDLABD_ORIGIN=arras-energy/gridlabd/develop curl -sL https://raw.githubusercontent.com/${GRIDLABD_ORIGIN}/setup.sh | sh ~~~ diff --git a/source/globals.h b/source/globals.h index f1d2ddd30..2b5e62a13 100644 --- a/source/globals.h +++ b/source/globals.h @@ -12,7 +12,7 @@ #error "this header may only be included from gldcore.h or gridlabd.h" #endif -#define GITHUB_ORG "slacgismo" +#define GITHUB_ORG "arras-energy" #include "version.h" #include "build.h" diff --git a/subcommands/gridlabd-contributors b/subcommands/gridlabd-contributors index 36bbc4eb6..a88a8252b 100755 --- a/subcommands/gridlabd-contributors +++ b/subcommands/gridlabd-contributors @@ -94,7 +94,7 @@ if not token: try: git = github.Github(token) - repo = git.get_repo("slacgismo/gridlabd") + repo = git.get_repo("arras-energy/gridlabd") for user in repo.get_contributors(): if login: output(user.login) diff --git a/subcommands/gridlabd-library b/subcommands/gridlabd-library index 8f941487d..47db63f3d 100755 --- a/subcommands/gridlabd-library +++ b/subcommands/gridlabd-library @@ -13,7 +13,7 @@ fi # configurable parameters GITHUB="https://github.com" ORGANIZATION="US/CA/SLAC" -GITUSER=slacgismo +GITUSER=arras-energy GITREPO="gridlabd-library" GITBRANCH="master" DATADIR="$GLD_ETC/library/$ORGANIZATION" diff --git a/subcommands/gridlabd-model b/subcommands/gridlabd-model index 0c221abcf..35c6a4911 100644 --- a/subcommands/gridlabd-model +++ b/subcommands/gridlabd-model @@ -10,7 +10,7 @@ if [ $# -eq 0 ]; then fi GITBRANCH=master -GITUSER=slacgismo +GITUSER=arras-energy GITREPO=gridlabd-models VERSION=4 @@ -62,7 +62,7 @@ elif [ $1 == 'index' ]; then if [ $# -eq 2 ]; then PATTERN=$2 fi - curl -sL https://api.github.com/repos/slacgismo/gridlabd-models/git/trees/master\?recursive=1 | gridlabd json-get tree path -c | grep '\.glm$' | grep ^gridlabd-$VERSION/$PATTERN | sed -e 's/\.glm$//;s/gridlabd-[0-9]\///' + curl -sL https://api.github.com/repos/arras-energy/gridlabd-models/git/trees/master\?recursive=1 | gridlabd json-get tree path -c | grep '\.glm$' | grep ^gridlabd-$VERSION/$PATTERN | sed -e 's/\.glm$//;s/gridlabd-[0-9]\///' exit 0 elif [ $1 == 'help' ]; then echo "Syntax: gridlabd model SUBCOMMAND [ARGS...]" diff --git a/subcommands/gridlabd-template b/subcommands/gridlabd-template index 078b5dc58..b7142f66e 100755 --- a/subcommands/gridlabd-template +++ b/subcommands/gridlabd-template @@ -15,7 +15,7 @@ GITHUBUSERCONTENT="https://raw.githubusercontent.com" if [ "${ORGANIZATION}" == "" ]; then export ORGANIZATION="US/CA/SLAC" fi -GITUSER=slacgismo +GITUSER=arras-energy GITREPO="gridlabd-template" GITBRANCH="master" DATADIR="$GLD_ETC/template/$ORGANIZATION" diff --git a/subcommands/gridlabd-weather b/subcommands/gridlabd-weather index e703f05e3..cd9e3d31b 100755 --- a/subcommands/gridlabd-weather +++ b/subcommands/gridlabd-weather @@ -13,7 +13,7 @@ fi GITHUB="https://github.com" GITHUBUSERCONTENT="https://raw.githubusercontent.com" COUNTRY="US" -GITUSER=slacgismo +GITUSER=arras-energy GITREPO="gridlabd-weather" GITBRANCH="master" DATADIR="$GLD_ETC/weather/$COUNTRY" diff --git a/tools/autotest/ieee13-meters.glm b/tools/autotest/ieee13-meters.glm index 070b74408..1d808a70d 100644 --- a/tools/autotest/ieee13-meters.glm +++ b/tools/autotest/ieee13-meters.glm @@ -388,7 +388,7 @@ global timestamp pauseat "NEVER"; #else #set pauseat=NEVER #endif //pauseat -// infourl is set to http://docs.gridlabd.us/index.html?owner=slacgismo&project=gridlabd&search= +// infourl is set to http://docs.gridlabd.us/index.html?owner=arras-energy&project=gridlabd&search= #ifndef hostname #define hostname=localhost #else diff --git a/tools/autotest/link-to-notnode-meters.glm b/tools/autotest/link-to-notnode-meters.glm index 52e167b13..a95a1c3f9 100644 --- a/tools/autotest/link-to-notnode-meters.glm +++ b/tools/autotest/link-to-notnode-meters.glm @@ -424,7 +424,7 @@ global timestamp pauseat "NEVER"; #else #set pauseat=NEVER #endif //pauseat -// infourl is set to http://docs.gridlabd.us/index.html?owner=slacgismo&project=gridlabd&search= +// infourl is set to http://docs.gridlabd.us/index.html?owner=arras-energy&project=gridlabd&search= #ifndef hostname #define hostname=localhost #else diff --git a/tools/autotest/links-to-meter-meters.glm b/tools/autotest/links-to-meter-meters.glm index c3e198a80..bad032aec 100644 --- a/tools/autotest/links-to-meter-meters.glm +++ b/tools/autotest/links-to-meter-meters.glm @@ -424,7 +424,7 @@ global timestamp pauseat "NEVER"; #else #set pauseat=NEVER #endif //pauseat -// infourl is set to http://docs.gridlabd.us/index.html?owner=slacgismo&project=gridlabd&search= +// infourl is set to http://docs.gridlabd.us/index.html?owner=arras-energy&project=gridlabd&search= #ifndef hostname #define hostname=localhost #else diff --git a/tools/autotest/links-to-meter-to-child-meters.glm b/tools/autotest/links-to-meter-to-child-meters.glm index fe452b066..3d29b1591 100644 --- a/tools/autotest/links-to-meter-to-child-meters.glm +++ b/tools/autotest/links-to-meter-to-child-meters.glm @@ -424,7 +424,7 @@ global timestamp pauseat "NEVER"; #else #set pauseat=NEVER #endif //pauseat -// infourl is set to http://docs.gridlabd.us/index.html?owner=slacgismo&project=gridlabd&search= +// infourl is set to http://docs.gridlabd.us/index.html?owner=arras-energy&project=gridlabd&search= #ifndef hostname #define hostname=localhost #else diff --git a/tools/autotest/links-to-triplexmeter-meters.glm b/tools/autotest/links-to-triplexmeter-meters.glm index 4b0e467bc..582edb0f8 100644 --- a/tools/autotest/links-to-triplexmeter-meters.glm +++ b/tools/autotest/links-to-triplexmeter-meters.glm @@ -424,7 +424,7 @@ global timestamp pauseat "NEVER"; #else #set pauseat=NEVER #endif //pauseat -// infourl is set to http://docs.gridlabd.us/index.html?owner=slacgismo&project=gridlabd&search= +// infourl is set to http://docs.gridlabd.us/index.html?owner=arras-energy&project=gridlabd&search= #ifndef hostname #define hostname=localhost #else diff --git a/tools/autotest/links-to-triplexmeter-to-child-meters.glm b/tools/autotest/links-to-triplexmeter-to-child-meters.glm index 89db1594c..f16efd0a3 100644 --- a/tools/autotest/links-to-triplexmeter-to-child-meters.glm +++ b/tools/autotest/links-to-triplexmeter-to-child-meters.glm @@ -424,7 +424,7 @@ global timestamp pauseat "NEVER"; #else #set pauseat=NEVER #endif //pauseat -// infourl is set to http://docs.gridlabd.us/index.html?owner=slacgismo&project=gridlabd&search= +// infourl is set to http://docs.gridlabd.us/index.html?owner=arras-energy&project=gridlabd&search= #ifndef hostname #define hostname=localhost #else diff --git a/tools/autotest/meters-withloads-meters.glm b/tools/autotest/meters-withloads-meters.glm index a95d6528d..23f6d09a8 100644 --- a/tools/autotest/meters-withloads-meters.glm +++ b/tools/autotest/meters-withloads-meters.glm @@ -424,7 +424,7 @@ global timestamp pauseat "NEVER"; #else #set pauseat=NEVER #endif //pauseat -// infourl is set to http://docs.gridlabd.us/index.html?owner=slacgismo&project=gridlabd&search= +// infourl is set to http://docs.gridlabd.us/index.html?owner=arras-energy&project=gridlabd&search= #ifndef hostname #define hostname=localhost #else diff --git a/tools/autotest/nodes-withloads-meters.glm b/tools/autotest/nodes-withloads-meters.glm index 5d74b285d..6348e399e 100644 --- a/tools/autotest/nodes-withloads-meters.glm +++ b/tools/autotest/nodes-withloads-meters.glm @@ -424,7 +424,7 @@ global timestamp pauseat "NEVER"; #else #set pauseat=NEVER #endif //pauseat -// infourl is set to http://docs.gridlabd.us/index.html?owner=slacgismo&project=gridlabd&search= +// infourl is set to http://docs.gridlabd.us/index.html?owner=arras-energy&project=gridlabd&search= #ifndef hostname #define hostname=localhost #else diff --git a/tools/autotest/notnodes-withloads-meters.glm b/tools/autotest/notnodes-withloads-meters.glm index 19e1a4619..2f63a9888 100644 --- a/tools/autotest/notnodes-withloads-meters.glm +++ b/tools/autotest/notnodes-withloads-meters.glm @@ -424,7 +424,7 @@ global timestamp pauseat "NEVER"; #else #set pauseat=NEVER #endif //pauseat -// infourl is set to http://docs.gridlabd.us/index.html?owner=slacgismo&project=gridlabd&search= +// infourl is set to http://docs.gridlabd.us/index.html?owner=arras-energy&project=gridlabd&search= #ifndef hostname #define hostname=localhost #else