Skip to content

Commit

Permalink
Merge pull request #2 from bijujacob/master
Browse files Browse the repository at this point in the history
Updates for OS release
  • Loading branch information
ksbeattie authored Mar 29, 2018
2 parents 7ad4c2e + 1062ab4 commit 4dbeaa9
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 44 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PKG_DIR=CCSI_$(PROD_SNAME)_$(VERSION)
PACKAGE=$(PKG_DIR).zip

PAYLOAD=docs/*.pdf \
ASUSpecFiles \
ASUSpecFiles \
DegeneracyExamples \
InitFiles \
ModelFiles \
Expand Down
30 changes: 16 additions & 14 deletions README.md
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 removed docs/CCSI_PSE_Meeting_June_2014.pdf
Binary file not shown.
Binary file removed docs/DegeneracyHunter4.pdf
Binary file not shown.
Binary file added docs/OxyCombustionMax User Manual.docx
Binary file not shown.
Binary file added docs/OxyCombustionMax User Manual.pdf
Binary file not shown.
29 changes: 0 additions & 29 deletions jenkins_description.html

This file was deleted.

Binary file removed test/system_test/CCSI_IP_QUESTIONS_ASU.docx
Binary file not shown.

0 comments on commit 4dbeaa9

Please sign in to comment.