@@ -1,37 +1,58 @@
-Copyright (c) 1996. The Regents of the University of California. All rights
+Copyright (c) 2012, Lawrence Livermore National Security, LLC.
+Produced at the Lawrence Livermore National Laboratory
+Written by J. Michael Owen <email@example.com>
+All rights reserved.
-Permission to use, copy, modify, and distribute this software for any purpose
-without fee is hereby granted, provided that this entire notice is included in
-all copies of any software which is or includes a copy or modification of this
-software and in all copies of the supporting documentation for such software.
+The files in this directory and below are part of Spheral++. For details, see
-This work was produced at the University of California, Lawrence Livermore
-National Laboratory (UC LLNL) under contract no. W-7405-ENG-48 (Contract 48)
-between the U.S. Department of Energy (DOE) and The Regents of the University of
-California (University) for the operation of UC LLNL. The rights of the Federal
-Government are reserved under Contract 48 subject to the restrictions agreed
-upon by the DOE and University as allowed under DOE Acquisition Letter 97-1.
+Please also read this link ��� Additional BSD Notice.
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
-This work was prepared as an account of work sponsored by an agency of the
-United States Government. Neither the United States Government nor the
-University of California nor any of their employees, makes any warranty, express
-or implied, or assumes any liability or responsibility for the accuracy,
-completeness, or usefulness of any information, apparatus, product, or process
-disclosed, or represents that its use would not infringe privately-owned rights.
-Reference herein to any specific commercial products, process, or service by
-trade name, trademark, manufacturer or otherwise does not necessarily constitute
-or imply its endorsement, recommendation, or favoring by the United States
-Government or the University of California. The views and opinions of authors
-expressed herein do not necessarily state or reflect those of the United States
-Government or the University of California, and shall not be used for
-advertising or product endorsement purposes.
+ ��� Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the disclaimer below.
+ ��� Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the disclaimer (as noted below) in the
+ documentation and/or other materials provided with the distribution.
+ ��� Neither the name of the LLNS/LLNL nor the names of its contributors may be
+ used to endorse or promote products derived from this software without
+ specific prior written permission.
+ 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 LAWRENCE LIVERMORE NATIONAL SECURITY, LLC,
+ THE U.S. DEPARTMENT OF ENERGY 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.
-NOTIFICATION OF COMMERCIAL USE
+Additional BSD Notice
-Commercialization of this product is prohibited without notifying the Department
-of Energy (DOE) or Lawrence Livermore National Laboratory (LLNL).
+ 1. This notice is required to be provided under our contract with the
+ U.S. Department of Energy (DOE). This work was produced at Lawrence
+ Livermore National Laboratory under Contract No. DE-AC52-07NA27344 with
+ the DOE.
+ 2. Neither the United States Government nor Lawrence Livermore National
+ Security, LLC nor any of their employees, makes any warranty, express or
+ implied, or assumes any liability or responsibility for the accuracy,
+ completeness, or usefulness of any information, apparatus, product, or
+ process disclosed, or represents that its use would not infringe
+ privately-owned rights.
+ 3. Also, reference herein to any specific commercial products, process, or
+ services by trade name, trademark, manufacturer or otherwise does not
+ necessarily constitute or imply its endorsement, recommendation, or
+ favoring by the United States Government or Lawrence Livermore National
+ Security, LLC. The views and opinions of authors expressed herein do not
+ necessarily state or reflect those of the United States Government or
+ Lawrence Livermore National Security, LLC, and shall not be used for
+ advertising or product endorsement purposes.