Skip to content

Commit

Permalink
Merge branch 'master' into release/v-4-1
Browse files Browse the repository at this point in the history
  • Loading branch information
@nselliott
nselliott committed Feb 2, 2021
2 parents a9fbd28 + 621f648 commit 5da97bd
Show file tree
Hide file tree
Showing 1,928 changed files with 1,934 additions and 1,934 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This file is part of the SAMRAI distribution. For full copyright
# information, see COPYRIGHT and LICENSE.
#
# Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
# Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
#
#########################################################################

Expand Down
2 changes: 1 addition & 1 deletion .gitlab/quartz.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This file is part of the SAMRAI distribution. For full copyright
# information, see COPYRIGHT and LICENSE.
#
# Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
# Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
#
#########################################################################

Expand Down
2 changes: 1 addition & 1 deletion COPYRIGHT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ COPYRIGHT
The following copyright applies to each file in the SAMRAI distribution, unless
otherwise stated in the file:

Copyright (c) 1997-2020, Lawrence Livermore National Security, LLC.
Copyright (c) 1997-2021, Lawrence Livermore National Security, LLC.
Produced at the Lawrence Livermore National Laboratory. Written by The SAMRAI
Team <[email protected]>. LLNL-CODE-434871. All rights reserved.

Expand Down
2 changes: 1 addition & 1 deletion INSTALL-NOTES
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
****************************************************************************
* Copyright 1997-2020 *
* Copyright 1997-2021 *
* Lawrence Livermore National Security, LLC. *
* All rights reserved. *
****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ We maintain a list of publications

## Release

Copyright (c) 1997-2020, Lawrence Livermore National Security, LLC.
Copyright (c) 1997-2021, Lawrence Livermore National Security, LLC.

Produced at the Lawrence Livermore National Laboratory.

Expand Down
2 changes: 1 addition & 1 deletion RELEASE-NOTES
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-1.4.0
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-1.5.0
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-2.0.0
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-2.0.0-beta
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-2.1.0
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-2.2.0
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-2.2.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-2.3.0
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-2.4.0
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-3.1.0-beta
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-3.10.0
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-3.11.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-3.12.0
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-3.14.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-3.15.0
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-3.2.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-3.4.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-3.5.2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-3.6.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-3.8.0
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-3.8.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-3.9.0
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-4.0.0
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-4.0.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion docs/release/version-4.0.2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*****************************************************************************
Copyright 1997-2020
Copyright 1997-2021
Lawrence Livermore National Security, LLC.
All rights reserved.
*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion source/SAMRAI/algs/HyperbolicLevelIntegrator.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This file is part of the SAMRAI distribution. For full copyright
* information, see COPYRIGHT and LICENSE.
*
* Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
* Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
* Description: Integration routines for single level in AMR hierarchy
* (basic hyperbolic systems)
*
Expand Down
2 changes: 1 addition & 1 deletion source/SAMRAI/algs/HyperbolicLevelIntegrator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This file is part of the SAMRAI distribution. For full copyright
* information, see COPYRIGHT and LICENSE.
*
* Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
* Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
* Description: Integration routines for single level in AMR hierarchy
* (basic hyperbolic systems)
*
Expand Down
2 changes: 1 addition & 1 deletion source/SAMRAI/algs/HyperbolicPatchStrategy.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This file is part of the SAMRAI distribution. For full copyright
* information, see COPYRIGHT and LICENSE.
*
* Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
* Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
* Description: Interface to patch routines for hyperbolic integration scheme.
*
************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion source/SAMRAI/algs/HyperbolicPatchStrategy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This file is part of the SAMRAI distribution. For full copyright
* information, see COPYRIGHT and LICENSE.
*
* Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
* Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
* Description: Interface to patch routines for hyperbolic integration scheme.
*
************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion source/SAMRAI/algs/ImplicitEquationStrategy.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This file is part of the SAMRAI distribution. For full copyright
* information, see COPYRIGHT and LICENSE.
*
* Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
* Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
* Description: Interface between implicit integrator and equations to solve.
*
************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion source/SAMRAI/algs/ImplicitEquationStrategy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This file is part of the SAMRAI distribution. For full copyright
* information, see COPYRIGHT and LICENSE.
*
* Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
* Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
* Description: Interface between implicit integrator and equations to solve.
*
************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion source/SAMRAI/algs/ImplicitIntegrator.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This file is part of the SAMRAI distribution. For full copyright
* information, see COPYRIGHT and LICENSE.
*
* Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
* Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
* Description: Implicit time integration manager class for nonlinear problems.
*
************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion source/SAMRAI/algs/ImplicitIntegrator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This file is part of the SAMRAI distribution. For full copyright
* information, see COPYRIGHT and LICENSE.
*
* Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
* Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
* Description: Implicit time integration manager class.
*
************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion source/SAMRAI/algs/MethodOfLinesIntegrator.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This file is part of the SAMRAI distribution. For full copyright
* information, see COPYRIGHT and LICENSE.
*
* Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
* Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
* Description: Basic method-of-lines time integration algorithm
*
************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion source/SAMRAI/algs/MethodOfLinesIntegrator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This file is part of the SAMRAI distribution. For full copyright
* information, see COPYRIGHT and LICENSE.
*
* Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
* Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
* Description: Basic method-of-lines time integration algorithm
*
************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion source/SAMRAI/algs/MethodOfLinesPatchStrategy.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This file is part of the SAMRAI distribution. For full copyright
* information, see COPYRIGHT and LICENSE.
*
* Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
* Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
* Description: Interface to application-specific patch functions to support
* MethodOfLines integration algorithm
*
Expand Down
2 changes: 1 addition & 1 deletion source/SAMRAI/algs/MethodOfLinesPatchStrategy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This file is part of the SAMRAI distribution. For full copyright
* information, see COPYRIGHT and LICENSE.
*
* Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
* Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
* Description: Interface to application-specific patch functions in support
* Method of Lines integration algorithm
*
Expand Down
2 changes: 1 addition & 1 deletion source/SAMRAI/algs/OuteredgeSumTransaction.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This file is part of the SAMRAI distribution. For full copyright
* information, see COPYRIGHT and LICENSE.
*
* Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
* Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
* Description: Communication transaction for summing outeredge data
*
************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion source/SAMRAI/algs/OuteredgeSumTransaction.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This file is part of the SAMRAI distribution. For full copyright
* information, see COPYRIGHT and LICENSE.
*
* Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
* Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
* Description: Communication transaction for summing outeredge data
*
************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion source/SAMRAI/algs/OuteredgeSumTransactionFactory.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This file is part of the SAMRAI distribution. For full copyright
* information, see COPYRIGHT and LICENSE.
*
* Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
* Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
* Description: Factory for creating outeredge sum transaction objects
*
************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion source/SAMRAI/algs/OuteredgeSumTransactionFactory.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This file is part of the SAMRAI distribution. For full copyright
* information, see COPYRIGHT and LICENSE.
*
* Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
* Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
* Description: Factory for creating outeredge sum transaction objects
*
************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion source/SAMRAI/algs/OuternodeSumTransaction.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This file is part of the SAMRAI distribution. For full copyright
* information, see COPYRIGHT and LICENSE.
*
* Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
* Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
* Description: Communication transaction for summing outernode data
*
************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion source/SAMRAI/algs/OuternodeSumTransaction.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This file is part of the SAMRAI distribution. For full copyright
* information, see COPYRIGHT and LICENSE.
*
* Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
* Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
* Description: Communication transaction for summing outernode data
*
************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion source/SAMRAI/algs/OuternodeSumTransactionFactory.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This file is part of the SAMRAI distribution. For full copyright
* information, see COPYRIGHT and LICENSE.
*
* Copyright: (c) 1997-2020 Lawrence Livermore National Security, LLC
* Copyright: (c) 1997-2021 Lawrence Livermore National Security, LLC
* Description: Factory for creating outernode sum transaction objects
*
************************************************************************/
Expand Down
Loading

0 comments on commit 5da97bd

Please sign in to comment.