Skip to content

Commit d4ca7d0

Browse files
authored
Merge branch 'rljacob/doc/updateforv301' (PR #6658)
Update README, CITATION.cff and LICENSE for v3.0.1 [BFB]
2 parents f1e03b7 + 55f473d commit d4ca7d0

File tree

3 files changed

+25
-9
lines changed

3 files changed

+25
-9
lines changed

CITATION.cff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ authors:
99
- given-names: E3SM
1010
family-names: Project
1111
version: 3.0.0
12-
doi: 10.11578/E3SM/dc.20240301.3
12+
doi: 10.11578/E3SM/dc.20240930.1
1313
repository-code: 'https://github.com/E3SM-Project/E3SM'
1414
url: 'https://e3sm.org'
1515
license: BSD-3-Clause

LICENSE

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Except for the separable pieces descibed below, E3SM is released
22
under the following 3-Clause BSD Open Source license.
33

44
*******************************************************************************
5-
Copyright ©2023, UChicago Argonne, LLC All Rights Reserved
5+
Copyright 2024, UChicago Argonne, LLC All Rights Reserved
66

77
Software Name: Energy Exascale Earth System Model (E3SM)
88

@@ -55,15 +55,29 @@ GPTL share/timing author non-commeric
5555
MCT externals/mct ANL BSD
5656
YAKL externals/YAKL author BSD
5757
cub externals/cub author, NVIDIA BSD
58-
kokkos externals/kokkos SNL BSD
58+
kokkos externals/ekat SNL BSD
59+
haero externals/haero SNL/Battelle BSD
60+
mam4xx externals/mam4xx SNL/Battelle BSD
5961

6062
Ocean/Ice under components/
6163
----------- -----------------
6264
CICE cice LANL BSD
6365
MPAS Framework mpas-framework LANL BSD
64-
MPAS Ocean mpas-ocean LANL BSD
65-
MPAS SeaIce mpas-seaice LANL BSD
66-
MPAS-Albany LandIce mpas-albany-landice LANL, SNL BSD
66+
FFTW mpas-ocean/src/FFTW author/MIT GPL
67+
MARBL mpas-ocean/src/MARBL NCAR BSD
68+
SHTNS mpas-ocean/src/SHTNS CeCILL GPL
69+
cvmix mpas-ocean/src/cvmix NCAR LGPL
70+
gotm mpas-ocean/src/gotm authors GPL
71+
ppr mpas-ocean/src/ppr author custom
72+
Icepack mpas-seaice/src/icepack LANL BSD
73+
74+
Waves under components/ww3
75+
----------- --------------------
76+
WW3 src/WW3 NWS/NOAA custom
77+
78+
Land-ice under components/mpas-albany-landice
79+
----------- ------------------------------------
80+
SeaLevelModel src/SeaLevelModel author MIT
6781

6882
Land under components/elm/src
6983
----------- ------------------------
@@ -91,7 +105,7 @@ HOMMEXX components/homme/src/share/cxx SNL BSD
91105

92106
Actual copyright holder for above Institutions:
93107
NCAR = University Corporation for Atmospheric Research
94-
LANL = Los Alamos National Security, LLC
108+
LANL = Los Alamos National Security, LLC, Triad National Security, LLC
95109
SNL = National Technology & Engineering Solutions of Sandia, LLC
96110
LBNL = The Regents of the University of California,
97111
through Lawrence Berkeley National Laboratory

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
<!-- markdownlint-disable -->
2+
13
[![E3SM Logo](https://e3sm.org/wp-content/themes/e3sm/assets/images/e3sm-logo.png)](https://e3sm.org)
24

35
Energy Exascale Earth System Model (E3SM)
@@ -9,14 +11,14 @@ the most challenging and demanding climate-change research problems and
911
Department of Energy mission needs while efficiently using DOE Leadership
1012
Computing Facilities.
1113

12-
DOI: [10.11578/E3SM/dc.20240301.3](http://dx.doi.org/10.11578/E3SM/dc.20240301.3)
14+
DOI: [10.11578/E3SM/dc.20240930.1](http://dx.doi.org/10.11578/E3SM/dc.20240930.1)
1315

1416
Please visit the [project website](https://e3sm.org) or our [Confluence site](https://acme-climate.atlassian.net/wiki/spaces/DOC/overview)
1517
for further details.
1618

1719
For questions about the model, use [Github Discussions](https://github.com/E3SM-Project/E3SM/discussions).
1820

19-
See our Github-hosted documentation at [https://e3sm-project.github.io/E3SM/](https://e3sm-project.github.io/E3SM/).
21+
See our Github-hosted documentation at [https://docs.e3sm.org/E3SM](https://docs.e3sm.org/E3SM/).
2022

2123
Table of Contents
2224
--------------------------------------------------------------------------------

0 commit comments

Comments
 (0)