Skip to content

Commit b6418f3

Browse files
committed
Updating license info
This addresses #17
1 parent 83dea65 commit b6418f3

6 files changed

Lines changed: 103 additions & 348 deletions

File tree

LICENSE.md

Lines changed: 51 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,72 @@
11
Copyright and License
22
=====================
33

4-
Copyright (c) 2012 - 2019
4+
Copyright (c) 2012 - 2021
55

66
Copyright Notice
77
----------------
88

9-
SimSinter was produced under the DOE Carbon Capture Simulation Initiative (CCSI), and is copyright (c) 2012 - 2019 by the software owners: Oak Ridge Institute for Science and Education (ORISE), TRIAD National Security, LLC., Lawrence Livermore National Security, LLC., The Regents of the University of California, through Lawrence Berkeley National Laboratory, Battelle Memorial Institute, Pacific Northwest Division through Pacific Northwest National Laboratory, Carnegie Mellon University, West Virginia University, Boston University, the Trustees of Princeton University, The University of Texas at Austin, URS Energy & Construction, Inc., et al.. All rights reserved.
9+
SimSinter was produced under the DOE Carbon Capture Simulation Initiative (CCSI), and is copyright
10+
(c) 2012 - 2021 by the software owners: Oak Ridge Institute for Science and Education (ORISE), TRIAD
11+
National Security, LLC., Lawrence Livermore National Security, LLC., The Regents of the University
12+
of California, through Lawrence Berkeley National Laboratory, Battelle Memorial Institute, Pacific
13+
Northwest Division through Pacific Northwest National Laboratory, Carnegie Mellon University, West
14+
Virginia University, Boston University, the Trustees of Princeton University, The University of
15+
Texas at Austin, URS Energy & Construction, Inc., et al.. All rights reserved.
1016

11-
NOTICE. This Software was developed under funding from the U.S. Department of Energy and the U.S. Government consequently retains certain rights. As such, the U.S. Government has been granted for itself and others acting on its behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software to reproduce, distribute copies to the public, prepare derivative works, and perform publicly and display publicly, and to permit other to do so.
17+
NOTICE. This Software was developed under funding from the U.S. Department of Energy and the
18+
U.S. Government consequently retains certain rights. As such, the U.S. Government has been granted
19+
for itself and others acting on its behalf a paid-up, nonexclusive, irrevocable, worldwide license
20+
in the Software to reproduce, distribute copies to the public, prepare derivative works, and perform
21+
publicly and display publicly, and to permit other to do so.
1222

1323
License Agreement
1424
-----------------
1525

16-
SimSinter Copyright (c) 2012 - 2019, by the software owners: Oak Ridge Institute for Science and Education (ORISE), TRIAD National Security, LLC., Lawrence Livermore National Security, LLC., The Regents of the University of California, through Lawrence Berkeley National Laboratory, Battelle Memorial Institute, Pacific Northwest Division through Pacific Northwest National Laboratory, Carnegie Mellon University, West Virginia University, Boston University, the Trustees of Princeton University, The University of Texas at Austin, URS Energy & Construction, Inc., et al. All rights reserved.
26+
SimSinter Copyright (c) 2012 - 2021, by the software owners: Oak Ridge Institute for Science and
27+
Education (ORISE), TRIAD National Security, LLC., Lawrence Livermore National Security, LLC., The
28+
Regents of the University of California, through Lawrence Berkeley National Laboratory, Battelle
29+
Memorial Institute, Pacific Northwest Division through Pacific Northwest National Laboratory,
30+
Carnegie Mellon University, West Virginia University, Boston University, the Trustees of Princeton
31+
University, The University of Texas at Austin, URS Energy & Construction, Inc., et al. All rights
32+
reserved.
1733

1834

19-
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
35+
Redistribution and use in source and binary forms, with or without modification, are permitted
36+
provided that the following conditions are met:
2037

21-
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
38+
1. Redistributions of source code must retain the above copyright notice, this list of conditions
39+
and the following disclaimer.
2240

23-
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.
41+
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions
42+
and the following disclaimer in the documentation and/or other materials provided with the
43+
distribution.
2444

25-
3. Neither the name of the Carbon Capture Simulation Initiative, U.S. Dept. of Energy, the National Energy Technology Laboratory, Oak Ridge Institute for Science and Education (ORISE), TRIAD National Security, LLC., Lawrence Livermore National Security, LLC., the University of California, Lawrence Berkeley National Laboratory, Battelle Memorial Institute, Pacific Northwest National Laboratory, Carnegie Mellon University, West Virginia University, Boston University, the Trustees of Princeton University, the University of Texas at Austin, URS Energy & Construction, Inc., nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
45+
3. Neither the name of the Carbon Capture Simulation Initiative, U.S. Dept. of Energy, the National
46+
Energy Technology Laboratory, Oak Ridge Institute for Science and Education (ORISE), TRIAD
47+
National Security, LLC., Lawrence Livermore National Security, LLC., the University of
48+
California, Lawrence Berkeley National Laboratory, Battelle Memorial Institute, Pacific Northwest
49+
National Laboratory, Carnegie Mellon University, West Virginia University, Boston University, the
50+
Trustees of Princeton University, the University of Texas at Austin, URS Energy & Construction,
51+
Inc., nor the names of its contributors may be used to endorse or promote products derived from
52+
this software without specific prior written permission.
2653

2754

28-
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 OWNER 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.
55+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
56+
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
57+
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
58+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
59+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
60+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
61+
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
62+
THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2963

3064

31-
You are under no obligation whatsoever to provide any bug fixes, patches, or upgrades to the features, functionality or performance of the source code ("Enhancements") to anyone; however, if you choose to make your Enhancements available either publicly, or directly to Lawrence Berkeley National Laboratory, without imposing a separate written license agreement for such Enhancements, then you hereby grant the following license: a non-exclusive, royalty-free perpetual license to install, use, modify, prepare derivative works, incorporate into other computer software, distribute, and sublicense such enhancements or derivative works thereof, in binary and source code form.
65+
You are under no obligation whatsoever to provide any bug fixes, patches, or upgrades to the
66+
features, functionality or performance of the source code ("Enhancements") to anyone; however, if
67+
you choose to make your Enhancements available either publicly, or directly to Lawrence Berkeley
68+
National Laboratory, without imposing a separate written license agreement for such Enhancements,
69+
then you hereby grant the following license: a non-exclusive, royalty-free perpetual license to
70+
install, use, modify, prepare derivative works, incorporate into other computer software,
71+
distribute, and sublicense such enhancements or derivative works thereof, in binary and source code
72+
form.

Master/AspenSinterGUI/SplashWindow.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<RichTextBox MouseLeftButtonDown="Grid_close" Background="White" HorizontalAlignment="Stretch" Margin="0,0,0,0" Name="Instructions" VerticalAlignment="Stretch" Grid.Column="1" Grid.ColumnSpan="4" Grid.Row="2" Grid.RowSpan="3" FontSize="12" IsReadOnly="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
3232
<FlowDocument>
3333
<Paragraph>
34-
This Material was produced under the DOE Carbon Capture Simulation Initiative (CCSI), and copyright is held by the software owners: ORISE, LANS, 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 copyright and patents subsisting therein. Any distribution or dissemination is governed under the terms and conditions of the CCSI Test and Evaluation License, CCSI Master Non-Disclosure Agreement, and the CCSI Intellectual Property Management Plan. No rights are granted except as expressly recited in one of the aforementioned agreements.
34+
SimSinter was produced under the DOE Carbon Capture Simulation Initiative (CCSI), and is copyright (c) 2012 - 2021 by the software owners: Oak Ridge Institute for Science and Education (ORISE), TRIAD National Security, LLC., Lawrence Livermore National Security, LLC., The Regents of the University of California, through Lawrence Berkeley National Laboratory, Battelle Memorial Institute, Pacific Northwest Division through Pacific Northwest National Laboratory, Carnegie Mellon University, West Virginia University, Boston University, the Trustees of Princeton University, The University of Texas at Austin, URS Energy & Construction, Inc., et al.. All rights reserved.
3535
</Paragraph>
3636

3737
<Table>
@@ -60,7 +60,7 @@
6060
</TableCell>
6161
<TableCell>
6262
<Paragraph>
63-
CCSI Testing and Evaluation License
63+
See LICENSE.md for license and copyright details.
6464
</Paragraph>
6565
</TableCell>
6666
</TableRow>
@@ -72,7 +72,7 @@
7272
</TableCell>
7373
<TableCell>
7474
<Paragraph>
75-
https://www.acceleratecarboncapture.org/drupal
75+
https://www.acceleratecarboncapture.org/
7676
</Paragraph>
7777
</TableCell>
7878
</TableRow>

Master/CCSIUnitsInstaller/CCSIUnits.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
2222
<UIRef Id="WixUI_Mondo" />
2323
<UIRef Id="WixUI_ErrorProgressText" />
24-
<WixVariable Id="WixUILicenseRtf" Value="..\UC2\CCSI_TE_LICENSEandUC2.rtf" />
24+
<WixVariable Id="WixUILicenseRtf" Value="..\UC2\LICENSE.rtf" />
2525

2626
</Product>
2727
<Fragment>
@@ -37,4 +37,4 @@
3737
</Fragment>
3838

3939

40-
</Wix>
40+
</Wix>

Master/SimSinterInstaller/SimSinter.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
6060
<UIRef Id="WixUI_Mondo" />
6161
<UIRef Id="WixUI_ErrorProgressText" />
62-
<WixVariable Id="WixUILicenseRtf" Value="..\CCSI_TE_LICENSEandUC2.rtf" />
62+
<WixVariable Id="WixUILicenseRtf" Value="..\LICENSE.rtf" />
6363

6464
</Product>
6565

@@ -111,4 +111,4 @@
111111

112112
</Fragment>
113113

114-
</Wix>
114+
</Wix>

0 commit comments

Comments
 (0)