Merge MPAS-Dev::develop into develop-for-jedi (#6)

Merge recent changes to MPAS-Model so that there are no conflicts in the code bases. These updates ensure that as MPAS-Model in JEDI moves toward using CMake that the two code bases are consistent. See corresponding [PR](https://github.com/JCSDA/mpas-jedi/pull/164) in JCSDA/mpas-jedi.
ldfowler58 · Sep 18, 2019 · 0d5035e · 0d5035e
1 parent 28309b7
commit 0d5035e
Show file tree

Hide file tree

Showing 85 changed files with 19,461 additions and 5,940 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2018,  Los Alamos National Security, LLC (LANS) (Ocean: LA-CC-13-047;
+Copyright (c) 2013-2019,  Los Alamos National Security, LLC (LANS) (Ocean: LA-CC-13-047;
 Land Ice: LA-CC-13-117) and the University Corporation for Atmospheric Research (UCAR).
 
 All rights reserved.