Skip to content

Commit

Permalink
Initial import from 2015.10.00 release: svn r9825 …
Browse files Browse the repository at this point in the history
Added .gitattributes to make sure Windows CRLF is preserved for *.acmf,
*.rms and *.py
  • Loading branch information
vchendrix committed May 19, 2017
0 parents commit 89ae198
Show file tree
Hide file tree
Showing 17 changed files with 6,188 additions and 0 deletions.
12 changes: 12 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Set behaviour for all files, in case developers don't have core.autocrlf set.
* text=auto

# Explicitly declare text files we want to always be normalized and converted to native line endings on checkout.
*.txt text

# Declare files that will always have CRLF line endings on checkout.
*.acmf text eol=crlf
*.rms text eol=crlf
*.py text eol=crlf

# Denote all files that are truly binary and should not be modified.
947 changes: 947 additions & 0 deletions HFGP.acmf

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# A simple makefile for creating the HFGP Membrane Model distribution
VERSION := 2015.06.00
PRODUCT := Hollow Fiber Gas Permeation Membrane Model
PROD_SNAME := Membrane_model
LICENSE := CCSI_TE_LICENSE_$(PROD_SNAME).txt
PKG_DIR := CCSI_$(PROD_SNAME)_$(VERSION)
PACKAGE := $(PKG_DIR).zip

# Where Jenkins should checkout ^/projects/common/trunk/
COMMON := .ccsi_common
LEGAL_DOCS := LEGAL \
CCSI_TE_LICENSE.txt

PAYLOAD := HFGP.acmf \
LEGAL \
$(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)))
# And the payload with the PKG_DIR prepended
PKG_PAYLOAD := $(addprefix $(PKG_DIR)/, $(PAYLOAD))

# OS detection & changes
UNAME := $(shell uname)
ifeq ($(UNAME), Linux)
MD5BIN=md5sum
endif
ifeq ($(UNAME), Darwin)
MD5BIN=md5
endif
ifeq ($(UNAME), FreeBSD)
MD5BIN=md5
endif

.PHONY: all clean

all: $(PACKAGE)

$(PACKAGE): $(PAYLOAD)
@mkdir $(PKG_DIR)
@cp -r $(PAYLOAD_TOPS) $(PKG_DIR)
@zip -qXr $(PACKAGE) $(PKG_PAYLOAD)
@$(MD5BIN) $(PACKAGE)
@rm -rf $(PKG_DIR) $(LEGAL_DOCS) $(LICENSE)

$(LICENSE): CCSI_TE_LICENSE.txt
@sed "s/\[SOFTWARE NAME \& VERSION\]/$(PRODUCT) v.$(VERSION)/" < CCSI_TE_LICENSE.txt > $(LICENSE)

$(LEGAL_DOCS):
@if [ -d $(COMMON) ]; then \
cp $(COMMON)/$@ .; \
else \
svn -q export ^/projects/common/trunk/$@; \
fi

clean:
@rm -rf $(PACKAGE) $(PKG_DIR) $(LICENSE) $(LEGAL_DOCS)
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# membrane_model
**Membrane Separation Model:**
Updated hollow fiber membrane model and system example for carbon capture.
28 changes: 28 additions & 0 deletions jenkins_description.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
Membrane Separation Model:<br/>
<p>Updated hollow fiber membrane model and system example for carbon capture.</p>
<br/>
<table style="width:50%">
<tr>
<td>Product Team:</td>
<td>PT5</td>
</tr>
<tr>
<td>Developers:</td>
<td>
<a href="mailto:Kayode Ajayi &lt;[email protected]&gt;">Kayode Ajayi</a> &amp;
<a href="mailto:Debangsu Bhattacharyya &lt;[email protected]&gt;">Debangsu Bhattacharyya</a>
</td>
</tr>
<tr>
<td>Drupal:</td>
<td>
<a href="https://www.acceleratecarboncapture.org/product/membranemodel">Membrane Separation Model</a>
</td>
</tr>
<tr>
<td>Jira:</td>
<td>
<a href="https://svn.acceleratecarboncapture.org/jira/browse/HFGPMBRNE">HFGPMBRNE</a>
</td>
</tr>
</table>
Binary file added test/CCSI_HFGP_User_Manual.pdf
Binary file not shown.
Loading

0 comments on commit 89ae198

Please sign in to comment.