Skip to content

Commit fca0772

Browse files
committed
Initial import from 2016.02.00 release: svn r10090
0 parents  commit fca0772

16 files changed

Lines changed: 158 additions & 0 deletions

.gitmodules

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[submodule "Solvents/vof_area_correlation"]
2+
path = Solvents/vof_area_correlation
3+
url = git@github.com:CCSI-Toolset/vof_area_correlation.git
4+
[submodule "Solvents/WWC"]
5+
path = Solvents/WWC
6+
url = git@github.com:CCSI-Toolset/WWC.git
7+
[submodule "Sorbents/1mw_cfd"]
8+
path = Sorbents/1mw_cfd
9+
url = git@github.com:CCSI-Toolset/1mw_cfd.git
10+
[submodule "Sorbents/filtered_models"]
11+
path = Sorbents/filtered_models
12+
url = git@github.com:CCSI-Toolset/filtered_models.git
13+
[submodule "Sorbents/attrition"]
14+
path = Sorbents/attrition
15+
url = git@github.com:CCSI-Toolset/attrition.git
16+
[submodule "Sorbents/Pulverization"]
17+
path = Sorbents/Pulverization
18+
url = git@github.com:CCSI-Toolset/Pulverization.git

LICENSE.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Copyright <YEAR> <COPYRIGHT HOLDER>
2+
3+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4+
5+
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
6+
7+
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
8+
9+
3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
10+
11+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Makefile

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
# A simple makefile for creating the High Resolution CFD Models bundled product
2+
VERSION := 2016.02.00
3+
PRODUCT := CFD Models Bundle
4+
PROD_SNAME := CFDModels_bundle
5+
LICENSE := CCSI_TE_LICENSE_$(PROD_SNAME).txt
6+
PKG_DIR := CCSI_$(PROD_SNAME)_$(VERSION)
7+
PACKAGE := $(PKG_DIR).zip
8+
9+
CATEGORIES := Sorbents Solvents
10+
11+
# Where Jenkins should checkout ^/projects/common/trunk/
12+
COMMON := .ccsi_common
13+
LEGAL_DOCS := LEGAL \
14+
CCSI_TE_LICENSE.txt
15+
16+
TARBALLS := *.tgz
17+
ZIPFILES := *.zip
18+
19+
# The bundled packages, as found in each category subdir
20+
SUB_PACKAGES := $(foreach c,$(CATEGORIES), $(wildcard $c/$(TARBALLS) $c/$(ZIPFILES)))
21+
22+
PAYLOAD := docs/*.pdf \
23+
LEGAL \
24+
$(LICENSE)
25+
26+
# Get just the top part (not dirname) of each entry so cp -r does the right thing
27+
PAYLOAD_TOPS := $(foreach v,$(PAYLOAD),$(shell echo $v | cut -d'/' -f1))
28+
# And the payload (including expanded projects) with the PKG_DIR prepended
29+
PKG_PAYLOAD := $(addprefix $(PKG_DIR)/, $(PAYLOAD) $(basename $(SUB_PACKAGES)))
30+
31+
# OS detection & changes
32+
UNAME := $(shell uname)
33+
ifeq ($(UNAME), Linux)
34+
MD5BIN=md5sum
35+
endif
36+
ifeq ($(UNAME), Darwin)
37+
MD5BIN=md5
38+
endif
39+
ifeq ($(UNAME), FreeBSD)
40+
MD5BIN=md5
41+
endif
42+
43+
.PHONY: all clean $(CATEGORIES)
44+
45+
all: $(PACKAGE)
46+
47+
# Go into each category's subdir and break open the archives there
48+
# into the corresponding subdir in the PKG_DIR
49+
$(CATEGORIES):
50+
@mkdir -p $(PKG_DIR)/$@
51+
52+
@for tb in $(wildcard $@/$(TARBALLS)); do \
53+
tar -xzf $$tb -C $(PKG_DIR)/$@; \
54+
done
55+
56+
@for zf in $(wildcard $@/$(ZIPFILES)); do \
57+
unzip -qo $$zf -d $(PKG_DIR)/$@; \
58+
done
59+
60+
61+
$(PACKAGE): $(PAYLOAD) $(CATEGORIES)
62+
@mkdir -p $(PKG_DIR)
63+
@cp -r $(PAYLOAD_TOPS) $(PKG_DIR)
64+
@zip -qXr $(PACKAGE) $(PKG_PAYLOAD)
65+
@$(MD5BIN) $(PACKAGE)
66+
@rm -rf $(PKG_DIR) $(LEGAL_DOCS) $(LICENSE)
67+
68+
69+
$(LICENSE): CCSI_TE_LICENSE.txt
70+
@sed "s/\[SOFTWARE NAME \& VERSION\]/$(PRODUCT) v.$(VERSION)/" < CCSI_TE_LICENSE.txt > $(LICENSE)
71+
72+
$(LEGAL_DOCS):
73+
@if [ -d $(COMMON) ]; then \
74+
cp $(COMMON)/$@ .; \
75+
else \
76+
svn -q export ^/projects/common/trunk/$@; \
77+
fi
78+
79+
80+
clean:
81+
@rm -rf $(PACKAGE) $(PKG_DIR) $(LEGAL_DOCS) $(LICENSE)

README.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# CFDModels_bundle
2+
Sorbents
3+
Validated 1MW Adsorber
4+
Filtered Models
5+
Attrition
6+
Pulverization
7+
Solvents
8+
VOF Wetted Surface
9+
Wetted Wall Column
10+
11+
## Development Practices
12+
13+
* Code development will be peformed in a forked copy of the repo. Commits will not be
14+
made directly to the ngt-archive repo. Developers will submit a pull
15+
request that is then merged by another team member, if another team member is available.
16+
* Each pull request should contain only related modifications to a feature or bug fix.
17+
* Sensitive information (secret keys, usernames etc) and configuration data
18+
(e.g database host port) should not be checked in to the repo.
19+
* A practice of rebasing with the main repo should be used rather that merge commmits.
20+
21+
## Getting Started
22+
23+
TBD
24+
25+
## Authors
26+
27+
TBD
28+
29+
See also the list of [contributors](https://github.com/CCSI-Toolset/CFDModels_bundle/contributors) who participated in this project.
30+
31+
## Versioning
32+
33+
We use [SemVer](http://semver.org/) for versioning. For the versions available,
34+
see the [tags on this repository](https://github.com/CFDModels_bundle/tags).
35+
36+
## License
37+
38+
See [LICENSE.md](LICENSE.md) file for details
39+
40+
## Copyright Notice
41+
42+
TBD

Solvents/WWC

Submodule WWC added at 40c7af9

Solvents/vof_area_correlation

Submodule vof_area_correlation added at 32f4a95

Sorbents/1mw_cfd

Submodule 1mw_cfd added at 44fc82c

Sorbents/Pulverization

Submodule Pulverization added at 5d92794

Sorbents/attrition

Submodule attrition added at c5c4fec

Sorbents/filtered_models

Submodule filtered_models added at 7ff5437

0 commit comments

Comments
 (0)