diff --git a/README.md b/README.md index 46ff408..d00caa6 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/boiler_model b/boiler_model index 1330fe5..4305a9e 160000 --- a/boiler_model +++ b/boiler_model @@ -1 +1 @@ -Subproject commit 1330fe5c30df3e6b02c47851d0579be7c40d6ddf +Subproject commit 4305a9e40fe381b18384e462a1cab63a093e41d7 diff --git a/docs/CCSI Oxy-Combustion Models User Manual.docx b/docs/CCSI Oxy-Combustion Models User Manual.docx index da50941..b9491ed 100644 Binary files a/docs/CCSI Oxy-Combustion Models User Manual.docx and b/docs/CCSI Oxy-Combustion Models User Manual.docx differ diff --git a/docs/CCSI Oxy-Combustion Models User Manual.pdf b/docs/CCSI Oxy-Combustion Models User Manual.pdf index abfc09a..2d6ad3b 100644 Binary files a/docs/CCSI Oxy-Combustion Models User Manual.pdf and b/docs/CCSI Oxy-Combustion Models User Manual.pdf differ diff --git a/oxyfuel b/oxyfuel index c4e6ff4..4dbeaa9 160000 --- a/oxyfuel +++ b/oxyfuel @@ -1 +1 @@ -Subproject commit c4e6ff491058d8cd472e09c7c299d8e79ed06d4e +Subproject commit 4dbeaa95b5ae9e981f8707515c700e563d2b5307