Skip to content

Commit

Permalink
Merge pull request #4 from bijujacob/master
Browse files Browse the repository at this point in the history
Updates for OS release
  • Loading branch information
ksbeattie committed Mar 13, 2018
2 parents a2396f5 + b5e0210 commit 8ba1878
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 35 deletions.
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ LICENSE := LICENSE.md
PKG_DIR := CCSI_$(PROD_SNAME)_$(VERSION)
PACKAGE := $(PKG_DIR).zip

PAYLOAD := README.md \
HeatCalc.bkp \
$(LICENSE)
PAYLOAD := docs/*.pdf \
README.md \
HeatCalc.bkp \
$(LICENSE)

# Get just the top part (not dirname) of each entry so cp -r does the right thing
PAYLOAD_TOPS := $(sort $(foreach v,$(PAYLOAD),$(shell echo $v | cut -d'/' -f1)))
Expand Down
26 changes: 14 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,32 @@
**Solvent Crossflow Heat Exchanger Calculator:**
A Process model in Aspen Plus to optimize the size of the heat exchangers and their log-mean temperature difference (LMTD) to minimize capital and operating expenses.

## 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 [Process Models Bundle](../../../ProcessModels_bundle)

## Getting Started

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

## Authors

* Brent Sherman

See also the list of [contributors](https://github.com/CCSI-Toolset/SolventCrossflowHX/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/CCSI-Toolset/SolventCrossflowHX/tags).
see the [releases](../../releases) or [tags](../../tags) for this repository.

## License & Copyright

Expand Down
Binary file not shown.
Binary file not shown.
20 changes: 0 additions & 20 deletions jenkins_description.html

This file was deleted.

0 comments on commit 8ba1878

Please sign in to comment.