Merge branch 'rljacob/doc/updateforv301' into next (PR #6658)

Update README, CITATION.cff and LICENSE for v3.0.1 [BFB]
E3SM-Project · Oct 2, 2024 · eb93650 · eb93650
2 parents 491e48b + 55f473d
commit eb93650
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -9,7 +9,7 @@ authors:
   - given-names: E3SM
     family-names: Project
 version: 3.0.0
-doi: 10.11578/E3SM/dc.20240301.3
+doi: 10.11578/E3SM/dc.20240930.1
 repository-code: 'https://github.com/E3SM-Project/E3SM'
 url: 'https://e3sm.org'
 license: BSD-3-Clause
diff --git a/LICENSE b/LICENSE
@@ -2,7 +2,7 @@ Except for the separable pieces descibed below, E3SM is released
 under the following 3-Clause BSD Open Source license.
 
 *******************************************************************************
-Copyright ©2023, UChicago Argonne, LLC All Rights Reserved
+Copyright 2024, UChicago Argonne, LLC All Rights Reserved
 
 Software Name: Energy Exascale Earth System Model (E3SM)
 
@@ -55,15 +55,29 @@ GPTL            share/timing                    author              non-commeric
 MCT             externals/mct                   ANL                 BSD
 YAKL		externals/YAKL			author              BSD
 cub		externals/cub                   author, NVIDIA      BSD
-kokkos          externals/kokkos                SNL                 BSD
+kokkos          externals/ekat                  SNL                 BSD
+haero           externals/haero                 SNL/Battelle        BSD
+mam4xx          externals/mam4xx                SNL/Battelle        BSD
 
 Ocean/Ice       under components/
 -----------     -----------------
 CICE            cice                            LANL                BSD
 MPAS Framework  mpas-framework                  LANL                BSD
-MPAS Ocean      mpas-ocean                      LANL                BSD
-MPAS SeaIce     mpas-seaice                     LANL                BSD
-MPAS-Albany LandIce   mpas-albany-landice       LANL, SNL           BSD
+FFTW            mpas-ocean/src/FFTW             author/MIT          GPL
+MARBL           mpas-ocean/src/MARBL            NCAR                BSD
+SHTNS           mpas-ocean/src/SHTNS            CeCILL              GPL
+cvmix           mpas-ocean/src/cvmix            NCAR                LGPL
+gotm            mpas-ocean/src/gotm             authors             GPL
+ppr             mpas-ocean/src/ppr              author              custom
+Icepack         mpas-seaice/src/icepack         LANL                BSD
+
+Waves           under components/ww3
+-----------     --------------------
+WW3             src/WW3                         NWS/NOAA            custom
+
+Land-ice        under components/mpas-albany-landice
+-----------     ------------------------------------
+SeaLevelModel   src/SeaLevelModel               author              MIT
 
 Land            under components/elm/src
 -----------     ------------------------
@@ -91,7 +105,7 @@ HOMMEXX         components/homme/src/share/cxx  SNL                 BSD
 
 Actual copyright holder for above Institutions:
 NCAR =  University Corporation for Atmospheric Research
-LANL =  Los Alamos National Security, LLC
+LANL =  Los Alamos National Security, LLC, Triad National Security, LLC
 SNL  =  National Technology & Engineering Solutions of Sandia, LLC 
 LBNL =  The Regents of the University of California, 
         through Lawrence Berkeley National Laboratory

diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+<!-- markdownlint-disable -->
+
 [![E3SM Logo](https://e3sm.org/wp-content/themes/e3sm/assets/images/e3sm-logo.png)](https://e3sm.org)
 
 Energy Exascale Earth System Model (E3SM)
@@ -9,14 +11,14 @@ the most challenging and demanding climate-change research problems and
 Department of Energy mission needs while efficiently using DOE Leadership
 Computing Facilities.  
 
-DOI: [10.11578/E3SM/dc.20240301.3](http://dx.doi.org/10.11578/E3SM/dc.20240301.3)
+DOI: [10.11578/E3SM/dc.20240930.1](http://dx.doi.org/10.11578/E3SM/dc.20240930.1)
 
 Please visit the [project website](https://e3sm.org) or our [Confluence site](https://acme-climate.atlassian.net/wiki/spaces/DOC/overview)
 for further details.
 
 For questions about the model, use [Github Discussions](https://github.com/E3SM-Project/E3SM/discussions).
 
-See our Github-hosted documentation at [https://e3sm-project.github.io/E3SM/](https://e3sm-project.github.io/E3SM/).
+See our Github-hosted documentation at [https://docs.e3sm.org/E3SM](https://docs.e3sm.org/E3SM/).
 
 Table of Contents 
 --------------------------------------------------------------------------------