-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Initial import from 2015.10.00 release: svn r9825 …
Added .gitattributes to make sure Windows CRLF is preserved for *.acmf, *.rms and *.py
- Loading branch information
0 parents
commit 89ae198
Showing
17 changed files
with
6,188 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 <[email protected]>">Kayode Ajayi</a> & | ||
<a href="mailto:Debangsu Bhattacharyya <[email protected]>">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 not shown.
Oops, something went wrong.