A set of tools used in climate modeling and numerical weather prediction. (#1317)
* Update grib-api: switched to cmake building system.
* Update harfbuzz: added pkg-config dependency.
* Update pango: added pkg-config dependency.
* Add libemos package.
* Add Magics (from ECMWF) package.
* Revert "Variant for building cdo without mpi (#1638)":
CDO does not use MPI.
This reverts commit 079d063c6d.
* Update CDO package: full featured implementation.
* Update magics: added python as build dependency.
* Update cdo: added disabling configuration options.
This commit is contained in:
Sergey Kosukhin
committed by
Todd Gamblin
Todd Gamblin
parent
36c79e9df6
commit
1d981ebd50
@@ -0,0 +1,5 @@
|
||||
--- a/tools/xml2mv.py 2016-06-27 17:49:27.000000000 +0200
|
||||
+++ a/tools/xml2mv.py 2016-09-13 16:25:17.246960456 +0200
|
||||
@@ -1 +1 @@
|
||||
-#!/usr/bin/python
|
||||
+#!/usr/bin/env python
|
||||
115
var/spack/repos/builtin/packages/magics/package.py
Normal file
115
var/spack/repos/builtin/packages/magics/package.py
Normal file
@@ -0,0 +1,115 @@
|
||||
##############################################################################
|
||||
# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
|
||||
# Produced at the Lawrence Livermore National Laboratory.
|
||||
#
|
||||
# This file is part of Spack.
|
||||
# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
|
||||
# LLNL-CODE-647188
|
||||
#
|
||||
# For details, see https://github.com/llnl/spack
|
||||
# Please also see the LICENSE file for our notice and the LGPL.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Lesser General Public License (as
|
||||
# published by the Free Software Foundation) version 2.1, February 1999.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful, but
|
||||
# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
|
||||
# conditions of the GNU Lesser General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public
|
||||
# License along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
##############################################################################
|
||||
from spack import *
|
||||
|
||||
|
||||
class Magics(Package):
|
||||
"""Magics is the latest generation of the ECMWF's Meteorological plotting
|
||||
software MAGICS. Although completely redesigned in C++, it is intended
|
||||
to be as backwards-compatible as possible with the Fortran interface."""
|
||||
|
||||
homepage = "https://software.ecmwf.int/wiki/display/MAGP/Magics"
|
||||
url = "https://software.ecmwf.int/wiki/download/attachments/3473464/Magics-2.29.0-Source.tar.gz"
|
||||
|
||||
# Maintainers of Magics do not keep tarballs of minor releases. Once the
|
||||
# next minor released is published the previous one becomes unavailable.
|
||||
# That is why the preferred version is the latest stable one.
|
||||
version('2.29.4', '91c561f413316fb665b3bb563f3878d1')
|
||||
version('2.29.0', 'db20a4d3c51a2da5657c31ae3de59709', preferred=True)
|
||||
|
||||
# The patch changes the hardcoded path to python in shebang to enable the
|
||||
# usage of the first python installation that appears in $PATH
|
||||
patch('no_hardcoded_python.patch')
|
||||
|
||||
# The patch reorders includes and adds namespaces where necessary to
|
||||
# resolve ambiguity of invocations of isnan and isinf functions. The
|
||||
# patch is not needed since the version 2.29.1
|
||||
patch('resolve_isnan_ambiguity.patch', when='@2.29.0')
|
||||
|
||||
variant('bufr', default=False, description='Enable BUFR support')
|
||||
variant('netcdf', default=False, description='Enable NetCDF support')
|
||||
variant('cairo', default=True, description='Enable cairo support[png/jpeg]')
|
||||
variant('metview', default=False, description='Enable metview support')
|
||||
variant('qt', default=False, description='Enable metview support with qt')
|
||||
|
||||
depends_on('cmake', type='build')
|
||||
depends_on('pkg-config', type='build')
|
||||
|
||||
# Currently python is only necessary to run
|
||||
# building preprocessing scripts.
|
||||
depends_on('python', type='build')
|
||||
depends_on('grib-api')
|
||||
depends_on('proj')
|
||||
depends_on('boost')
|
||||
depends_on('expat')
|
||||
depends_on('pango', when='+cairo')
|
||||
depends_on('netcdf-cxx', when='+netcdf')
|
||||
depends_on('libemos', when='+bufr')
|
||||
depends_on('qt', when='+metview+qt')
|
||||
|
||||
def install(self, spec, prefix):
|
||||
options = []
|
||||
options.extend(std_cmake_args)
|
||||
options.append('-DENABLE_ODB=OFF')
|
||||
options.append('-DENABLE_PYTHON=OFF')
|
||||
options.append('-DBOOST_ROOT=%s' % spec['boost'].prefix)
|
||||
options.append('-DPROJ4_PATH=%s' % spec['proj'].prefix)
|
||||
options.append('-DGRIB_API_PATH=%s' % spec['grib-api'].prefix)
|
||||
options.append('-DENABLE_TESTS=OFF')
|
||||
|
||||
if '+bufr' in spec:
|
||||
options.append('-DENABLE_BUFR=ON')
|
||||
options.append('-DLIBEMOS_PATH=%s' % spec['libemos'].prefix)
|
||||
else:
|
||||
options.append('-DENABLE_BUFR=OFF')
|
||||
|
||||
if '+netcdf' in spec:
|
||||
options.append('-DENABLE_NETCDF=ON')
|
||||
options.append('-DNETCDF_PATH=%s' % spec['netcdf-cxx'].prefix)
|
||||
else:
|
||||
options.append('-DENABLE_NETCDF=OFF')
|
||||
|
||||
if '+cairo' in spec:
|
||||
options.append('-DENABLE_CAIRO=ON')
|
||||
else:
|
||||
options.append('-DENABLE_CAIRO=OFF')
|
||||
|
||||
if '+metview' in spec:
|
||||
if '+qt' in spec:
|
||||
options.append('-DENABLE_METVIEW=ON')
|
||||
if spec['qt'].version.up_to(1) == '5':
|
||||
options.append('-DENABLE_QT5=ON')
|
||||
else:
|
||||
options.append('-DENABLE_METVIEW_NO_QT=ON')
|
||||
else:
|
||||
options.append('-DENABLE_METVIEW=OFF')
|
||||
|
||||
if (self.compiler.f77 is None) or (self.compiler.fc is None):
|
||||
options.append('-DENABLE_FORTRAN=OFF')
|
||||
|
||||
with working_dir('spack-build', create=True):
|
||||
cmake('..', *options)
|
||||
make()
|
||||
make('install')
|
||||
@@ -0,0 +1,73 @@
|
||||
--- a/src/common/Polyline.cc 2016-04-28 14:38:09.000000000 +0200
|
||||
+++ b/src/common/Polyline.cc 2016-09-14 13:31:35.784617803 +0200
|
||||
@@ -31,2 +30,0 @@
|
||||
-#include "TeCoord2D.h"
|
||||
-#include "TeGeometryAlgorithms.h"
|
||||
--- a/src/decoders/GribRegularInterpretor.cc 2016-04-28 14:38:09.000000000 +0200
|
||||
+++ b/src/decoders/GribRegularInterpretor.cc 2016-09-14 13:43:41.673614590 +0200
|
||||
@@ -2083,2 +2083,2 @@
|
||||
- if (isnan(val1)) {
|
||||
- if (isnan(val2)) {
|
||||
+ if (std::isnan(val1)) {
|
||||
+ if (std::isnan(val2)) {
|
||||
@@ -2090 +2090 @@
|
||||
- if (isnan(val2)) {
|
||||
+ if (std::isnan(val2)) {
|
||||
@@ -2101 +2101 @@
|
||||
- if (isnan(val) || isinf(val) || isinf(-val)) {
|
||||
+ if (std::isnan(val) || std::isinf(val) || std::isinf(-val)) {
|
||||
@@ -2105 +2105 @@
|
||||
- if (isnan(val))
|
||||
+ if (std::isnan(val))
|
||||
--- a/src/decoders/GribSatelliteInterpretor.cc 2016-04-28 14:38:09.000000000 +0200
|
||||
+++ b/src/decoders/GribSatelliteInterpretor.cc 2016-09-14 13:48:55.243699910 +0200
|
||||
@@ -33,5 +32,0 @@
|
||||
-#include "TeProjection.h"
|
||||
-#include "TeDataTypes.h"
|
||||
-#include "TeRasterParams.h"
|
||||
-#include "TeDecoderMemory.h"
|
||||
-#include "TeRasterRemap.h"
|
||||
--- a/src/decoders/NetcdfGeoMatrixInterpretor.cc 2016-04-28 14:38:09.000000000 +0200
|
||||
+++ b/src/decoders/NetcdfGeoMatrixInterpretor.cc 2016-09-14 13:52:37.481201085 +0200
|
||||
@@ -93 +93 @@
|
||||
- if ( !isnan(*d) ) {
|
||||
+ if ( !std::isnan(*d) ) {
|
||||
--- a/src/decoders/NetcdfOrcaInterpretor.cc 2016-04-28 14:38:09.000000000 +0200
|
||||
+++ b/src/decoders/NetcdfOrcaInterpretor.cc 2016-09-14 13:51:16.248650570 +0200
|
||||
@@ -210,2 +210,2 @@
|
||||
- if ( isnan(val1) ) {
|
||||
- if ( isnan(val2) ) {
|
||||
+ if ( std::isnan(val1) ) {
|
||||
+ if ( std::isnan(val2) ) {
|
||||
@@ -218 +218 @@
|
||||
- if ( isnan(val2) ) {
|
||||
+ if ( std::isnan(val2) ) {
|
||||
@@ -226 +226 @@
|
||||
- if (isnan(val) || isinf(val) || isinf(-val) ) {
|
||||
+ if (std::isnan(val) || std::isinf(val) || std::isinf(-val) ) {
|
||||
@@ -230 +230 @@
|
||||
- if (isnan(val) ) val = missing;
|
||||
+ if (std::isnan(val) ) val = missing;
|
||||
@@ -296 +296 @@
|
||||
- if (isnan(value) )
|
||||
+ if (std::isnan(value) )
|
||||
--- a/src/terralib/kernel/TeCentroid.cpp 2016-04-28 14:38:09.000000000 +0200
|
||||
+++ b/src/terralib/kernel/TeCentroid.cpp 2016-09-14 14:17:31.675996554 +0200
|
||||
@@ -23,0 +24,2 @@
|
||||
+#include "TeGeometryAlgorithms.h"
|
||||
+
|
||||
@@ -30 +31,0 @@
|
||||
-#include "TeGeometryAlgorithms.h"
|
||||
--- a/src/terralib/kernel/TeDatabase.h 2014-11-07 17:39:24.000000000 +0100
|
||||
+++ b/src/terralib/kernel/TeDatabase.h 2016-09-14 14:20:01.041100590 +0200
|
||||
@@ -33,0 +34 @@
|
||||
+#include "TeGeometry.h"
|
||||
@@ -38 +38,0 @@
|
||||
-#include "TeGeometry.h"
|
||||
--- a/src/terralib/kernel/TeOverlayUtils.h 2014-11-07 17:39:24.000000000 +0100
|
||||
+++ b/src/terralib/kernel/TeOverlayUtils.h 2016-09-14 14:21:51.649920405 +0200
|
||||
@@ -37,0 +38,2 @@
|
||||
+#include "TeGeometry.h"
|
||||
+
|
||||
@@ -44 +45,0 @@
|
||||
-#include "TeGeometry.h"
|
||||
Reference in New Issue
Block a user