diff --git a/Makefile b/Makefile index 442d163..3f33120 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ PKG_DIR=CCSI_$(PROD_SNAME)_$(VERSION) PACKAGE=$(PKG_DIR).zip PAYLOAD=docs/*.pdf \ - ASUSpecFiles \ + ASUSpecFiles \ DegeneracyExamples \ InitFiles \ ModelFiles \ diff --git a/README.md b/README.md index 0e9fa48..e431831 100644 --- a/README.md +++ b/README.md @@ -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 \ No newline at end of file diff --git a/docs/CCSI_PSE_Meeting_June_2014.pdf b/docs/CCSI_PSE_Meeting_June_2014.pdf deleted file mode 100644 index fe78fbe..0000000 Binary files a/docs/CCSI_PSE_Meeting_June_2014.pdf and /dev/null differ diff --git a/docs/DegeneracyHunter4.pdf b/docs/DegeneracyHunter4.pdf deleted file mode 100644 index a80cc5d..0000000 Binary files a/docs/DegeneracyHunter4.pdf and /dev/null differ diff --git a/docs/OxyCombustionMax User Manual.docx b/docs/OxyCombustionMax User Manual.docx new file mode 100644 index 0000000..68fd565 Binary files /dev/null and b/docs/OxyCombustionMax User Manual.docx differ diff --git a/docs/OxyCombustionMax User Manual.pdf b/docs/OxyCombustionMax User Manual.pdf new file mode 100644 index 0000000..3947e30 Binary files /dev/null and b/docs/OxyCombustionMax User Manual.pdf differ diff --git a/jenkins_description.html b/jenkins_description.html deleted file mode 100644 index 90cd52e..0000000 --- a/jenkins_description.html +++ /dev/null @@ -1,29 +0,0 @@ -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.
- - - - - - - - - - - - - - - - - - -
Product Team:PT6
Developers: - John Eason -
Drupal: - OxyFuel -
Jira: - ASUMODG -
diff --git a/test/system_test/CCSI_IP_QUESTIONS_ASU.docx b/test/system_test/CCSI_IP_QUESTIONS_ASU.docx deleted file mode 100644 index 269baf4..0000000 Binary files a/test/system_test/CCSI_IP_QUESTIONS_ASU.docx and /dev/null differ