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

Master beauharnois-12 #760

Merged
merged 14 commits into from
Oct 9, 2020
Merged

Master beauharnois-12 #760

merged 14 commits into from
Oct 9, 2020

Conversation

dchassin
Copy link
Member

@dchassin dchassin commented Sep 28, 2020

This PR stages master release beauharnois-12.

Current issues

None

Code changes

Documentation changes

Test and Validation Notes

None

David P. Chassin and others added 14 commits September 28, 2020 12:04
* Add header structure data

* Add header section to JSON output
* Add resources to docs header.

* Add resources to develop docs

Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Add output converter docs

* Add CSV data import doc stubs

* Add more import docs

* Update README.md

Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Add trace subcommand

* Update gridlabd-trace

* Update gridlabd-trace

* Update module.cpp

* Update Trace.md

* Add support for --pkill signals

* Update Pkill.md

* Update Pkill.md

* Update Pkill.md

* Update Pkill.md

* Update Trace.md

Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Add MECS2014 data from IEA

* Add config.py

* Fix documentation typo

* Remove invalid data

* Merge MECS and NERC data sets

* Move data files to data folder

* Update NAICS Data.md

* Add support for industrial capacity load variation

* Change invalid NAICS record from error to warning

* Fix handling of NAICS descriptions

* Update naics_data_file.csv

* Remove duplicate NAICS codes

* Create test_industrial_variable.glm
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Update json.cpp

* Update develop.yml

Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Add json2md converter

* Create test_markdown.glm

* Add support for testing json2md converter

* Add support for generating documents/gridlabd.pdf

Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
@aivanova5 aivanova5 marked this pull request as ready for review October 9, 2020 18:31
@aivanova5 aivanova5 self-requested a review October 9, 2020 18:32
@aivanova5 aivanova5 merged commit bcf58dc into master Oct 9, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants