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

Master release beauharnois-11 #744

Merged
merged 12 commits into from
Sep 28, 2020
Merged

Master release beauharnois-11 #744

merged 12 commits into from
Sep 28, 2020

Conversation

dchassin
Copy link
Member

@dchassin dchassin commented Sep 11, 2020

This PR stages the update to master of beauharnois-11.

Current issues

None

Code changes

Documentation changes

Test and Validation Notes

None

@dchassin dchassin changed the title Update version.h Develop merge to master beauharnois-11 Sep 11, 2020
@dchassin dchassin marked this pull request as draft September 11, 2020 19:13
@dchassin dchassin changed the title Develop merge to master beauharnois-11 Release beauharnois-11 Sep 14, 2020
David P. Chassin and others added 2 commits September 14, 2020 14:48
@dchassin dchassin changed the title Release beauharnois-11 Master release beauharnois-11 Sep 22, 2020
David P. Chassin and others added 7 commits September 22, 2020 16:05
* Add optimize module

* Add optimize module

* Remove CSV output from optimize module

* Change optimize extremum test to optional

* Rename test_extremum_opt.glm to test_extremum.glm

Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Fix rusage format error and add global rusage data

* Add rusage_data doc

Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Add support for python properties

* Finalized basic python property object implementation

* Add example

* Update Property.md

* Delete Stochastic variables.ipynb

* Add support for property comparisons

* Update example

* Fix property type structure init

* Merge remote-tracking branch 'origin/develop-fix-load-phase-tautology' into develop-add-python-property-access

* Add support for unit conversion in python property

* Document python property unit conversion and fix ambiguous method name

* Workaround for python finalize exception

* Update python_embed.cpp

* Update Property.md

* Update Property.md

* Update test_python_property.glm

* Fix problem with modlist in python event handler

* Update main.cpp

* Added python shadow class tutorial

* Fix json2png it can plot csv data by default

* Create tmy32glm.py

* Update Makefile.mk

* Update Python shadow class tutorial.ipynb

* Fix traceback issues

* Update thermostat.py

* Update Python shadow class tutorial.ipynb

Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
@aivanova5 aivanova5 self-requested a review September 25, 2020 22:56
aivanova5 and others added 2 commits September 28, 2020 10:30
)

* Update test_json_conversion.glm

* Update object.cpp

* Made optimize extremum test optional

* Update object.cpp

Co-authored-by: David P. Chassin <dchassin@slac.stanford.edu>
* Create c-cpp.yml

* Fix action for master and develop (#759)

* Develop (#2)
* Update version.h
* Add support for python properties (#748)
* Move subcommand help tests to autotest folder (#747)
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Develop add optimize module (#746)
* Add optimize module
* Add optimize module
* Remove CSV output from optimize module
* Change optimize extremum test to optional
* Rename test_extremum_opt.glm to test_extremum.glm
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Develop fix rusage format error and add global rusage data (#745)
* Fix rusage format error and add global rusage data
* Add rusage_data doc
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Add server control halt and stop commands (#752)
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Update Library.md (#753)
* Update load.cpp (#751)
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Update Glm_save_options.md (#755)
* Develop add python property access (#750)
* Add support for python properties
* Finalized basic python property object implementation
* Add example
* Update Property.md
* Delete Stochastic variables.ipynb
* Add support for property comparisons
* Update example
* Fix property type structure init
* Merge remote-tracking branch 'origin/develop-fix-load-phase-tautology' into develop-add-python-property-access
* Add support for unit conversion in python property
* Document python property unit conversion and fix ambiguous method name
* Workaround for python finalize exception
* Update python_embed.cpp
* Update Property.md
* Update Property.md
* Update test_python_property.glm
* Fix problem with modlist in python event handler
* Update main.cpp
* Added python shadow class tutorial
* Fix json2png it can plot csv data by default
* Create tmy32glm.py
* Update Makefile.mk
* Update Python shadow class tutorial.ipynb
* Fix traceback issues
* Update thermostat.py
* Update Python shadow class tutorial.ipynb
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Create c-cpp.yml
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Update README.md
* Update master.yml
* Update and rename test_require_pwlf.glm to test_require_pytz.glm
* Update develop.yml

* Delete c-cpp.yml

* Update develop.yml

* Update develop.yml

* Update and rename develop.yml to validate.yml

* Delete master.yml

* Rename validate.yml to develop.yml

* Update and rename develop.yml to master.yml

* Create develop.yml

Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
@aivanova5 aivanova5 marked this pull request as ready for review September 28, 2020 17:46
@aivanova5 aivanova5 merged commit d8feab6 into master Sep 28, 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