Skip to content

Commit

Permalink
Merge pull request #6 from ksbeattie/master
Browse files Browse the repository at this point in the history
Changes for OS release
  • Loading branch information
ksbeattie authored Mar 26, 2018
2 parents 18d4034 + e70cc3b commit cbdb32f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 35 deletions.
28 changes: 13 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
# 2-mpz
# 2-MPX
**High Viscosity Solvent Model, 2-MPZ:** - Basic data model in Aspen Plus format for 2-MPZ system.

## Development Practices
Note: This product is also part of the [Process Models Bundle](../../../ProcessModels_bundle)

## Getting Started
See installation and user guide documents in the [documentation](./docs) subdirectory.

* Code development will be peformed in a forked copy of the repo. Commits will not be
## Authors
* Brent Sherman

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 that merge commmits.

## Getting Started

TBD

## Authors

* Brent Sherman

See also the list of [contributors](https://github.com/CCSI-Toolset/2-mpz/contributors) who participated in this project.

## Versioning

We use [SemVer](http://semver.org/) for versioning. For the versions available,
see the [tags on this repository](https://github.com/CCSI-Toolset/2-mpz/tags).
see the [releases](../../releases) or [tags](../../tags) for this repository.

## License & Copyright

See [LICENSE.md](LICENSE.md) file for details
Binary file added docs/CCSI_2MPZ_User_Manual.docx
Binary file not shown.
Binary file added docs/CCSI_2MPZ_User_Manual.pdf
Binary file not shown.
20 changes: 0 additions & 20 deletions jenkins_description.html

This file was deleted.

0 comments on commit cbdb32f

Please sign in to comment.