Skip to content

Commit 3e5a898

Browse files
jmarrecjmarrec
authored
Merge pull request #5344 from NREL/copyright_cleanup
Copyright cleanup
2 parents a17f867 + cf0f47e commit 3e5a898

File tree

72 files changed

+245
-872
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+245
-872
lines changed

‎.git-blame-ignore-revs

+3
Original file line numberDiff line numberDiff line change
@@ -154,3 +154,6 @@ b3d2e94e3ae1160f447af2035a1ffabaec4b3423
154154

155155
# [chore] Commit clang-format autocorrects [github-lint-actions[bot], 2024-12-19]
156156
77309e0db461ce64a0cca1e1a0f2bbda29ff7a66
157+
158+
# [chore] Copyright cleanup [Julien Marrec, 2025-01-14]
159+
ae602de89105983bf762cf1e6afd33d63d81b4a6

‎LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC.
1+
OpenStudio(R), Copyright (c) 2008-2025, Alliance for Sustainable Energy, LLC.
22

33
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
44
following conditions are met:

‎OpenStudio.hxx.in

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/***********************************************************************************************************************
2+
* OpenStudio(R), Copyright (c) Alliance for Sustainable Energy, LLC.
3+
* See also https://openstudio.net/license
4+
***********************************************************************************************************************/
5+
16
#ifndef OPENSTUDIO_HXX
27
#define OPENSTUDIO_HXX
38

‎copyright.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC.
1+
OpenStudio(R), Copyright (c) 2008-2025, Alliance for Sustainable Energy, LLC.
22

33
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
44
following conditions are met:
@@ -66,7 +66,7 @@ DEALINGS IN THE SOFTWARE.
6666

6767

6868
*** EnergyPlus ****************************************************************
69-
EnergyPlus, Copyright (c) 1996-2023, The Board of Trustees of the University of Illinois, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-Battelle, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
69+
EnergyPlus, Copyright (c) 1996-2025, The Board of Trustees of the University of Illinois, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-Battelle, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
7070

7171
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 others to do so.
7272

‎csharp/developer/OpenStudio/OpenStudio.csproj.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<!-- NuGet metadata properties -->
2121
<Product>OpenStudio</Product>
2222
<Version>${CSHARP_ASSEMBLY_VERSION}</Version>
23-
<Copyright>Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.</Copyright>
23+
<Copyright>Copyright (c) 2008-2025, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.</Copyright>
2424
<Description>OpenStudio C# bindings for whole building energy simulation</Description>
2525
<RepositoryUrl>https://github.com/NREL/OpenStudio</RepositoryUrl>
2626
<RepositoryType>git</RepositoryType>

‎developer/ruby/GenerateClass.rb

+2-26
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,6 @@
11
########################################################################################################################
2-
# OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
3-
#
4-
# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
5-
# following conditions are met:
6-
#
7-
# (1) Redistributions of source code must retain the above copyright notice, this list of conditions and the following
8-
# disclaimer.
9-
#
10-
# (2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
11-
# disclaimer in the documentation and/or other materials provided with the distribution.
12-
#
13-
# (3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse or promote products
14-
# derived from this software without specific prior written permission from the respective party.
15-
#
16-
# (4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other derivative works
17-
# may not use the "OpenStudio" trademark, "OS", "os", or any other confusingly similar designation without specific prior
18-
# written permission from Alliance for Sustainable Energy, LLC.
19-
#
20-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
21-
# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
22-
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED
23-
# STATES DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
24-
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
25-
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
26-
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
27-
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2+
# OpenStudio(R), Copyright (c) Alliance for Sustainable Energy, LLC.
3+
# See also https://openstudio.net/license
284
########################################################################################################################
295

306
######################################################################

‎developer/ruby/SDDWriters/SDDWriter.rb

+2-26
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,6 @@
11
########################################################################################################################
2-
# OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
3-
#
4-
# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
5-
# following conditions are met:
6-
#
7-
# (1) Redistributions of source code must retain the above copyright notice, this list of conditions and the following
8-
# disclaimer.
9-
#
10-
# (2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
11-
# disclaimer in the documentation and/or other materials provided with the distribution.
12-
#
13-
# (3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse or promote products
14-
# derived from this software without specific prior written permission from the respective party.
15-
#
16-
# (4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other derivative works
17-
# may not use the "OpenStudio" trademark, "OS", "os", or any other confusingly similar designation without specific prior
18-
# written permission from Alliance for Sustainable Energy, LLC.
19-
#
20-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
21-
# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
22-
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED
23-
# STATES DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
24-
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
25-
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
26-
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
27-
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2+
# OpenStudio(R), Copyright (c) Alliance for Sustainable Energy, LLC.
3+
# See also https://openstudio.net/license
284
########################################################################################################################
295

306
require 'rexml/document'

‎developer/ruby/SerializeSDD.rb

+2-26
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,6 @@
11
########################################################################################################################
2-
# OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
3-
#
4-
# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
5-
# following conditions are met:
6-
#
7-
# (1) Redistributions of source code must retain the above copyright notice, this list of conditions and the following
8-
# disclaimer.
9-
#
10-
# (2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
11-
# disclaimer in the documentation and/or other materials provided with the distribution.
12-
#
13-
# (3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse or promote products
14-
# derived from this software without specific prior written permission from the respective party.
15-
#
16-
# (4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other derivative works
17-
# may not use the "OpenStudio" trademark, "OS", "os", or any other confusingly similar designation without specific prior
18-
# written permission from Alliance for Sustainable Energy, LLC.
19-
#
20-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
21-
# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
22-
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED
23-
# STATES DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
24-
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
25-
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
26-
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
27-
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2+
# OpenStudio(R), Copyright (c) Alliance for Sustainable Energy, LLC.
3+
# See also https://openstudio.net/license
284
########################################################################################################################
295

306
require 'openstudio'

‎developer/ruby/SubProjectClassGenerators/AnalysisClassGenerator.rb

+2-26
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,6 @@
11
########################################################################################################################
2-
# OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
3-
#
4-
# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
5-
# following conditions are met:
6-
#
7-
# (1) Redistributions of source code must retain the above copyright notice, this list of conditions and the following
8-
# disclaimer.
9-
#
10-
# (2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
11-
# disclaimer in the documentation and/or other materials provided with the distribution.
12-
#
13-
# (3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse or promote products
14-
# derived from this software without specific prior written permission from the respective party.
15-
#
16-
# (4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other derivative works
17-
# may not use the "OpenStudio" trademark, "OS", "os", or any other confusingly similar designation without specific prior
18-
# written permission from Alliance for Sustainable Energy, LLC.
19-
#
20-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
21-
# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
22-
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED
23-
# STATES DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
24-
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
25-
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
26-
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
27-
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2+
# OpenStudio(R), Copyright (c) Alliance for Sustainable Energy, LLC.
3+
# See also https://openstudio.net/license
284
########################################################################################################################
295

306
######################################################################

‎developer/ruby/SubProjectClassGenerators/FileHeader.rb

+2-26
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,8 @@ def fileHeader
33
fileHeader = String.new
44

55
fileHeader << "/***********************************************************************************************************************\n"
6-
fileHeader << "* OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.\n"
7-
fileHeader << "*\n"
8-
fileHeader << "* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the\n"
9-
fileHeader << "* following conditions are met:\n"
10-
fileHeader << "*\n"
11-
fileHeader << "* (1) Redistributions of source code must retain the above copyright notice, this list of conditions and the following\n"
12-
fileHeader << "* disclaimer.\n"
13-
fileHeader << "*\n"
14-
fileHeader << "* (2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following\n"
15-
fileHeader << "* disclaimer in the documentation and/or other materials provided with the distribution.\n"
16-
fileHeader << "*\n"
17-
fileHeader << "* (3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse or promote products\n"
18-
fileHeader << "* derived from this software without specific prior written permission from the respective party.\n"
19-
fileHeader << "*\n"
20-
fileHeader << "* (4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other derivative works\n"
21-
fileHeader << "* may not use the \"OpenStudio\" trademark, \"OS\", \"os\", or any other confusingly similar designation without specific prior\n"
22-
fileHeader << "* written permission from Alliance for Sustainable Energy, LLC.\n"
23-
fileHeader << "*\n"
24-
fileHeader << "* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n"
25-
fileHeader << "* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n"
26-
fileHeader << "* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED\n"
27-
fileHeader << "* STATES DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,\n"
28-
fileHeader << "* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF\n"
29-
fileHeader << "* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n"
30-
fileHeader << "* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n"
31-
fileHeader << "* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
6+
fileHeader << "* OpenStudio(R), Copyright (c) Alliance for Sustainable Energy, LLC.\n"
7+
fileHeader << "* See also https://openstudio.net/license\n"
328
fileHeader << "***********************************************************************************************************************/\n"
339

3410
return fileHeader

‎developer/ruby/SubProjectClassGenerators/ModelClassGenerator.rb

+2-26
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,6 @@
11
########################################################################################################################
2-
# OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
3-
#
4-
# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
5-
# following conditions are met:
6-
#
7-
# (1) Redistributions of source code must retain the above copyright notice, this list of conditions and the following
8-
# disclaimer.
9-
#
10-
# (2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
11-
# disclaimer in the documentation and/or other materials provided with the distribution.
12-
#
13-
# (3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse or promote products
14-
# derived from this software without specific prior written permission from the respective party.
15-
#
16-
# (4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other derivative works
17-
# may not use the "OpenStudio" trademark, "OS", "os", or any other confusingly similar designation without specific prior
18-
# written permission from Alliance for Sustainable Energy, LLC.
19-
#
20-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
21-
# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
22-
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED
23-
# STATES DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
24-
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
25-
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
26-
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
27-
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2+
# OpenStudio(R), Copyright (c) Alliance for Sustainable Energy, LLC.
3+
# See also https://openstudio.net/license
284
########################################################################################################################
295

306
######################################################################

0 commit comments

Comments
 (0)