Skip to content

Commit d818872

Browse files
committed
Merge branch 'release/0.30.0'
* release/0.30.0: (53 commits) Version 0.30.0 ATLAS-358 add support for pentagon elements in accumulating facets ATLAS-368 Fix apply-clang-format.sh ATLAS-369 Fixup running test on Cray ATLAS-369 Support 'variables' option in functionspace::PointCloud::createField ATLAS-368 Fix installation of atlas_io ATLAS-364 Improve performance and memory usage of ATLAS_TRACE ATLAS-368 atlas-io embedded as standalone project, only depending on eckit Protect definition of byte Cleanup use of ecbuild_add_library Enable GridBoxMethod via the StructuredColumns function spaces CellColumns to build on-demand lonlat cell centres if not existing Add convenience constructor Mesh::Mesh(Grid,Partitioner) Gmsh info shows remote_index ATLAS-367 Avoid eckit preprocessor definitions ATLAS-366 Add debug output to TransLocal ATLAS-365 Fix use of ATLAS_LINALG_DENSE_BACKEND Fixup previous commit Tool to generate sandbox project Add Fortran API to PointCloud constructor, accepting ghost field ...
2 parents b255889 + c43a0fc commit d818872

File tree

208 files changed

+9152
-1512
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+9152
-1512
lines changed

CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,26 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
77

88
## [Unreleased]
99

10+
## [0.30.0] - 2022-08-22
11+
### Added
12+
- Fortran API for Interpolation::execute_adjoint()
13+
- Fortran API for FieldSet::name()
14+
- Fortran API for MeshGenerator::generate(grid,partitioner)
15+
- Pentagon element type
16+
- SphericalHarmonic function
17+
- New interpolation method: ConservativeSphericalPolygonInterpolation
18+
- Support 'variables' option in functionspace::PointCloud::createField
19+
20+
### Changed
21+
- Atlas-IO is now standalone project, still embedded but only depending on eckit
22+
- Deprecate Trans naming of 'ifs' or 'trans' in favour of 'ectrans'
23+
- Default StructuredMeshGenerator partitioner is equal_regions instead of trans/ectrans
24+
25+
### Fixed
26+
- Fix global numbering HEALPix grid to standard
27+
- Fix NodeColumns remote_index for parallel orca grids
28+
- Fix use of ATLAS_LINALG_DENSE_BACKEND environment variable
29+
1030
## [0.29.0] - 2022-04-21
1131
### Added
1232
- MatchingMeshPartitioner "cubedsphere"
@@ -366,6 +386,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
366386
## 0.13.0 - 2018-02-16
367387

368388
[Unreleased]: https://github.com/ecmwf/atlas/compare/master...develop
389+
[0.30.0]: https://github.com/ecmwf/atlas/compare/0.29.0...0.30.0
369390
[0.29.0]: https://github.com/ecmwf/atlas/compare/0.28.1...0.29.0
370391
[0.28.1]: https://github.com/ecmwf/atlas/compare/0.28.0...0.28.1
371392
[0.28.0]: https://github.com/ecmwf/atlas/compare/0.27.0...0.28.0

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ endif()
3232

3333
ecbuild_debug( " eckit_FEATURES : [${eckit_FEATURES}]" )
3434

35+
add_subdirectory(atlas_io)
36+
find_package(atlas_io)
37+
3538
################################################################################
3639
# Features that can be enabled / disabled with -DENABLE_<FEATURE>
3740

@@ -52,6 +55,7 @@ include( features/INCLUDE_WHAT_YOU_USE )
5255
include( features/INIT_SNAN )
5356
include( features/DOCS )
5457
include( features/ATLAS_RUN )
58+
include( features/CXX17 )
5559

5660
################################################################################
5761
# sources

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.29.0
1+
0.30.0

atlas_io/AUTHORS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Authors
2+
=======
3+
4+
- Willem Deconinck
5+
6+
Thanks for contributions from
7+
=============================
8+

atlas_io/CHANGELOG.md

Whitespace-only changes.

atlas_io/CMakeLists.txt

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# (C) Copyright 2021 ECMWF.
2+
#
3+
# This software is licensed under the terms of the Apache Licence Version 2.0
4+
# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
5+
# In applying this licence, ECMWF does not waive the privileges and immunities
6+
# granted to it by virtue of its status as an intergovernmental organisation nor
7+
# does it submit to any jurisdiction.
8+
9+
############################################################################################
10+
# Atlas-IO
11+
12+
cmake_minimum_required( VERSION 3.12 FATAL_ERROR )
13+
14+
find_package( ecbuild 3.4 REQUIRED HINTS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ecbuild )
15+
16+
################################################################################
17+
# Initialise project Atlas
18+
19+
project( atlas_io VERSION ${atlas_VERSION} LANGUAGES CXX )
20+
21+
################################################################################
22+
# Required packages
23+
24+
ecbuild_find_package( NAME eckit REQUIRED )
25+
26+
ecbuild_debug( " eckit_FEATURES : [${eckit_FEATURES}]" )
27+
28+
################################################################################
29+
# Features that can be enabled / disabled with -DENABLE_<FEATURE>
30+
31+
ecbuild_add_option( FEATURE CXX17
32+
DESCRIPTION "Use C++17 standard"
33+
DEFAULT OFF )
34+
35+
################################################################################
36+
# sources
37+
38+
set(CMAKE_CXX_STANDARD 11)
39+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
40+
41+
check_cxx_source_compiles( "#include <cxxabi.h>\n int main() { char * type; int status; char * r = abi::__cxa_demangle(type, 0, 0, &status); }"
42+
ATLAS_IO_HAVE_CXXABI_H )
43+
44+
test_big_endian( _BIG_ENDIAN )
45+
46+
if( _BIG_ENDIAN )
47+
set( ATLAS_IO_BIG_ENDIAN 1 )
48+
set( ATLAS_IO_LITTLE_ENDIAN 0 )
49+
else()
50+
set( ATLAS_IO_BIG_ENDIAN 0 )
51+
set( ATLAS_IO_LITTLE_ENDIAN 1 )
52+
endif()
53+
54+
55+
add_subdirectory( src )
56+
add_subdirectory( tests )
57+
58+
################################################################################
59+
# Export and summarize
60+
61+
ecbuild_add_resources(
62+
TARGET atlas_io-others
63+
SOURCES_PACK
64+
README.md
65+
CHANGELOG.md
66+
LICENSE
67+
)
68+
69+
ecbuild_install_project( NAME Atlas-IO )
70+
ecbuild_print_summary()
71+

atlas_io/LICENSE

Lines changed: 190 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
Copyright 1996-2018 ECMWF
179+
180+
Licensed under the Apache License, Version 2.0 (the "License");
181+
you may not use this file except in compliance with the License.
182+
You may obtain a copy of the License at
183+
184+
http://www.apache.org/licenses/LICENSE-2.0
185+
186+
Unless required by applicable law or agreed to in writing, software
187+
distributed under the License is distributed on an "AS IS" BASIS,
188+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
189+
See the License for the specific language governing permissions and
190+
limitations under the License.

atlas_io/README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
atlas-io
2+
========
3+
4+
An IO API for serializing arbitrary data, supporting compression.
5+
The API contains a message format (like GRIB).
6+
Multiple messages can be written to file or sent over network.
7+
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
include( CMakeFindDependencyMacro )
3+
4+
## eckit
5+
find_dependency( eckit HINTS ${CMAKE_CURRENT_LIST_DIR}/../eckit @eckit_DIR@ @eckit_BINARY_DIR@ )

atlas_io/src/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
add_subdirectory(atlas_io)
2+
add_subdirectory(tools)

0 commit comments

Comments
 (0)