Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into promote-teaser-loa…
Browse files Browse the repository at this point in the history
…ds-to-param
  • Loading branch information
nllong committed Aug 14, 2023
2 parents 688b1f9 + a527672 commit ad459db
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 52,628 deletions.
12 changes: 3 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@ defaults:
run:
shell: bash

# Cancel existing run if a new one is started
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
strategy:
Expand Down Expand Up @@ -45,14 +40,13 @@ jobs:
docker --version
docker-compose --version
- name: Install and configure Poetry
uses: abatilo/actions-poetry@v2
with:
poetry-version: 1.5.1
uses: Gr1N/setup-poetry@v8 # optionally set specific poetry version. Defaults to latest
# with:
# poetry-version: "1.5.1"
- name: Install dependencies with Poetry
run: |
poetry --version
poetry install
poetry update
- name: Install modelicafmt
run: |
RUNNER_SYSTEM=$(python -c 'import platform; print(platform.system())')
Expand Down
7 changes: 0 additions & 7 deletions geojson_modelica_translator/system_parameters/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -1380,13 +1380,6 @@
],
"additionalProperties": true
},
"ground_loads": {
"description": "Heat rejection or extraction loads (in Watts) of the ground heat exchanger. \n\n Determined from the Thermal Network sizing, and used for ground heat exchanger sizing.\n\n Heat extraction loads are positive, and heat rejection loads are negative.",
"type": "array",
"items": {
"type": "number"
}
},
"ghe_geometric_params": {
"description": "The length and width of the Ground Heat Exchanger determined from the GeoJSON Feature File.",
"type": "object",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,7 @@
"diameter": 0.15,
"length_of_boreholes": 1.0,
"number_of_boreholes": 5
},
"ground_loads": []
}
}
]
}
Expand Down
62 changes: 30 additions & 32 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ad459db

Please sign in to comment.