Skip to content

Commit 5d0d827

Browse files
authored
Merge pull request #5 from bijujacob/master
Updates for OS release
2 parents ad897ae + 9eac43e commit 5d0d827

File tree

6 files changed

+21
-57
lines changed

6 files changed

+21
-57
lines changed

HFGP.acmf

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,7 @@ References
3636

3737
Modified by Juan Morinelly, September 2012: Initialization procedure variables and equations inclusion
3838

39-
This Material was produced under the DOE Carbon Capture Simulation Initiative (CCSI), and copyright is held by the software owners: ORISE, LANS,
40-
LLNS, LBL, PNNL, CMU, WVU, et al. The software owners and/or the U.S. Government retain ownership of all rights in the CCSI software and the
41-
copyright and patents subsisting therein. Any distribution or dissemination is governed under the terms and conditions of the CCSI Test and
42-
Evaluation License, CCSI Master Non-Disclosiure Agreement, and the CCSI Intellectual Property Management Plan. No rights are granted except as
43-
expressly recited in one of the aforementioned agreements.
44-
39+
See LICENSE.md for license and copyright details
4540

4641
...Kayode Ajayi (2015)
4742
// Pressure drop model was included in the shell side of the membrane. It was based on Hagen-Posiellie equation by introducing
@@ -371,20 +366,14 @@ References
371366

372367
Modified by Juan Morinelly, September 2012: Initialization procedure variables and equations inclusion
373368

374-
375-
376369
Modified by Kayode Ajayi (2015)
377370
// Pressure drop model was included in the shell side of the membrane. It was based on Hagen-Posiellie equation by introducing
378371
hydraulic diameter (Daejun Chang, Joonho MIn, Sehern Oh, Kilo Moon, Effect of Pressure Drop on performance of Hollow membrane model for gas permeation,
379372
Koren J. Chemg. Eng., 15(4), (1998), 396-403.
380373
Li-Hua Cheng, Ping-Chung Wu, Junghui Chen, Modelling and optimisation of hollow fiber DCMD module for desalination, Journal of Membernae Science, 154 (2008),
381374
154-166
382375

383-
This Material was produced under the DOE Carbon Capture Simulation Initiative (CCSI), and copyright is held by the software owners: ORISE, LANS,
384-
LLNS, LBL, PNNL, CMU, WVU, et al. The software owners and/or the U.S. Government retain ownership of all rights in the CCSI software and the
385-
copyright and patents subsisting therein. Any distribution or dissemination is governed under the terms and conditions of the CCSI Test and
386-
Evaluation License, CCSI Master Non-Disclosiure Agreement, and the CCSI Intellectual Property Management Plan. No rights are granted except as
387-
expressly recited in one of the aforementioned agreements.
376+
See LICENSE.md for license and copyright details.
388377

389378
*/
390379
//===============================================================================================================================================================

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ LICENSE := LICENSE.md
66
PKG_DIR := CCSI_$(PROD_SNAME)_$(VERSION)
77
PACKAGE := $(PKG_DIR).zip
88

9-
PAYLOAD := README.md \
10-
HFGP.acmf \
11-
$(LICENSE)
9+
PAYLOAD := docs/*.pdf \
10+
README.md \
11+
HFGP.acmf \
12+
$(LICENSE)
1213

1314
# Get just the top part (not dirname) of each entry so cp -r does the right thing
1415
PAYLOAD_TOPS := $(sort $(foreach v,$(PAYLOAD),$(shell echo $v | cut -d'/' -f1)))

README.md

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,33 @@
1-
# membrane_model
1+
# Membrane Model
22
**Membrane Separation Model:** - Updated hollow fiber membrane model and system example for carbon capture.
33

4-
## Development Practices
5-
6-
* Code development will be peformed in a forked copy of the repo. Commits will not be
7-
made directly to the repo. Developers will submit a pull request that is then merged
8-
by another team member, if another team member is available.
9-
* Each pull request should contain only related modifications to a feature or bug fix.
10-
* Sensitive information (secret keys, usernames etc) and configuration data
11-
(e.g database host port) should not be checked in to the repo.
12-
* A practice of rebasing with the main repo should be used rather that merge commmits.
4+
Note: This product is also part of the [Process Models Bundle](../../../ProcessModels_bundle)
135

146
## Getting Started
157

16-
TBD
8+
See installation and user guide documents in the [documentation](./docs) subdirectory.
179

1810
## Authors
1911

2012
* Kayode Ajayi
2113
* Debangsu Bhattacharyya
2214

23-
See also the list of [contributors](https://github.com/CCSI-Toolset/membrane_model/contributors) who participated in this project.
15+
See also the list of [contributors](../../contributors) who participated in this project.
16+
17+
## Development Practices
18+
19+
* Code development will be performed in a forked copy of the repo. Commits will not be
20+
made directly to the repo. Developers will submit a pull request that is then merged
21+
by another team member, if another team member is available.
22+
* Each pull request should contain only related modifications to a feature or bug fix.
23+
* Sensitive information (secret keys, usernames etc.) and configuration data
24+
(e.g. database host port) should not be checked in to the repo.
25+
* A practice of rebasing with the main repo should be used rather than merge commits.
2426

2527
## Versioning
2628

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

3032
## License & Copyright
3133

1.12 MB
Binary file not shown.
485 KB
Binary file not shown.

jenkins_description.html

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)