Merge updates from LANL.

.clang-format

@@ -5,7 +5,7 @@ AccessModifierOffset: -2
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
-AlignEscapedNewlinesLeft: false
+AlignEscapedNewlines: Right
 AlignOperands:   true
 AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true
@@ -29,33 +29,51 @@ BraceWrapping:
   AfterObjCDeclaration: false
   AfterStruct:     false
   AfterUnion:      false
+  AfterExternBlock: true
   BeforeCatch:     false
   BeforeElse:      false
   IndentBraces:    false
+#  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: false
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
 ColumnLimit:     80
 CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
 DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
-ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks:   Preserve
 IncludeCategories:
-  - Regex:           '^"(c4|cdi|cdi_analytic|cdi_eospac|cdi_ipcress|device|diagnostics|ds\+\+|fit|linear|memory|mesh_element|meshReaders|min|norms|ode|parser|plot2D|quadrature|rng|roots|RTT_Format_Reader|shared_lib|special_functions|timestep|units|viz)/'
+  - Regex:           '^"(c4|cdi|cdi_analytic|cdi_eospac|cdi_ipcress|compton|device|diagnostics|ds\+\+|fit|linear|memory|mesh|mesh_element|meshReaders|min|norms|ode|parser|plot2D|quadrature|rng|roots|RTT_Format_Reader|shared_lib|special_functions|timestep|units|viz)/'
     Priority:        2
-  - Regex:           '^(<|"(gtest|isl|json)/)'
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
     Priority:        3
   - Regex:           '.*'
     Priority:        1
+IncludeIsMainRegex: '(Test)?$'
 IndentCaseLabels: false
+IndentPPDirectives: None
 IndentWidth:     2
 IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: true
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
@@ -64,6 +82,7 @@ NamespaceIndentation: None
 ObjCBlockIndentWidth: 2
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
 PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
@@ -73,7 +92,9 @@ PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Right
 ReflowComments:  false
 SortIncludes:    true
+SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: ControlStatements
 SpaceInEmptyParentheses: false

.codecov.yml

@@ -1,9 +1,13 @@
+# Results posted at https://codecov.io/gh/lanl/Draco
+# Validate with 'curl --data-binary @.codecov.yml https://codecov.io/validate'
+
 codecov:
+  token: d51a6207-27aa-4b7f-8399-7dd5ce4991d2
   notify:
     require_ci_to_pass: yes
 
 coverage:
-  precision: 2
+  precision: 1
   round: down
   range: "70...100"
 
@@ -21,7 +25,7 @@ coverage:
          macro: no
 
   ignore:
-    - "src/*/test"
+    - "src/.*/test/.*"
     - "src/FortranChecks/f90sub/Draco_Test.F90"
 
 comment:

.github/PULL_REQUEST_TEMPLATE

@@ -1,12 +1,26 @@
-* Purpose of Pull Request
-  * detail 1, refs #2 (redmine number)
-  * detail 2
-  * Fixes #3 (redmine number)
+### Background
 
-* [Pre-Merge Code Review](https://github.com/losalamos/Draco/wiki/Style-Guide)
+* item
+
+### Purpose of Pull Request
+
+* detail 1, refs #2 (github number)
+* detail 2
+* [Fixes Redmine Issue #3](https://rtt.lanl.gov/redmine/issues/3)
+
+### Description of changes
+
+* item
+
+### Status
+
+* Reference:
+  * [Pre-Merge Code Review](https://github.com/lanl/Draco/wiki/Style-Guide)
+  * [CDash Status](https://rtt.lanl.gov/cdash/index.php?project=Draco&filtercount=1&showfilters=1&field1=buildname&compare1=63&value1=-pr)
+* Checks
   * [ ] Travis CI checks pass
   * [ ] Code coverage does not decrease
   * [ ] [Valgrind test passes](https://rtt.lanl.gov/CDash/index.php?project=Draco)
-  * [ ] [Toss2 checks pass](https://rtt.lanl.gov/CDash/index.php?project=Draco)
+  * [ ] [Toss3 checks pass](https://rtt.lanl.gov/CDash/index.php?project=Draco)
   * [ ] [Trinitite checks pass](https://rtt.lanl.gov/CDash/index.php?project=Draco)
   * [ ] Code reviewed/approved, sufficient DbC checks, testing, documentation

.gitignore

@@ -1,7 +1,11 @@
-*.pyc
 *.elc
+*.pyc
 *~
-TAGS
+.settings/
+build*/
+.*.sw[a-p]
+.nfs*
 GPATH
-GTAGS
 GRTAGS
+GTAGS
+TAGS