Skip to content
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.

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

update dockerfile to custom ghedesigner version #266

Open
wants to merge 81 commits into
base: main
Choose a base branch
from

Conversation

mpraprost
Copy link
Contributor

Pull request overview

  • Fixes #ISSUENUMBERHERE (IF RELEVANT)

Pull Request Author: Marley

This pull request makes changes to (select all the apply):

  • Documentation
  • Infrastructure (includes apptainer image, buildstock batch, dependencies, continuous integration tests)
  • Sampling
  • Workflow Measures
  • Upgrade Measures
  • Reporting Measures
  • Postprocessing

Author pull request checklist:

  • Tagged the pull request with the appropriate label (documentation, infrastructure, sampling, workflow measure, upgrade measure, reporting measure, postprocessing) to help categorize changes in the release notes.
  • Added tests for new measures
  • Updated measure .xml(s)
  • Register values added to comstock_column_definitions.csv
  • Both options_lookup.tsv files updated
  • 10k+ test run
  • Change documentation written
  • Measure documentation written
  • ComStock documentation updated
  • Changes reflected in example .yml files
  • Changes reflected in README.md files
  • Added 'See ComStock License' language to first two lines of each code file
  • Implements corresponding measure tests and indexing path in test/reporting_measure_tests.txt, test/workflow_measure_tests.txt, or test/upgrade_measure_tests.txt
  • All new and existing tests pass the CI

Review Checklist

This will not be exhaustively relevant to every PR.

  • Perform a code review on GitHub
  • All related changes have been implemented: data and method additions, changes, tests
  • If fixing a defect, verify by running develop branch and reproducing defect, then running PR and reproducing fix
  • Reviewed change documentation
  • Ensured code files contain License reference
  • Results differences are reasonable
  • Make sure the newly added measures has been added with tests and indexed properly
  • CI status: all tests pass

ComStock Licensing Language - Add to Beginning of Each Code File

# ComStock™, Copyright (c) 2023 Alliance for Sustainable Energy, LLC. All rights reserved.
# See top level LICENSE.txt file for license terms.

JieXiong9119 and others added 30 commits November 4, 2024 03:02
1. thermalzone initialize check
2. options_lookup clean up
…at-measures

For test - fix bugs for df lighting and tstat measures
bring measure changes from fan_updates_6 branch
This commit should not be merged back to main after the SDR is complete.
Updates column definitions to match:
1. sampling-related changes (rentable_area -> building_area, floor_area_category)
2. column name changes in that have occurred in the reporting measure: (furnace -> gas_coil, gas_coil -> primary/secondary)
3. seasonal daily average emissions
4. disable reporting of columns unused by any ComStock systems.
… & savings and emission intensity & savings (#257)

* initial implementation for test

* add more

* updates

fix bugs in added functions, update naming conversion and unit conversion, update column_definition

* update column definitions and downselect a few entries

* initial implementation for test

* add more

* updates

fix bugs in added functions, update naming conversion and unit conversion, update column_definition

* update column definitions and downselect a few entries

* not include these var by default

* clean up unnecessary condition
Use future pandas behavior, which we handled by casting column type after .replace() calls. Suppresses warning messages when creating CBECS objects.
…error catching remediation and style cleanups.
Move the functionality to export the metadata in OEDI format from telescope into comstockpostproc to accommodate the improved geospatial resolution.
Removes unused or duplicative variables. Should not change calculation functionality.
A few geography columns above the tract level exist in the fkt after creation. Drop all but the tract column from fkt, and join on all the geography columns from the spatial lookup based on the tract after joining onto results for the geography.
Enable loading of apportionment data from parquet file which is written to disk after successful creation during an earlier run. Because apportionment can be slow, this can significantly speed up work on postprocessing.
Consolidated four individual unweighted savings column methods into one
Reduce info messages to make it easier to see warnings and errors
Now that multiple data sources have the same column name it is necessary to downselect to the unique set.
asparke2 and others added 6 commits December 30, 2024 13:35
fkt creation is non-deterministic. Cache fkt so it can be reused when a data export is interrupted and needs to be restarted. Hive partition the ComStock wide data to enable much faster filtering down to the upgrade, which was a major bottleneck in exporting data for each geography.
Use the 'detailed' keyword to export all columns present in the raw data, primarily used for internal testing and debugging.
Actually compress gz file, code from @wenyikuang
Collect all geographic aggregates in one frame then split the collected frame into individual geographies. This speeds up the processing significantly for by_state aggregates.
Praprost and others added 22 commits January 3, 2025 13:00
PUMAs should be added to fkt during creation, so this change is temporary.
For aggregates, the full dataframe may be collected without memory issues. For non-aggregates, need to collect a dataframe per geography to avoid memory issues.
If there is no aggregation, collect the entire first-level geography at once and then sub-divide this to separate files later.
Allows an array of variables to be used when aggregating. Helpful when you need multiple geographic variables like state and climate zone included in the output files.
Fixes national-scale partitioning to work when no aggregation is supplied.
Reduce the bottleneck for metadata export by parallelizing writing metadata files
Updates postprocessing for new sampling / increased geographic resolution
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants