-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from ksbeattie/master
Changes for OS release
- Loading branch information
Showing
5 changed files
with
14 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,31 +1,22 @@ | ||
# Oxy-CombustionModels_bundle | ||
The Oxy-Combustion Models package consists of two primary components: A detailed boiler model and a suite of equation-based models of the other components of a complete oxycombustion power generation system. | ||
|
||
## Development Practices | ||
The Oxy-Combustion Models package consists of two primary components: A detailed | ||
boiler model and a suite of equation-based models of the other components of a | ||
complete oxycombustion power generation system. | ||
|
||
* Code development will be peformed in a forked copy of the repo. Commits will not be | ||
made directly to the repo. Developers will submit a pull request that is then merged | ||
by another team member, if another team member is available. | ||
* Each pull request should contain only related modifications to a feature or bug fix. | ||
* Sensitive information (secret keys, usernames etc) and configuration data | ||
(e.g database host port) should not be checked in to the repo. | ||
* A practice of rebasing with the main repo should be used rather that merge commmits. | ||
Specifically: | ||
- [Boiler Model](../../../boiler_model) | ||
- [Oxyfuel](../../../oxyfuel) | ||
|
||
## Getting Started | ||
|
||
TBD | ||
|
||
## Authors | ||
|
||
TBD | ||
You can download the entire [bundle](../../releases/latest) or follow the above | ||
links to the individual products. | ||
|
||
See also the list of [contributors](https://github.com/CCSI-Toolset/Oxy-CombustionModels_bundle/contributors) who participated in this project. | ||
## Getting Started | ||
See installation and user guide documents in the [documentation](docs) subdirectory. | ||
|
||
## Versioning | ||
|
||
We use [SemVer](http://semver.org/) for versioning. For the versions available, | ||
see the [tags on this repository](https://github.com/CCSI-Toolset/Oxy-CombustionModels_bundle/tags). | ||
We use [SemVer](http://semver.org/) for versioning. For the versions available, | ||
see the [releases](../../releases) or [tags](../../tags) on this repository. | ||
|
||
## License & Copyright | ||
|
||
See [LICENSE.md](LICENSE.md) file for details |
Submodule boiler_model
updated
24 files
Binary file not shown.
Binary file not shown.
Submodule oxyfuel
updated
9 files