Skip to content

Commit dbcbbb7

Browse files
authored
Merge pull request #4 from ksbeattie/master
Changes for Open Source release - looks fine.
2 parents d1e0d90 + a23cd94 commit dbcbbb7

10 files changed

+20
-245722
lines changed

ACM/Example/Int_BFB_CO2.acmf

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2590,11 +2590,7 @@ A. Lee and D.C. Miller, A One-Dimensional (1-D) Three-Region Model for a Bubblin
25902590

25912591
Last Modification date: May 2015
25922592

2593-
This Material was produced under the DOE Carbon Capture Simulation Initiative (CCSI), and copyright is held by the software owners: ORISE, LANS,
2594-
LLNS, LBL, PNNL, CMU, WVU, et al. The software owners and/or the U.S. Government retain ownership of all rights in the CCSI software and the
2595-
copyright and patents subsisting therein. Any distribution or dissemination is governed under the terms and conditions of the CCSI Test and
2596-
Evaluation License, CCSI Master Non-Disclosiure Agreement, and the CCSI Intellectual Property Management Plan. No rights are granted except as
2597-
expressly recited in one of the aforementioned agreements.
2593+
See LICENSE.md for licence and copyright details.
25982594
*/
25992595
// =================================================================================================================================================================================================================================
26002596
// Declare Parameters

ACM/Int_BFB_CO2.acmf

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2590,11 +2590,7 @@ A. Lee and D.C. Miller, A One-Dimensional (1-D) Three-Region Model for a Bubblin
25902590

25912591
Last Modification date: May 2015
25922592

2593-
This Material was produced under the DOE Carbon Capture Simulation Initiative (CCSI), and copyright is held by the software owners: ORISE, LANS,
2594-
LLNS, LBL, PNNL, CMU, WVU, et al. The software owners and/or the U.S. Government retain ownership of all rights in the CCSI software and the
2595-
copyright and patents subsisting therein. Any distribution or dissemination is governed under the terms and conditions of the CCSI Test and
2596-
Evaluation License, CCSI Master Non-Disclosiure Agreement, and the CCSI Intellectual Property Management Plan. No rights are granted except as
2597-
expressly recited in one of the aforementioned agreements.
2593+
See LICENSE.md for licence and copyright details.
25982594
*/
25992595
// =================================================================================================================================================================================================================================
26002596
// Declare Parameters

README.md

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,30 @@
1-
# intcap
1+
# IntCap
22
Integrated Capture Systems Model
33

4-
## Development Practices
5-
6-
* Code development will be peformed in a forked copy of the repo. Commits will not be
7-
made directly to the repo. Developers will submit a pull request that is then merged
8-
by another team member, if another team member is available.
9-
* Each pull request should contain only related modifications to a feature or bug fix.
10-
* Sensitive information (secret keys, usernames etc) and configuration data
11-
(e.g database host port) should not be checked in to the repo.
12-
* A practice of rebasing with the main repo should be used rather that merge commmits.
4+
Note: This product is also part of the [Process Models Bundle](../../../ProcessModels_bundle)
135

146
## Getting Started
15-
16-
TBD
7+
See installation and user guide documents in the [documentation](./docs) subdirectory.
178

189
## Authors
1910

2011
* Ben Omell
2112
* Debangsu Bhattacharyya
2213

23-
See also the list of [contributors](https://github.com/CCSI-Toolset/intcap/contributors) who participated in this project.
14+
See also the list of [contributors](../..//contributors) who participated in this project.
2415

25-
## Versioning
16+
## Development Practices
17+
* Code development will be performed in a forked copy of the repo. Commits will not be
18+
made directly to the repo. Developers will submit a pull request that is then merged
19+
by another team member, if another team member is available.
20+
* Each pull request should contain only related modifications to a feature or bug fix.
21+
* Sensitive information (secret keys, usernames etc) and configuration data
22+
(e.g database host port) should not be checked in to the repo.
23+
* A practice of rebasing with the main repo should be used rather that merge commmits.
2624

25+
## Versioning
2726
We use [SemVer](http://semver.org/) for versioning. For the versions available,
28-
see the [tags on this repository](https://github.com/CCSI-Toolset/intcap/tags).
27+
see the [releases](../../releases) or [tags](../../tags) for this repository.
2928

3029
## License & Copyright
31-
3230
See [LICENSE.md](LICENSE.md) file for details

docs/CCSI_IntCap_User_Manual.docx

1.33 MB
Binary file not shown.

docs/CCSI_IntCap_User_Manual.pdf

1010 KB
Binary file not shown.

gPROMS/Example/Integrated process v1.0.bak

Lines changed: 0 additions & 122827 deletions
This file was deleted.

gPROMS/Example/Integrated process v1.0.gPJ

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5017,11 +5017,7 @@ Converted from ACM version to gRROMS version by: Yang Chen.
50175017

50185018
Conversion date: March 2014
50195019

5020-
This Material was produced under the DOE Carbon Capture Simulation Initiative (CCSI), and copyright is held by the software owners: ORISE, LANS,
5021-
LLNS, LBL, PNNL, CMU, WVU, et al. The software owners and/or the U.S. Government retain ownership of all rights in the CCSI software and the
5022-
copyright and patents subsisting therein. Any distribution or dissemination is governed under the terms and conditions of the CCSI Test and
5023-
Evaluation License, CCSI Master Non-Disclosiure Agreement, and the CCSI Intellectual Property Management Plan. No rights are granted except as
5024-
expressly recited in one of the aforementioned agreements.
5020+
See LICENSE.md for licence and copyright details.
50255021
}
50265022

50275023
# =======================================================================================================================================================================================================
@@ -122835,4 +122831,4 @@ set physprops 1VCSD;
122835122831
]]></Body>
122836122832
</MiscFileEntity>
122837122833
</Group>
122838-
</gMB:GpromsProject>
122834+
</gMB:GpromsProject>

0 commit comments

Comments
 (0)