Sandia affiliation header added in both files for legal reasons.

diff --git a/examples/step-69/doc/intro.dox b/examples/step-69/doc/intro.dox
index 3f6f97ff59fa3bea50ea385bbed4ab1e45ba5637..87307e1e929b053b082dce84cdbe92744d4b7e45 100644 (file)
--- a/examples/step-69/doc/intro.dox
+++ b/examples/step-69/doc/intro.dox
@@ -1,8 +1,17 @@
 <i>
   This program was contributed by Matthias Maier (Texas A&M University),
-  and Ignacio Tomas (Sandia National Laboratories, Albuquerque).
+  and Ignacio Tomas (Sandia National Laboratories$^{\!\dagger}$).
 </i>
 
+$^\dagger$<em>Sandia National Laboratories is a multimission laboratory
+managed and operated by National Technology & Engineering Solutions of Sandia,
+LLC, a wholly owned subsidiary of Honeywell International Inc., for the U.S.
+Department of Energy's National Nuclear Security Administration under contract
+DE-NA0003525. This document describes objective technical results and analysis.
+Any subjective views or opinions that might be expressed in the paper do not
+necessarily represent the views of the U.S. Department of Energy or the United
+States Government.</em>
+
 @note This tutorial step implements a first-order accurate <i>guaranteed
 maximum wavespeed method</i> based on a first-order <i>graph viscosity</i>
 for solving Euler's equations of gas dynamics @cite GuermondPopov2016. As
@@ -300,7 +309,7 @@ $t_n$:
 &\ \ \ \ \texttt{scatter} (\textbf{U}^n, \mathcal{I}(i), \textbf{U}_i^n)) \\
 &\textbf{end}
 @f}
-<<<<<<< HEAD
+
 We note here that:
 - This "assembly" does not require any form of quadrature or cell-loops.
 - Here $\textbf{c}$ and $\textbf{U}^n$ are a global matrix and a global vector

diff --git a/examples/step-69/step-69.cc b/examples/step-69/step-69.cc
index a79d696e46ed29e984e9f7870ad5ced4481b5a3e..8512f40583250ec3cce0d895c59735ac0640a698 100644 (file)
--- a/examples/step-69/step-69.cc
+++ b/examples/step-69/step-69.cc
@@ -16,6 +16,15 @@
  *
  * Authors: Matthias Maier, Texas A&M University;
  *          Ignacio Tomas, Texas A&M University, Sandia National Laboratories
+ *
+ * Sandia National Laboratories is a multimission laboratory managed and
+ * operated by National Technology & Engineering Solutions of Sandia, LLC, a
+ * wholly owned subsidiary of Honeywell International Inc., for the U.S.
+ * Department of Energy's National Nuclear Security Administration under
+ * contract DE-NA0003525. This document describes objective technical results
+ * and analysis. Any subjective views or opinions that might be expressed in
+ * the paper do not necessarily represent the views of the U.S. Department of
+ * Energy or the United States Government.
  */
 
 // @sect3{Include files}