-
Notifications
You must be signed in to change notification settings - Fork 0
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 #2 from bijujacob/master
Updates for OS release
- Loading branch information
Showing
8 changed files
with
17 additions
and
44 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
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,32 +1,34 @@ | ||
# oxyfuel | ||
# OxyFuel | ||
**OxyCombustionMax** - | ||
A framework in GAMS for synthesis of coal oxycombustion power plants using advanced optimization algorithms. The 2013 release focuses on cryogenic ASU modeling and optimization. | ||
|
||
## Development Practices | ||
|
||
* 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. | ||
Note: This product is also part of the [Oxy-CombustionModels Bundle](../../../Oxy-CombustionModels_bundle) | ||
|
||
## Getting Started | ||
|
||
TBD | ||
See installation and user guide documents in the [documentation](./docs) subdirectory. | ||
|
||
## Authors | ||
|
||
* John Eason | ||
|
||
See also the list of [contributors](https://github.com/CCSI-Toolset/oxyfuel/contributors) who participated in this project. | ||
See also the list of [contributors](../../contributors) who participated in this project. | ||
|
||
## Development Practices | ||
|
||
* Code development will be performed 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 than merge commits. | ||
|
||
## Versioning | ||
|
||
We use [SemVer](http://semver.org/) for versioning. For the versions available, | ||
see the [tags on this repository](https://github.com/oxyfuel/tags). | ||
see the [releases](../../releases) or [tags](../../tags) for this repository. | ||
|
||
## License & Copyright | ||
|
||
See [LICENSE.md](LICENSE.md) file for details | ||
See [LICENSE.md](LICENSE.md) file for details |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file was deleted.
Oops, something went wrong.
Binary file not shown.