Skip to content

Commit

Permalink
Initial import from 2015.10.00 release: svn r9823
Browse files Browse the repository at this point in the history
Added .gitattributes to make sure Windows CRLF is preserved for *.opt,
*.bkp

Filtered out file(s):
* full.dll - Need to figure out what source this DLL binary came from
  • Loading branch information
vchendrix committed May 19, 2017
0 parents commit 67bff7b
Show file tree
Hide file tree
Showing 8 changed files with 1,914 additions and 0 deletions.
11 changes: 11 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# 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.
*.opt text eol=crlf
*.bkp text eol=crlf

# Denote all files that are truly binary and should not be modified.
1 change: 1 addition & 0 deletions 2mpzloc.opt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
full.dll
60 changes: 60 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# A simple makefile for creating the 2MPZ distribution package
VERSION := 2015.03.00
PRODUCT := High Viscosity 2-MPZ Solvent Model
PROD_SNAME := 2MPZ
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 := ThunderMoon.bkp \
2mpzloc.opt \
full.dll \
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 -qrX $(PACKAGE) $(PKG_PAYLOAD)
@$(MD5BIN) $(PACKAGE)
@rm -rf $(PKG_DIR) $(LICENSE) $(LEGAL_DOCS)

$(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 @@
# 2-mpz
**High Viscosity Solvent Model, 2-MPZ: **
Basic data model in Aspen Plus format for 2-MPZ system.
1,819 changes: 1,819 additions & 0 deletions ThunderMoon.bkp

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions jenkins_description.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
High Viscosity Solvent Model, 2-MPZ<br/>
Basic data model in Aspen Plus format for 2-MPZ system.<br/>
<br/>
<table style="width:50%">
<tr>
<td>Product Team:</td>
<td>PT2</td></tr>
<tr>
<td>Developers:</td>
<td><a href="mailto:Brent Sherman &lt;[email protected]&gt;">Brent Sherman</a></td></tr>
<tr>
<td>Drupal:</td>
<td><a href="https://www.acceleratecarboncapture.org/product/2-mpz">2-mpz</a></td></tr>
<tr>
<td>Jira:</td>
<td><a href="https://svn.acceleratecarboncapture.org/jira/browse/HVSOLVM">HVSOLVM</a> (2-mpz component)</td></tr>
<tr>
<td>Test Plan:</td>
<td><a href="https://svn.acceleratecarboncapture.org/trac/browser/svn/projects/2-mpz/trunk/test/system_test/ccsi_test-outline_2-mpz.xlsx">ccsi_test-outline_2-mpz.xlsx</a></td></tr>
</table>
Binary file added test/system_test/CCSI_IP_2MPZmodel.docx
Binary file not shown.
Binary file added test/system_test/ccsi_test-outline_2-mpz.xlsx
Binary file not shown.

0 comments on commit 67bff7b

Please sign in to comment.