Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
662ba14
status: deployment updates
t-kramer Apr 22, 2026
7c6ae2c
GITBOOK-12: No subject
praftery May 20, 2026
9fe66cd
build: setup GitBook sync
t-kramer May 20, 2026
3e8d0ae
Merge branch 'main' into development
t-kramer May 20, 2026
8af1ec4
add new scenario group
urwahah Jun 3, 2026
db2a884
update scenario names
urwahah Jun 3, 2026
b849f2f
fix interpolated constraints
urwahah Jun 6, 2026
4880caa
correct gas emissions factor name
urwahah Jun 2, 2026
1845643
Merge pull request #113 from CenterForTheBuiltEnvironment/NG-factor-#102
t-kramer Jun 11, 2026
93617ec
Merge pull request #114 from CenterForTheBuiltEnvironment/HWST-scenar…
t-kramer Jun 11, 2026
ebcfae7
Merge pull request #115 from CenterForTheBuiltEnvironment/AWHP-constr…
t-kramer Jun 11, 2026
dd68e3c
fix: remove Alpha badge
t-kramer Jun 11, 2026
c0450ba
fix: update README links
t-kramer Jun 11, 2026
2797645
add cooling-based sizing
urwahah Jun 18, 2026
76c8c92
add larger-load sizing
urwahah Jun 19, 2026
bf88442
allow simultaneous AWHP operation
urwahah Jun 19, 2026
4abb370
add sizing priority input
urwahah Jun 19, 2026
e782235
add disable callback
urwahah Jun 19, 2026
d7a096c
turn off debug
urwahah Jun 19, 2026
b416d16
revise emission scenario names
urwahah Jun 19, 2026
ec54a3f
add classes, update AWHPs, chillers, boilers
urwahah Jun 19, 2026
1bf2336
update AWHPs, WWHPs
urwahah Jun 20, 2026
2c9ab45
update equip display name
urwahah Jun 20, 2026
0265975
add valueerror
urwahah Jun 20, 2026
79f81a2
remove docs change
urwahah Jun 24, 2026
722cdb6
add temperature unit conversion
urwahah Jun 24, 2026
1c10f51
GITBOOK-13: No subject
urwahah Jun 30, 2026
61fdec1
address review comments
urwahah Jun 30, 2026
ed84bb6
add docstrings, update bool check
urwahah Jun 30, 2026
b537841
address review comments
urwahah Jul 1, 2026
f9ce8d7
note: add testing scheme proposal
t-kramer Jul 1, 2026
ea947c9
Merge branch 'development' of https://github.com/CenterForTheBuiltEnv…
t-kramer Jul 1, 2026
b747459
Merge pull request #116 from CenterForTheBuiltEnvironment/AWHP-coolin…
t-kramer Jul 1, 2026
97c96eb
fix: solve ruff errors
t-kramer Jul 1, 2026
6f1867f
Merge pull request #117 from CenterForTheBuiltEnvironment/emissions-s…
t-kramer Jul 1, 2026
cd50457
Merge pull request #118 from CenterForTheBuiltEnvironment/equipment-c…
t-kramer Jul 1, 2026
d872c45
fix: solve ruff errors
t-kramer Jul 1, 2026
41830fd
Merge pull request #120 from CenterForTheBuiltEnvironment/fix-load-li…
t-kramer Jul 1, 2026
bc3c6fa
fix: add minor fix to input.py
t-kramer Jul 1, 2026
33929cf
status: update load data files
t-kramer Jul 29, 2026
143fbe4
Merge pull request #140 from CenterForTheBuiltEnvironment/update-load…
t-kramer Jul 29, 2026
3a2169f
fix: update load data v2
t-kramer Aug 5, 2026
3c4b55b
Merge pull request #144 from CenterForTheBuiltEnvironment/update-load…
t-kramer Aug 5, 2026
8e7f767
fix: adjust load table #141
t-kramer Aug 5, 2026
8d84ae0
Merge pull request #145 from CenterForTheBuiltEnvironment/update-load…
t-kramer Aug 5, 2026
015119e
feat: add load scaling #119
t-kramer Aug 5, 2026
1549086
GITBOOK-14: Simulated load types updates
urwahah Aug 12, 2026
41ff6ab
Merge pull request #146 from CenterForTheBuiltEnvironment/load-scalin…
t-kramer Aug 17, 2026
3bffa40
feat: add base load option #148
t-kramer Aug 17, 2026
514d0c0
Merge pull request #150 from CenterForTheBuiltEnvironment/add-fixed-l…
t-kramer Aug 17, 2026
338d2c8
status: deploy v1.1.0
t-kramer Aug 17, 2026
dc4b31a
status: deactivate pytest for now
t-kramer Aug 17, 2026
9e1e2fd
status: update deploy.yml
t-kramer Aug 17, 2026
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
5 changes: 1 addition & 4 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,4 @@ data/output/
*.log
.DS_Store
.vscode/
.idea/

# Don't include util Python scripts
utils/create_meta_index.py
.idea/
60 changes: 60 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: Test & Deploy

on:
push:
branches: [main]
pull_request:
branches: [main]

env:
IMAGE: gcr.io/decarb-460017/decarb-tool

jobs:
test:
name: Run tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v5
with:
python-version: "3.13"
cache: pip

- name: Install dependencies
run: pip install -r requirements.txt

- name: Run tests
run: pytest
continue-on-error: true # TODO: remove once test suite is complete

deploy:
name: Build & deploy to Cloud Run
needs: test
runs-on: ubuntu-latest
if: github.event_name == 'push' && github.ref == 'refs/heads/main'

steps:
- uses: actions/checkout@v4

- name: Authenticate to GCP
uses: google-github-actions/auth@v2
with:
credentials_json: ${{ secrets.GCP_SA_KEY }}

- name: Set up Cloud SDK
uses: google-github-actions/setup-gcloud@v2

- name: Build image with Cloud Build
run: gcloud builds submit --tag ${{ env.IMAGE }}

- name: Deploy to Cloud Run
run: |
gcloud run deploy decarb-tool \
--image ${{ env.IMAGE }} \
--region us-central1 \
--session-affinity \
--cpu=2 \
--memory=4Gi \
--concurrency=8 \
--max-instances=1
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

<p align="center">
<br />
<a href="https://github.com/CenterForTheBuiltEnvironment/decarb-tool/blob/main/docs/documentation-short.md"><strong>Explore the docs »</strong></a>
<a href="https://cbe-berkeley.gitbook.io/decarb/"><strong>Explore the docs »</strong></a>
<br />
<br />
<a href="https://github.com/CenterForTheBuiltEnvironment/cbe-tool-template">View Demo</a>
<a href="https://decarb.cbe.berkeley.edu">View Demo</a>
·
<a href="https://github.com/CenterForTheBuiltEnvironment/decarb-tool/issues/new?labels=bug&template=issue--bug-report.md">Report Bug</a>
·
Expand Down
588 changes: 374 additions & 214 deletions data/input/building_metadata.csv

Large diffs are not rendered by default.

Loading
Loading