Skip to content

Commit 89ae198

Browse files
committed
Initial import from 2015.10.00 release: svn r9825 …
Added .gitattributes to make sure Windows CRLF is preserved for *.acmf, *.rms and *.py
0 parents  commit 89ae198

17 files changed

+6188
-0
lines changed

.gitattributes

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Set behaviour for all files, in case developers don't have core.autocrlf set.
2+
* text=auto
3+
4+
# Explicitly declare text files we want to always be normalized and converted to native line endings on checkout.
5+
*.txt text
6+
7+
# Declare files that will always have CRLF line endings on checkout.
8+
*.acmf text eol=crlf
9+
*.rms text eol=crlf
10+
*.py text eol=crlf
11+
12+
# Denote all files that are truly binary and should not be modified.

HFGP.acmf

Lines changed: 947 additions & 0 deletions
Large diffs are not rendered by default.

Makefile

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# A simple makefile for creating the HFGP Membrane Model distribution
2+
VERSION := 2015.06.00
3+
PRODUCT := Hollow Fiber Gas Permeation Membrane Model
4+
PROD_SNAME := Membrane_model
5+
LICENSE := CCSI_TE_LICENSE_$(PROD_SNAME).txt
6+
PKG_DIR := CCSI_$(PROD_SNAME)_$(VERSION)
7+
PACKAGE := $(PKG_DIR).zip
8+
9+
# Where Jenkins should checkout ^/projects/common/trunk/
10+
COMMON := .ccsi_common
11+
LEGAL_DOCS := LEGAL \
12+
CCSI_TE_LICENSE.txt
13+
14+
PAYLOAD := HFGP.acmf \
15+
LEGAL \
16+
$(LICENSE)
17+
18+
# Get just the top part (not dirname) of each entry so cp -r does the right thing
19+
PAYLOAD_TOPS := $(sort $(foreach v,$(PAYLOAD),$(shell echo $v | cut -d'/' -f1)))
20+
# And the payload with the PKG_DIR prepended
21+
PKG_PAYLOAD := $(addprefix $(PKG_DIR)/, $(PAYLOAD))
22+
23+
# OS detection & changes
24+
UNAME := $(shell uname)
25+
ifeq ($(UNAME), Linux)
26+
MD5BIN=md5sum
27+
endif
28+
ifeq ($(UNAME), Darwin)
29+
MD5BIN=md5
30+
endif
31+
ifeq ($(UNAME), FreeBSD)
32+
MD5BIN=md5
33+
endif
34+
35+
.PHONY: all clean
36+
37+
all: $(PACKAGE)
38+
39+
$(PACKAGE): $(PAYLOAD)
40+
@mkdir $(PKG_DIR)
41+
@cp -r $(PAYLOAD_TOPS) $(PKG_DIR)
42+
@zip -qXr $(PACKAGE) $(PKG_PAYLOAD)
43+
@$(MD5BIN) $(PACKAGE)
44+
@rm -rf $(PKG_DIR) $(LEGAL_DOCS) $(LICENSE)
45+
46+
$(LICENSE): CCSI_TE_LICENSE.txt
47+
@sed "s/\[SOFTWARE NAME \& VERSION\]/$(PRODUCT) v.$(VERSION)/" < CCSI_TE_LICENSE.txt > $(LICENSE)
48+
49+
$(LEGAL_DOCS):
50+
@if [ -d $(COMMON) ]; then \
51+
cp $(COMMON)/$@ .; \
52+
else \
53+
svn -q export ^/projects/common/trunk/$@; \
54+
fi
55+
56+
clean:
57+
@rm -rf $(PACKAGE) $(PKG_DIR) $(LICENSE) $(LEGAL_DOCS)

README.md

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

jenkins_description.html

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
Membrane Separation Model:<br/>
2+
<p>Updated hollow fiber membrane model and system example for carbon capture.</p>
3+
<br/>
4+
<table style="width:50%">
5+
<tr>
6+
<td>Product Team:</td>
7+
<td>PT5</td>
8+
</tr>
9+
<tr>
10+
<td>Developers:</td>
11+
<td>
12+
<a href="mailto:Kayode Ajayi &lt;[email protected]&gt;">Kayode Ajayi</a> &amp;
13+
<a href="mailto:Debangsu Bhattacharyya &lt;[email protected]&gt;">Debangsu Bhattacharyya</a>
14+
</td>
15+
</tr>
16+
<tr>
17+
<td>Drupal:</td>
18+
<td>
19+
<a href="https://www.acceleratecarboncapture.org/product/membranemodel">Membrane Separation Model</a>
20+
</td>
21+
</tr>
22+
<tr>
23+
<td>Jira:</td>
24+
<td>
25+
<a href="https://svn.acceleratecarboncapture.org/jira/browse/HFGPMBRNE">HFGPMBRNE</a>
26+
</td>
27+
</tr>
28+
</table>

test/CCSI_HFGP_User_Manual.pdf

368 KB
Binary file not shown.

0 commit comments

Comments
 (0)