Skip to content

Commit

Permalink
Fix accidentally updated copyright notice
Browse files Browse the repository at this point in the history
  • Loading branch information
lefticus committed Feb 23, 2020
1 parent 8622b4b commit 77d31a5
Showing 1 changed file with 37 additions and 48 deletions.
85 changes: 37 additions & 48 deletions tst/EnergyPlus/unit/Coils/CoilCoolingDXFixture.hh
Original file line number Diff line number Diff line change
@@ -1,59 +1,48 @@
// EnergyPlus, Copyright (c) 1996-2020, 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.
// EnergyPlus, Copyright (c) 1996-2020, 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.
//
// 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.
// 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.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
// Redistribution and use in source and binary forms, with or without modification, are permitted
// provided that the following conditions are met:
//
// (1) Redistributions of source code must retain the above copyright notice,
// this list of
// (1) Redistributions of source code must retain the above copyright notice, this list of
// conditions and the following disclaimer.
//
// (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.
// (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.
//
// (3) Neither the name of the University of California, Lawrence Berkeley
// National Laboratory,
// the University of Illinois, U.S. Dept. of Energy nor the names of its
// contributors may be used to endorse or promote products derived from this
// software without specific prior written permission.
// (3) Neither the name of the University of California, Lawrence Berkeley National Laboratory,
// the University of Illinois, U.S. Dept. of Energy nor the names of its contributors may be
// used to endorse or promote products derived from this software without specific prior
// written permission.
//
// (4) Use of EnergyPlus(TM) Name. If Licensee (i) distributes the software in
// stand-alone form
// without changes from the version obtained under this License, or (ii)
// Licensee makes a reference solely to the software portion of its product,
// Licensee must refer to the software as "EnergyPlus version X" software,
// where "X" is the version number Licensee obtained under this License and
// may not use a different name for the software. Except as specifically
// required in this Section (4), Licensee shall not use in a company name, a
// product name, in advertising, publicity, or other promotional activities
// any name, trade name, trademark, logo, or other designation of
// "EnergyPlus", "E+", "e+" or confusingly similar designation, without the
// U.S. Department of Energy's prior written consent.
// (4) Use of EnergyPlus(TM) Name. If Licensee (i) distributes the software in stand-alone form
// without changes from the version obtained under this License, or (ii) Licensee makes a
// reference solely to the software portion of its product, Licensee must refer to the
// software as "EnergyPlus version X" software, where "X" is the version number Licensee
// obtained under this License and may not use a different name for the software. Except as
// specifically required in this Section (4), Licensee shall not use in a company name, a
// product name, in advertising, publicity, or other promotional activities any name, trade
// name, trademark, logo, or other designation of "EnergyPlus", "E+", "e+" or confusingly
// similar designation, without the U.S. Department of Energy's prior written consent.
//
// 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
// 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.

// Google Test Headers
Expand Down

8 comments on commit 77d31a5

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update_ssz_zsz_mtr_files_to_fmt (lefticus) - x86_64-Linux-Ubuntu-18.04-cppcheck: OK (0 of 0 tests passed, 0 test warnings)

Build Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update_ssz_zsz_mtr_files_to_fmt (lefticus) - x86_64-Linux-Ubuntu-18.04-custom_check: OK (11 of 11 tests passed, 0 test warnings)

Build Badge

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update_ssz_zsz_mtr_files_to_fmt (lefticus) - x86_64-MacOS-10.13-clang: OK (2701 of 2701 tests passed, 7 test warnings)

Messages:\n

  • 7 tests had: ERR diffs.

Build Badge Test Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update_ssz_zsz_mtr_files_to_fmt (lefticus) - x86_64-Linux-Ubuntu-18.04-gcc-7.4: OK (2733 of 2733 tests passed, 7 test warnings)

Messages:\n

  • 7 tests had: ERR diffs.

Build Badge Test Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update_ssz_zsz_mtr_files_to_fmt (lefticus) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-UnitTestsCoverage-Debug: OK (1313 of 1313 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@Myoldmopar
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lefticus as you surely already realized, don't worry about those ERR diffs. I just need to teach the regression script to ignore those file paths when doing ERR comparisons.

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update_ssz_zsz_mtr_files_to_fmt (lefticus) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-IntegrationCoverage-Debug: OK (693 of 694 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 693
  • Timeout: 1

Build Badge Test Badge Coverage Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update_ssz_zsz_mtr_files_to_fmt (lefticus) - Win64-Windows-10-VisualStudio-16: OK (2693 of 2697 tests passed, 0 test warnings)

Failures:\n

SQLiteFixture Test Summary

  • Passed: 73
  • Failed: 4

Build Badge Test Badge

Please sign in to comment.