Skip to content

Commit

Permalink
Merge branch 'release/0.17.1'
Browse files Browse the repository at this point in the history
* release/0.17.1:
  Version 0.17.1
  Relax assertions in interpolation Method wrt field shapes
  StructuredInterpolation2D to StructuredColumns
  Can declare field type for StructuredColumns (scalar/vector)
  Workaround compiler bug with Cray 8.5 and Cray 8.6 (worked already with Cray 8.7)
  clang-format
  ATLAS-229 Missing include
  ATLAS-229 Missing include
  ATLAS-229 Split up NodeColumns and StructuredColumns translation units to improve parallel compilation bottlenecks
  Bamboo-CI problem workaround: unload netcdf4 for Intel (not needed anyway)
  ATLAS-216 Regional grid takes scanning mode 'y_increasing=<true/false>'
  ATLAS-216 Implement LAEA lonlat2xy projection and show example grid creation
  ATLAS-216 Added LAEA projection to support interpolation
  ATLAS-228 Workaround XL Fortran compiler bug that prevents inline use of atlas_PathName in constructor of atlas_JSON
  Fix Intel19 compilation error
  Fix ambiguous constructor for StructuredMeshGenerator
  • Loading branch information
wdeconinck committed Apr 22, 2019
2 parents a30b99d + 05a394c commit b037ec8
Show file tree
Hide file tree
Showing 29 changed files with 2,843 additions and 2,046 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html

## [Unreleased]

## [0.17.1] - 2019-04-22
### Added
- Option to declaration of field type (vector/scalar) when creating field in FunctionSpace
- New projection: Lambert Azimuthal Equal Area
- StructuredInterpolation2D to target FunctionSpace StructuredColumns

### Fixed
- Compilation with IBM XL 19
- Compilation with Intel 19


## [0.17.0] - 2019-04-02
### Changed
- OpenMP is now private dependency
Expand Down
2 changes: 1 addition & 1 deletion VERSION.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
# granted to it by virtue of its status as an intergovernmental organisation nor
# does it submit to any jurisdiction.

set ( ${PROJECT_NAME}_VERSION_STR "0.17.0" )
set ( ${PROJECT_NAME}_VERSION_STR "0.17.1" )

1 change: 1 addition & 0 deletions bamboo/INTEL-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ module unload emos
module unload fftw
module unload libemos
module unload metview
module unload netcdf4

module load cmake/3.10.2

Expand Down
19 changes: 12 additions & 7 deletions src/atlas/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,20 @@ option/TransOptions.cc
projection.h
projection/Projection.cc
projection/Projection.h
projection/detail/ProjectionImpl.cc
projection/detail/ProjectionImpl.h
projection/detail/LonLatProjection.cc
projection/detail/LonLatProjection.h
projection/detail/LambertAzimuthalEqualAreaProjection.cc
projection/detail/LambertAzimuthalEqualAreaProjection.h
projection/detail/LambertProjection.cc
projection/detail/LambertProjection.h
projection/detail/SchmidtProjection.cc
projection/detail/SchmidtProjection.h
projection/detail/LonLatProjection.cc
projection/detail/LonLatProjection.h
projection/detail/MercatorProjection.cc
projection/detail/MercatorProjection.h
projection/detail/ProjectionFactory.h
projection/detail/ProjectionFactory.cc
projection/detail/ProjectionFactory.h
projection/detail/ProjectionImpl.cc
projection/detail/ProjectionImpl.h
projection/detail/SchmidtProjection.cc
projection/detail/SchmidtProjection.h

domain.h
domain/Domain.cc
Expand Down Expand Up @@ -350,10 +352,13 @@ functionspace/detail/FunctionSpaceInterface.h
functionspace/detail/FunctionSpaceInterface.cc
functionspace/detail/NodeColumnsInterface.h
functionspace/detail/NodeColumnsInterface.cc
functionspace/detail/NodeColumns_FieldStatistics.cc
functionspace/detail/SpectralInterface.h
functionspace/detail/SpectralInterface.cc
functionspace/detail/StructuredColumnsInterface.h
functionspace/detail/StructuredColumnsInterface.cc
functionspace/detail/StructuredColumns_setup.cc
functionspace/detail/StructuredColumns_create_remote_index.cc
)

list( APPEND atlas_numerics_srcs
Expand Down
Loading

0 comments on commit b037ec8

Please sign in to comment.