From bbacf3a8f16f33091880bc1850b0e4a9cbecca35 Mon Sep 17 00:00:00 2001 From: Robert Jacob Date: Tue, 1 Oct 2024 17:19:33 -0500 Subject: [PATCH 1/4] Update README and other files for v3.0.1 Update README and other files for v3.0.1 --- CITATION.cff | 2 +- LICENSE | 16 +++++++++++----- README.md | 4 ++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 9542a7d01ef4..78099055fc35 100644 --- 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 index d74a2aa127a0..e5e69b7c906f 100644 --- 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 ©2043, UChicago Argonne, LLC All Rights Reserved Software Name: Energy Exascale Earth System Model (E3SM) @@ -55,15 +55,21 @@ 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 + +Land-ice under components/mpas-albany-landice +----------- ------------------------------------ +SeaLevelModel src/SeaLevelModel author MIT Land under components/elm/src ----------- ------------------------ diff --git a/README.md b/README.md index 192c288d78e1..1601f9cb9035 100644 --- a/README.md +++ b/README.md @@ -9,14 +9,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 -------------------------------------------------------------------------------- From d5d8f6a8f1e00e5848b12e28aff10457dbf48548 Mon Sep 17 00:00:00 2001 From: Robert Jacob Date: Tue, 1 Oct 2024 17:55:02 -0500 Subject: [PATCH 2/4] Disable linting on README.md Disable linting on README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 1601f9cb9035..13c927b8c7f1 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ + + [![E3SM Logo](https://e3sm.org/wp-content/themes/e3sm/assets/images/e3sm-logo.png)](https://e3sm.org) Energy Exascale Earth System Model (E3SM) From 00377667bab08e27ff7fccec82d94984dfab04e9 Mon Sep 17 00:00:00 2001 From: Robert Jacob Date: Tue, 1 Oct 2024 18:23:43 -0500 Subject: [PATCH 3/4] Mention more packages in LICENSE Mention more packages in LICENSE --- LICENSE | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index e5e69b7c906f..ba380e465313 100644 --- a/LICENSE +++ b/LICENSE @@ -66,6 +66,14 @@ MPAS Framework mpas-framework LANL 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 ----------- ------------------------------------ @@ -97,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 From 55f473dcdec35a66b9b7dfa80ca70bea00a22b47 Mon Sep 17 00:00:00 2001 From: Robert Jacob Date: Wed, 2 Oct 2024 16:03:28 -0500 Subject: [PATCH 4/4] Fix typo in LICENSE Fix typo --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index ba380e465313..247287ab4c00 100644 --- 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 ©2043, UChicago Argonne, LLC All Rights Reserved +Copyright 2024, UChicago Argonne, LLC All Rights Reserved Software Name: Energy Exascale Earth System Model (E3SM)