[magics] 46/63: New upstream release 2.30.0
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Mar 24 10:41:53 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository magics.
commit ca2ccbb6eacc893fae49f4e944f73b55615ab979
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Nov 28 15:18:31 2016 +0000
New upstream release 2.30.0
---
CMakeLists.txt | 6 +-
VERSION.cmake | 4 +-
apps/metgram/metgram | 2 +-
bin/ecbuild | 4 +-
cmake/CheckFortranCompilerFlag.cmake | 37 -
cmake/CheckFortranSourceCompiles.cmake | 94 --
cmake/{contrib => }/FindFFTW.cmake | 6 -
cmake/FindGeoTIFF.cmake | 64 +-
cmake/FindOpenJPEG.cmake | 60 +-
cmake/VERSION.cmake | 4 +-
.../CMakeCheckCompilerFlagCommonPatterns.cmake | 33 +
cmake/contrib/CheckFortranCompilerFlag.cmake | 72 +-
cmake/contrib/CheckFortranSourceCompiles.cmake | 133 +-
cmake/contrib/FindNetCDF4.cmake | 4 +-
cmake/ecbuild_add_option.cmake | 21 +-
cmake/ecbuild_add_test.cmake | 61 +-
cmake/ecbuild_check_cxx11.cmake | 147 +-
cmake/ecbuild_define_paths.cmake | 23 +-
cmake/ecbuild_find_omp.cmake | 4 +-
cmake/ecbuild_get_test_data.cmake | 14 +-
cmake/ecbuild_log.cmake | 2 +-
notebook/WCS.ipynb | 156 +++
notebook/epsgrams.ipynb | 304 ++++
python/CMakeLists.txt | 3 +-
python/Magics/macro.py | 844 +++++------
python/Magics/toolbox.py | 248 ++++
python/Magics_interface.cc | 5 +-
share/ecbuild/toolchains/ecmwf-XC30-Cray.cmake | 14 +-
share/ecbuild/toolchains/ecmwf-XC30-GNU.cmake | 14 +-
share/ecbuild/toolchains/ecmwf-XC30-Intel.cmake | 14 +-
share/magics/C3S_combined.svg | 581 ++++++++
share/magics/table_128.xml | 1477 +++-----------------
share/magics/table_129.xml | 1408 ++-----------------
share/magics/table_130.xml | 185 +--
share/magics/table_131.xml | 73 +-
share/magics/table_132.xml | 38 +-
share/magics/table_140.xml | 262 +---
share/magics/table_150.xml | 227 +--
share/magics/table_151.xml | 321 +----
share/magics/table_160.xml | 867 ++----------
share/magics/table_162.xml | 10 +-
share/magics/table_170.xml | 161 +--
share/magics/table_171.xml | 1298 +----------------
share/magics/table_172.xml | 262 +---
share/magics/table_173.xml | 10 +-
share/magics/table_174.xml | 185 +--
share/magics/table_175.xml | 185 +--
share/magics/table_180.xml | 227 +--
share/magics/table_190.xml | 248 +---
share/magics/table_2.xml | 17 +-
share/magics/table_200.xml | 1455 ++-----------------
share/magics/table_210.xml | 486 +------
share/magics/table_254.xml | 657 +--------
share/magics/table_260.xml | 17 +-
src/basic/FortranMagics.cc | 11 +
src/basic/FortranMagics.h | 1 +
src/basic/LegendVisitor.cc | 24 +-
src/common/Colour.h | 2 +-
src/common/Data.h | 2 +-
src/common/LogoPlotting.cc | 17 +-
src/common/LogoPlotting.h | 2 +-
src/common/MagicsCalls.cc | 5 +
src/common/Symbol.cc | 8 +
src/common/magics_api.h | 2 +
src/decoders/EpsXmlInput.cc | 8 +-
src/decoders/GribDecoder.cc | 7 +-
src/decoders/GribRegularInterpretor.cc | 9 +-
src/decoders/LocalTable.h | 6 +-
src/drivers/CairoDriver.cc | 128 +-
src/libMagWrapper/MagPlus.cc | 13 +-
src/params/Axis.xml | 23 +-
src/params/BinaryObject.xml | 4 +
src/params/LogoPlotting.xml | 7 +-
src/params/SymbolPlotting.xml | 3 +-
src/visualisers/Axis.cc | 35 +-
src/visualisers/EpsGraph.cc | 181 ++-
src/visualisers/EpsGraph.h | 36 +
src/visualisers/GridPlotting.cc | 10 +-
src/web/WrepJSon.cc | 101 +-
src/web/WrepJSon.h | 5 +-
test/CMakeLists.txt | 13 +-
tools/axis2doc.py | 2 +-
tools/newbase.pl | 2 +-
tools/newclass.pl | 2 +-
tools/newdriver.pl | 2 +-
tools/newfactory.pl | 2 +-
tools/newprojection.pl | 2 +-
tools/newtemplate.pl | 2 +-
tools/xml2cc.pl | 2 +-
tools/xml2cc.pl.workshop | 2 +-
tools/xml2cc_list.pl | 2 +-
tools/xml2doc.pl | 2 +-
tools/xml2dtd.pl | 2 +-
tools/xml2html.py | 2 +-
tools/xml2icon.pl | 2 +-
tools/xml2mv.pl | 2 +-
tools/xml2mv.py | 2 +-
tools/xml2odt.py | 2 +-
98 files changed, 3436 insertions(+), 10315 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c8adc1..d58af07 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ ecbuild_requires_macro_version( 1.9 )
###############################################################################
# some variables of this project
-ecbuild_add_option( FEATURE ECCODES DESCRIPTION "" DEFAULT OFF )
+ecbuild_add_option( FEATURE ECCODES DESCRIPTION "" DEFAULT ON )
if( HAVE_ECCODES )
ecbuild_use_package( PROJECT eccodes VERSION 0.14 REQUIRED )
@@ -48,8 +48,10 @@ if( HAVE_ECCODES )
set( GRIB_API_LIBRARIES ${ECCODES_LIBRARIES} )
set( GRIB_API_DEFINITIONS ${ECCODES_DEFINITIONS} )
set( grib_api_BASE_DIR ${eccodes_BASE_DIR} )
+ set( grib_handling_pkg eccodes )
else()
ecbuild_use_package(PROJECT grib_api VERSION 1.14.6 REQUIRED)
+ set( grib_handling_pkg grib_api )
endif()
@@ -132,7 +134,7 @@ set( MAGICS_EXCEPTION "ON" )
set( MAGICS_SITE "ecmwf" )
set( MAGICS_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} )
-set( MAGICS_REFERENCE_VERSIONS "2.29.3" )
+set( MAGICS_REFERENCE_VERSIONS "2.29.6" )
set( MAGICS_HTML_ROOT "${CMAKE_BINARY_DIR}/regression/html")
file(MAKE_DIRECTORY ${MAGICS_HTML_ROOT} )
diff --git a/VERSION.cmake b/VERSION.cmake
index aae0b62..072254a 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -6,8 +6,8 @@
# granted to it by virtue of its status as an intergovernmental organisation nor
# does it submit to any jurisdiction.
-set ( metabuilder_version 2.29.6 )
-set ( _version 2.29.6 )
+set ( metabuilder_version 2.30.0 )
+set ( _version 2.30.0 )
if ( MAGICS_BUILD )
set( ${PROJECT_NAME}_VERSION_STR "${_version}-${MAGICS_BUILD}" )
diff --git a/apps/metgram/metgram b/apps/metgram/metgram
index d6307c1..2d4335a 100755
--- a/apps/metgram/metgram
+++ b/apps/metgram/metgram
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
use strict;
use Data::Dumper;
use IO::Socket;
diff --git a/bin/ecbuild b/bin/ecbuild
index 0ee4b13..da2d7b9 100755
--- a/bin/ecbuild
+++ b/bin/ecbuild
@@ -368,9 +368,9 @@ cmake_version_sufficient=""
# Check that version $1 satisfies $2
# CMake versions have no more than 4 fields
-# (adapted from http://stackoverflow.com/a/25731924/396967)
+# Version sort (sort -V) is not available on all platforms
version_gte() {
- [ "$2" = "$(echo -e "$1\n$2" | sort -t '.' -k 1,1 -k 2,2 -k 3,3 -k 4,4 -g | head -n1)" ]
+ [ "$2" = "$(echo -e "$1\n$2" | sort -t '.' -k 1,1 -k 2,2 -k 3,3 -k 4,4 -g | head -n1)" ]
}
# Use already built CMake if any
diff --git a/cmake/CheckFortranCompilerFlag.cmake b/cmake/CheckFortranCompilerFlag.cmake
deleted file mode 100644
index 5408691..0000000
--- a/cmake/CheckFortranCompilerFlag.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-# - Check whether the CXX compiler supports a given flag.
-# CHECK_CXX_COMPILER_FLAG(FLAG VARIABLE)
-#
-# FLAG - the compiler flag
-# VARIABLE - variable to store the result
-
-# Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-INCLUDE(CheckFortranSourceCompiles)
-
-MACRO (CHECK_FORTRAN_COMPILER_FLAG _FLAG _RESULT)
- SET(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
- SET(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}")
- CHECK_FORTRAN_SOURCE_COMPILES("program main\nend program\n" ${_RESULT}
- # Some compilers do not fail with a bad flag
- FAIL_REGEX "command line option .* is valid for .* but not for C\\\\+\\\\+" # GNU
- FAIL_REGEX "unrecognized .*option" # GNU
- FAIL_REGEX "unknown .*option" # Clang
- FAIL_REGEX "invalid value" # Clang
- FAIL_REGEX "ignoring unknown option" # MSVC
- FAIL_REGEX "warning D9002" # MSVC, any lang
- FAIL_REGEX "option.*not supported" # Intel
- FAIL_REGEX "invalid argument .*option" # Intel
- FAIL_REGEX "ignoring option .*argument required" # Intel
- FAIL_REGEX "[Uu]nknown option" # HP
- FAIL_REGEX "[Ww]arning: [Oo]ption" # SunPro
- FAIL_REGEX "command option .* is not recognized" # XL
- FAIL_REGEX "not supported in this configuration; ignored" # AIX
- FAIL_REGEX "File with unknown suffix passed to linker" # PGI
- FAIL_REGEX "WARNING: unknown flag:" # Open64
- )
- SET (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
-ENDMACRO (CHECK_FORTRAN_COMPILER_FLAG)
diff --git a/cmake/CheckFortranSourceCompiles.cmake b/cmake/CheckFortranSourceCompiles.cmake
deleted file mode 100644
index d3dc968..0000000
--- a/cmake/CheckFortranSourceCompiles.cmake
+++ /dev/null
@@ -1,94 +0,0 @@
-# - Check if given Fortran source compiles and links into an executable
-# CHECK_FORTRAN_SOURCE_COMPILES(<code> <var> [FAIL_REGEX <fail-regex>])
-# <code> - source code to try to compile, must define 'main'
-# <var> - variable to store whether the source code compiled
-# <fail-regex> - fail if test output matches this regex
-# The following variables may be set before calling this macro to
-# modify the way the check is run:
-#
-# CMAKE_REQUIRED_FLAGS = string of compile command line flags
-# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
-# CMAKE_REQUIRED_INCLUDES = list of include directories
-# CMAKE_REQUIRED_LIBRARIES = list of libraries to link
-
-#=============================================================================
-# Copyright 2005-2009 Kitware, Inc.
-# Fortran version, 2013, James Tappin
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-# License text for the above reference.)
-
-
-
-macro(CHECK_FORTRAN_SOURCE_COMPILES SOURCE VAR)
-
-if( ${VAR} MATCHES "^${VAR}$" )
- set(_FAIL_REGEX)
- set(_key)
- foreach(arg ${ARGN})
- if("${arg}" MATCHES "^(FAIL_REGEX)$")
- set(_key "${arg}")
- elseif(_key)
- list(APPEND _${_key} "${arg}")
- else()
- ecbuild_critical("Unknown argument:\n ${arg}\n")
- endif()
- endforeach()
- set(MACRO_CHECK_FUNCTION_DEFINITIONS
- "-D${VAR} ${CMAKE_REQUIRED_FLAGS}")
- if(CMAKE_REQUIRED_LIBRARIES)
- set(CHECK_FORTRAN_SOURCE_COMPILES_ADD_LIBRARIES
- LINK_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
- else()
- set(CHECK_FORTRAN_SOURCE_COMPILES_ADD_LIBRARIES)
- endif()
- if(CMAKE_REQUIRED_INCLUDES)
- set(CHECK_FORTRAN_SOURCE_COMPILES_ADD_INCLUDES
- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
- else()
- set(CHECK_FORTRAN_SOURCE_COMPILES_ADD_INCLUDES)
- endif()
- file(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.f90"
- "${SOURCE}\n")
-
- ecbuild_debug("Performing Test ${VAR}")
- try_compile(${VAR}
- ${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.f90
- COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
- ${CHECK_FORTRAN_SOURCE_COMPILES_ADD_LIBRARIES}
- CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
- "${CHECK_FORTRAN_SOURCE_COMPILES_ADD_INCLUDES}"
- OUTPUT_VARIABLE OUTPUT)
-
- foreach(_regex ${_FAIL_REGEX})
- if("${OUTPUT}" MATCHES "${_regex}")
- set(${VAR} 0)
- endif()
- endforeach()
-
- if(${VAR})
- set(${VAR} 1 CACHE INTERNAL "Test ${VAR}")
- ecbuild_debug("Performing Test ${VAR} - Success")
- file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
- "Performing Fortran SOURCE FILE Test ${VAR} succeded with the following output:\n"
- "${OUTPUT}\n"
- "Source file was:\n${SOURCE}\n")
- else()
- ecbuild_debug("Performing Test ${VAR} - Failed")
- set(${VAR} "" CACHE INTERNAL "Test ${VAR}")
- file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
- "Performing Fortran SOURCE FILE Test ${VAR} failed with the following output:\n"
- "${OUTPUT}\n"
- "Source file was:\n${SOURCE}\n")
- endif()
- endif()
-endmacro()
-
diff --git a/cmake/contrib/FindFFTW.cmake b/cmake/FindFFTW.cmake
similarity index 96%
rename from cmake/contrib/FindFFTW.cmake
rename to cmake/FindFFTW.cmake
index 5ef46df..b76afa5 100644
--- a/cmake/contrib/FindFFTW.cmake
+++ b/cmake/FindFFTW.cmake
@@ -56,12 +56,6 @@
#
##############################################################################
-#============================================#
-# #
-# From Eigen3, modified by W Deconinck #
-# #
-#============================================#
-
if( (NOT FFTW_ROOT) AND EXISTS $ENV{FFTW_ROOT} )
set( FFTW_ROOT ${FFTW_ROOT} )
endif()
diff --git a/cmake/FindGeoTIFF.cmake b/cmake/FindGeoTIFF.cmake
index 83c868c..126bc46 100644
--- a/cmake/FindGeoTIFF.cmake
+++ b/cmake/FindGeoTIFF.cmake
@@ -1,38 +1,46 @@
-###############################################################################
+# (C) Copyright 1996-2016 ECMWF.
#
-# CMake module to search for GeoTIFF library
-#
-# On success, the macro sets the following variables:
-# GEOTIFF_FOUND = if the library found
-# GEOTIFF_LIBRARIES = full path to the library
-# GEOTIFF_INCLUDE_DIR = where to find the library headers
-# also defined, but not for general use are
-# GEOTIFF_LIBRARY, where to find the PROJ.4 library.
-#
-# Copyright (c) 2009 Mateusz Loskot <mateusz at loskot.net>
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+# In applying this licence, ECMWF does not waive the privileges and immunities
+# granted to it by virtue of its status as an intergovernmental organisation
+# nor does it submit to any jurisdiction.
+
+# - Try to find the GeoTIFF includes and library
+# This module defines
#
-# Module source: http://github.com/mloskot/workshop/tree/master/cmake/
+# GEOTIFF_FOUND - System has GeoTIFF
+# GEOTIFF_INCLUDE_DIRS - the GeoTIFF include directories
+# GEOTIFF_LIBRARIES - the libraries needed to use GeoTIFF
#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+# The following paths will be searched with priority if set in CMake or env
#
-###############################################################################
+# GEOTIFF_DIR - root folder of the GeoTIFF installation
+# GEOTIFF_PATH - root folder of the GeoTIFF installation
-SET(GEOTIFF_NAMES geotiff)
+find_path( GEOTIFF_INCLUDE_DIR geotiff.h
+ PATHS ${GEOTIFF_PATH} ENV GEOTIFF_PATH
+ ${GEOTIFF_DIR} ENV GEOTIFF_DIR
+ PATH_SUFFIXES include include/libgeotiff
+ NO_DEFAULT_PATH )
+find_path( GEOTIFF_INCLUDE_DIR openjpeg.h
+ PATH_SUFFIXES include include/libgeotiff )
+find_library( GEOTIFF_LIBRARY NAMES geotiff
+ PATHS ${GEOTIFF_PATH} ENV GEOTIFF_PATH
+ ${GEOTIFF_DIR} ENV GEOTIFF_DIR
+ PATH_SUFFIXES lib lib64
+ NO_DEFAULT_PATH )
+find_library( GEOTIFF_LIBRARY NAMES geotiff )
- FIND_PATH(GEOTIFF_INCLUDE_DIR geotiff.h PATH_PREFIXES geotiff
- PATHS /usr/local/include/libgeotiff /usr/include/libgeotiff)
+set( GEOTIFF_LIBRARIES ${GEOTIFF_LIBRARY} )
+set( GEOTIFF_INCLUDE_DIRS ${GEOTIFF_INCLUDE_DIR} )
- FIND_LIBRARY(GEOTIFF_LIBRARY NAMES ${GEOTIFF_NAMES})
+include(FindPackageHandleStandardArgs)
-
-IF(GEOTIFF_FOUND)
- SET(GEOTIFF_LIBRARIES ${GEOTIFF_LIBRARY})
-ENDIF()
-
-# Handle the QUIET and REQUIRED arguments and set GEOTIFF_FOUND to TRUE
+# handle the QUIETLY and REQUIRED arguments and set GEOTIFF_FOUND to TRUE
# if all listed variables are TRUE
-# Note: capitalisation of the package name must be the same as in the file name
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GEOTiff DEFAULT_MSG GEOTIFF_LIBRARY GEOTIFF_INCLUDE_DIR)
+find_package_handle_standard_args( GeoTIFF DEFAULT_MSG
+ GEOTIFF_LIBRARY GEOTIFF_INCLUDE_DIR )
+
+mark_as_advanced( GEOTIFF_INCLUDE_DIR GEOTIFF_LIBRARY )
diff --git a/cmake/FindOpenJPEG.cmake b/cmake/FindOpenJPEG.cmake
index b54ecce..c660238 100644
--- a/cmake/FindOpenJPEG.cmake
+++ b/cmake/FindOpenJPEG.cmake
@@ -1,39 +1,45 @@
# (C) Copyright 1996-2016 ECMWF.
-#
+#
# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# In applying this licence, ECMWF does not waive the privileges and immunities
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+# In applying this licence, ECMWF does not waive the privileges and immunities
# granted to it by virtue of its status as an intergovernmental organisation nor
# does it submit to any jurisdiction.
-# - Try to find the OpenJPEG includes and library
+# - Try to find the OpenJPEG includes and library (version 1.5.x or 2.1.x)
# This module defines
+#
# OPENJPEG_FOUND - System has OpenJPEG
# OPENJPEG_INCLUDE_DIRS - the OpenJPEG include directories
# OPENJPEG_LIBRARIES - the libraries needed to use OpenJPEG
#
-# also defined internally:
-# OPENJPEG_LIBRARY, where to find the OpenJPEG library.
-# OPENJPEG_INCLUDE_DIR, where to find the openjpeg.h header
-
-IF( NOT DEFINED OPENJPEG_PATH AND NOT "$ENV{OPENJPEG_PATH}" STREQUAL "" )
- SET( OPENJPEG_PATH "$ENV{OPENJPEG_PATH}" )
-ENDIF()
-
-# Note: OpenJPEG version 2.x.y onwards has a variable-name sub-dir in the include
-# e.g. include/openjpeg-2.0 or include/openjpeg-2.1
-# We only support version 2.1.x
-# Also the name of the library is different. In v1.x it was libopenjpeg and now it's libopenjp2
-if( DEFINED OPENJPEG_PATH )
- find_path(OPENJPEG_INCLUDE_DIR openjpeg.h PATHS ${OPENJPEG_PATH}/include PATH_SUFFIXES openjpeg openjpeg-2.1 NO_DEFAULT_PATH)
-
- find_library( OPENJPEG_LIBRARY NAMES openjpeg openjp2 PATHS ${OPENJPEG_PATH}/lib
- PATH_SUFFIXES openjpeg NO_DEFAULT_PATH )
-endif()
-
-find_path(OPENJPEG_INCLUDE_DIR openjpeg.h PATH_SUFFIXES openjpeg openjpeg-2.1)
-
-find_library( OPENJPEG_LIBRARY NAMES openjpeg openjp2 PATH_SUFFIXES openjpeg )
+# The following paths will be searched with priority if set in CMake or env
+#
+# OPENJPEG_DIR - root folder of the OpenJPEG installation
+# OPENJPEG_PATH - root folder of the OpenJPEG installation
+
+# Note: OpenJPEG has a version-specific subdirectory in the include
+# e.g. include/openjpeg-2.0 or include/openjpeg-2.1.
+# Only version 1.5.x and 2.1.x are supported.
+# The library name is different for 1.x (libopenjpeg) and 2.x (libopenjp2).
+
+set( _suff include include/openjpeg include/openjpeg-1.5 include/openjpeg-2.1 )
+find_path( OPENJPEG_INCLUDE_DIR openjpeg.h
+ PATHS ${OPENJPEG_PATH} ENV OPENJPEG_PATH
+ ${OPENJPEG_DIR} ENV OPENJPEG_DIR
+ PATH_SUFFIXES ${_suff}
+ NO_DEFAULT_PATH )
+find_path( OPENJPEG_INCLUDE_DIR openjpeg.h
+ PATH_SUFFIXES ${_suff} )
+unset( _suff )
+
+find_library( OPENJPEG_LIBRARY NAMES openjpeg openjp2
+ PATHS ${OPENJPEG_PATH} ENV OPENJPEG_PATH
+ ${OPENJPEG_DIR} ENV OPENJPEG_DIR
+ PATH_SUFFIXES lib lib/openjpeg
+ NO_DEFAULT_PATH )
+find_library( OPENJPEG_LIBRARY NAMES openjpeg openjp2
+ PATH_SUFFIXES lib lib/openjpeg )
set( OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY} )
set( OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_DIR} )
@@ -45,4 +51,4 @@ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(OpenJPEG DEFAULT_MSG
OPENJPEG_LIBRARY OPENJPEG_INCLUDE_DIR)
-mark_as_advanced(OPENJPEG_INCLUDE_DIR OPENJPEG_LIBRARY )
+mark_as_advanced( OPENJPEG_INCLUDE_DIR OPENJPEG_LIBRARY )
diff --git a/cmake/VERSION.cmake b/cmake/VERSION.cmake
index b4c65ee..074b9f7 100644
--- a/cmake/VERSION.cmake
+++ b/cmake/VERSION.cmake
@@ -1,7 +1,7 @@
set( ECBUILD_MAJOR_VERSION "2" )
set( ECBUILD_MINOR_VERSION "4" )
-set( ECBUILD_PATCH_VERSION "0" )
+set( ECBUILD_PATCH_VERSION "1" )
-set( ECBUILD_VERSION_STR "2.4.0" )
+set( ECBUILD_VERSION_STR "2.4.1" )
set( ECBUILD_MACRO_VERSION "${ECBUILD_MAJOR_VERSION}.${ECBUILD_MINOR_VERSION}" )
diff --git a/cmake/contrib/CMakeCheckCompilerFlagCommonPatterns.cmake b/cmake/contrib/CMakeCheckCompilerFlagCommonPatterns.cmake
new file mode 100644
index 0000000..1b5178d
--- /dev/null
+++ b/cmake/contrib/CMakeCheckCompilerFlagCommonPatterns.cmake
@@ -0,0 +1,33 @@
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+
+# Do NOT include this module directly into any of your code. It is meant as
+# a library for Check*CompilerFlag.cmake modules. It's content may change in
+# any way between releases.
+
+macro (CHECK_COMPILER_FLAG_COMMON_PATTERNS _VAR)
+ set(${_VAR}
+ FAIL_REGEX "[Uu]nrecogni[sz]ed .*option" # GNU, NAG
+ FAIL_REGEX "unknown .*option" # Clang
+ FAIL_REGEX "optimization flag .* not supported" # Clang
+ FAIL_REGEX "unknown argument ignored" # Clang (cl)
+ FAIL_REGEX "ignoring unknown option" # MSVC, Intel
+ FAIL_REGEX "warning D9002" # MSVC, any lang
+ FAIL_REGEX "option.*not supported" # Intel
+ FAIL_REGEX "invalid argument .*option" # Intel
+ FAIL_REGEX "ignoring option .*argument required" # Intel
+ FAIL_REGEX "ignoring option .*argument is of wrong type" # Intel
+ FAIL_REGEX "[Uu]nknown option" # HP
+ FAIL_REGEX "[Ww]arning: [Oo]ption" # SunPro
+ FAIL_REGEX "command option .* is not recognized" # XL
+ FAIL_REGEX "command option .* contains an incorrect subargument" # XL
+ FAIL_REGEX "not supported in this configuration. ignored" # AIX
+ FAIL_REGEX "File with unknown suffix passed to linker" # PGI
+ FAIL_REGEX "[Uu]nknown switch" # PGI
+ FAIL_REGEX "WARNING: unknown flag:" # Open64
+ FAIL_REGEX "Incorrect command line option:" # Borland
+ FAIL_REGEX "Warning: illegal option" # SunStudio 12
+ FAIL_REGEX "[Ww]arning: Invalid suboption" # Fujitsu
+ )
+endmacro ()
diff --git a/cmake/contrib/CheckFortranCompilerFlag.cmake b/cmake/contrib/CheckFortranCompilerFlag.cmake
index 6a35c8e..8519fcc 100644
--- a/cmake/contrib/CheckFortranCompilerFlag.cmake
+++ b/cmake/contrib/CheckFortranCompilerFlag.cmake
@@ -1,25 +1,53 @@
-# File taken from CMake Bug Report: http://public.kitware.com/Bug/print_bug_page.php?bug_id=12459
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
-# - Check whether the Fortan compiler supports a given flag.
-# CHECK_FORTRAN_COMPILER_FLAG(<flag> <var>)
-# <flag> - the compiler flag
-# <var> - variable to store the result
-# This internally calls the check_fortran_source_compiles macro. See help
-# for CheckFortranSourceCompiles for a listing of variables that can
-# modify the build.
+#.rst:
+# CheckFortranCompilerFlag
+# ------------------------
+#
+# Check whether the Fortran compiler supports a given flag.
+#
+# CHECK_Fortran_COMPILER_FLAG(<flag> <var>)
+#
+# ::
+#
+# <flag> - the compiler flag
+# <var> - variable to store the result
+# Will be created as an internal cache variable.
+#
+# This internally calls the check_fortran_source_compiles macro and
+# sets CMAKE_REQUIRED_DEFINITIONS to <flag>. See help for
+# CheckFortranSourceCompiles for a listing of variables that can
+# otherwise modify the build. The result only tells that the compiler
+# does not give an error message when it encounters the flag. If the
+# flag has any effect or even a specific one is beyond the scope of
+# this module.
-INCLUDE(CheckFortranSourceCompiles)
+include(CheckFortranSourceCompiles)
+include(CMakeCheckCompilerFlagCommonPatterns)
-MACRO (CHECK_FORTRAN_COMPILER_FLAG _FLAG _RESULT)
- SET(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
- SET(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}")
- CHECK_FORTRAN_SOURCE_COMPILES("end" ${_RESULT}
- # Some compilers do not fail with a bad flag
- FAIL_REGEX "unrecognized .*option" # GNU
- FAIL_REGEX "ignoring unknown option" # MSVC
- FAIL_REGEX "[Uu]nknown option" # HP
- FAIL_REGEX "[Ww]arning: [Oo]ption" # SunPro
- FAIL_REGEX "command option .* is not recognized" # XL
- )
- SET (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
-ENDMACRO (CHECK_FORTRAN_COMPILER_FLAG)
+macro (CHECK_Fortran_COMPILER_FLAG _FLAG _RESULT)
+ set(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
+ set(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}")
+
+ # Normalize locale during test compilation.
+ set(_CheckFortranCompilerFlag_LOCALE_VARS LC_ALL LC_MESSAGES LANG)
+ foreach(v ${_CheckFortranCompilerFlag_LOCALE_VARS})
+ set(_CheckFortranCompilerFlag_SAVED_${v} "$ENV{${v}}")
+ set(ENV{${v}} C)
+ endforeach()
+ CHECK_COMPILER_FLAG_COMMON_PATTERNS(_CheckFortranCompilerFlag_COMMON_PATTERNS)
+ CHECK_Fortran_SOURCE_COMPILES(" program test\n stop\n end program" ${_RESULT}
+ # Some compilers do not fail with a bad flag
+ FAIL_REGEX "command line option .* is valid for .* but not for Fortran" # GNU
+ ${_CheckFortranCompilerFlag_COMMON_PATTERNS}
+ )
+ foreach(v ${_CheckFortranCompilerFlag_LOCALE_VARS})
+ set(ENV{${v}} ${_CheckFortranCompilerFlag_SAVED_${v}})
+ unset(_CheckFortranCompilerFlag_SAVED_${v})
+ endforeach()
+ unset(_CheckFortranCompilerFlag_LOCALE_VARS)
+ unset(_CheckFortranCompilerFlag_COMMON_PATTERNS)
+
+ set (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
+endmacro ()
diff --git a/cmake/contrib/CheckFortranSourceCompiles.cmake b/cmake/contrib/CheckFortranSourceCompiles.cmake
index 500aee6..c42254c 100644
--- a/cmake/contrib/CheckFortranSourceCompiles.cmake
+++ b/cmake/contrib/CheckFortranSourceCompiles.cmake
@@ -1,61 +1,106 @@
-# File taken from CMake Bug Report: http://public.kitware.com/Bug/print_bug_page.php?bug_id=12459
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
-# - Check if the source code provided in the SOURCE argument compiles.
-# CHECK_FORTRAN_SOURCE_COMPILES(SOURCE VAR)
-# - macro which checks if the source code compiles
-# SOURCE - source code to try to compile
-# VAR - variable to store whether the source code compiled
+#.rst:
+# CheckFortranSourceCompiles
+# --------------------------
#
-# The following variables may be set before calling this macro to
-# modify the way the check is run:
+# Check if given Fortran source compiles and links into an executable::
#
-# CMAKE_REQUIRED_FLAGS = string of compile command line flags
-# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
-# CMAKE_REQUIRED_INCLUDES = list of include directories
-# CMAKE_REQUIRED_LIBRARIES = list of libraries to link
+# CHECK_Fortran_SOURCE_COMPILES(<code> <var> [FAIL_REGEX <fail-regex>]
+# [SRC_EXT <ext>])
+#
+# The arguments are:
+#
+# ``<code>``
+# Source code to try to compile. It must define a PROGRAM entry point.
+# ``<var>``
+# Variable to store whether the source code compiled.
+# Will be created as an internal cache variable.
+# ``FAIL_REGEX <fail-regex>``
+# Fail if test output matches this regex.
+# ``SRC_EXT <ext>``
+# Use source extension ``.<ext>`` instead of the default ``.F``.
+#
+# The following variables may be set before calling this macro to modify
+# the way the check is run::
+#
+# CMAKE_REQUIRED_FLAGS = string of compile command line flags
+# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
+# CMAKE_REQUIRED_INCLUDES = list of include directories
+# CMAKE_REQUIRED_LIBRARIES = list of libraries to link
+# CMAKE_REQUIRED_QUIET = execute quietly without messages
-MACRO(CHECK_FORTRAN_SOURCE_COMPILES SOURCE VAR)
- IF("${VAR}" MATCHES "^${VAR}$")
- SET(MACRO_CHECK_FUNCTION_DEFINITIONS
+macro(CHECK_Fortran_SOURCE_COMPILES SOURCE VAR)
+ if(NOT DEFINED "${VAR}")
+ set(_FAIL_REGEX)
+ set(_SRC_EXT)
+ set(_key)
+ foreach(arg ${ARGN})
+ if("${arg}" MATCHES "^(FAIL_REGEX|SRC_EXT)$")
+ set(_key "${arg}")
+ elseif(_key)
+ list(APPEND _${_key} "${arg}")
+ else()
+ message(FATAL_ERROR "Unknown argument:\n ${arg}\n")
+ endif()
+ endforeach()
+ if(NOT _SRC_EXT)
+ set(_SRC_EXT F)
+ endif()
+ set(MACRO_CHECK_FUNCTION_DEFINITIONS
"-D${VAR} ${CMAKE_REQUIRED_FLAGS}")
- IF(CMAKE_REQUIRED_LIBRARIES)
- SET(CHECK_FORTRAN_SOURCE_COMPILES_ADD_LIBRARIES
- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
- ELSE(CMAKE_REQUIRED_LIBRARIES)
- SET(CHECK_FORTRAN_SOURCE_COMPILES_ADD_LIBRARIES)
- ENDIF(CMAKE_REQUIRED_LIBRARIES)
- IF(CMAKE_REQUIRED_INCLUDES)
- SET(CHECK_FORTRAN_SOURCE_COMPILES_ADD_INCLUDES
+ if(CMAKE_REQUIRED_LIBRARIES)
+ set(CHECK_Fortran_SOURCE_COMPILES_ADD_LIBRARIES
+ LINK_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
+ else()
+ set(CHECK_Fortran_SOURCE_COMPILES_ADD_LIBRARIES)
+ endif()
+ if(CMAKE_REQUIRED_INCLUDES)
+ set(CHECK_Fortran_SOURCE_COMPILES_ADD_INCLUDES
"-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
- ELSE(CMAKE_REQUIRED_INCLUDES)
- SET(CHECK_FORTRAN_SOURCE_COMPILES_ADD_INCLUDES)
- ENDIF(CMAKE_REQUIRED_INCLUDES)
- FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.f90"
+ else()
+ set(CHECK_Fortran_SOURCE_COMPILES_ADD_INCLUDES)
+ endif()
+ file(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.${_SRC_EXT}"
"${SOURCE}\n")
- MESSAGE(STATUS "Performing Test ${VAR}")
- TRY_COMPILE(${VAR}
+ if(NOT CMAKE_REQUIRED_QUIET)
+ message(STATUS "Performing Test ${VAR}")
+ endif()
+ try_compile(${VAR}
${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.f90
+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.${_SRC_EXT}
COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
+ ${CHECK_Fortran_SOURCE_COMPILES_ADD_LIBRARIES}
CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
- "${CHECK_FORTRAN_SOURCE_COMPILES_ADD_LIBRARIES}"
- "${CHECK_FORTRAN_SOURCE_COMPILES_ADD_INCLUDES}"
+ "${CHECK_Fortran_SOURCE_COMPILES_ADD_INCLUDES}"
OUTPUT_VARIABLE OUTPUT)
- IF(${VAR})
- SET(${VAR} 1 CACHE INTERNAL "Test ${VAR}")
- MESSAGE(STATUS "Performing Test ${VAR} - Success")
- FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
- "Performing Fortran SOURCE FILE Test ${VAR} succeded with the following output:\n"
+
+ foreach(_regex ${_FAIL_REGEX})
+ if("${OUTPUT}" MATCHES "${_regex}")
+ set(${VAR} 0)
+ endif()
+ endforeach()
+
+ if(${VAR})
+ set(${VAR} 1 CACHE INTERNAL "Test ${VAR}")
+ if(NOT CMAKE_REQUIRED_QUIET)
+ message(STATUS "Performing Test ${VAR} - Success")
+ endif()
+ file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+ "Performing Fortran SOURCE FILE Test ${VAR} succeeded with the following output:\n"
"${OUTPUT}\n"
"Source file was:\n${SOURCE}\n")
- ELSE(${VAR})
- MESSAGE(STATUS "Performing Test ${VAR} - Failed")
- SET(${VAR} 0 CACHE INTERNAL "Test ${VAR}")
- FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+ else()
+ if(NOT CMAKE_REQUIRED_QUIET)
+ message(STATUS "Performing Test ${VAR} - Failed")
+ endif()
+ set(${VAR} "" CACHE INTERNAL "Test ${VAR}")
+ file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
"Performing Fortran SOURCE FILE Test ${VAR} failed with the following output:\n"
"${OUTPUT}\n"
"Source file was:\n${SOURCE}\n")
- ENDIF(${VAR})
- ENDIF("${VAR}" MATCHES "^${VAR}$")
-ENDMACRO(CHECK_FORTRAN_SOURCE_COMPILES)
+ endif()
+ endif()
+endmacro()
diff --git a/cmake/contrib/FindNetCDF4.cmake b/cmake/contrib/FindNetCDF4.cmake
index 6bba4e0..70e54af 100644
--- a/cmake/contrib/FindNetCDF4.cmake
+++ b/cmake/contrib/FindNetCDF4.cmake
@@ -149,11 +149,11 @@ else()
set( NETCDF_F90_INCLUDE_NAMES netcdf.mod typesizes.mod ${NETCDF_C_INCLUDE_NAMES} )
set( NETCDF_C_LIBRARY_NAMES netcdf)
- set( NETCDF_CXX_LIBRARY_NAMES netcdf_c++ ${NETCDF_C_LIBRARY_NAMES} )
+ set( NETCDF_CXX_LIBRARY_NAMES netcdf_c++ netcdf_c++4 ${NETCDF_C_LIBRARY_NAMES} )
set( NETCDF_FORTRAN_LIBRARY_NAMES netcdff ${NETCDF_C_LIBRARY_NAMES})
set( NETCDF_F90_LIBRARY_NAMES ${NETCDF_FORTRAN_LIBRARY_NAMES} )
- set( NETCDF_REQUIRED netcdf.h netcdfcpp.h netcdf.mod typesizes.mod netcdf netcdff netcdf_c++)
+ set( NETCDF_REQUIRED netcdf.h netcdfcpp.h netcdf.mod typesizes.mod netcdf netcdff netcdf_c++ netcdf_c++4)
foreach( LANGUAGE ${NETCDF_LANGUAGE_BINDINGS} )
ecbuild_debug("FindNetCDF4: looking for ${LANGUAGE} language bindings")
diff --git a/cmake/ecbuild_add_option.cmake b/cmake/ecbuild_add_option.cmake
index ed262d5..fd8076e 100644
--- a/cmake/ecbuild_add_option.cmake
+++ b/cmake/ecbuild_add_option.cmake
@@ -132,17 +132,16 @@ macro( ecbuild_add_option )
set( _${_p_FEATURE}_condition TRUE )
endif()
- # check if user provided value
-
- get_property( _in_cache CACHE ENABLE_${_p_FEATURE} PROPERTY VALUE )
+ # Check if user explicitly enabled/disabled the feature in cache
+ get_property( _in_cache CACHE ENABLE_${_p_FEATURE} PROPERTY VALUE SET )
# A feature set to REQUIRE is always treated as explicitly enabled
if( ENABLE_${_p_FEATURE} MATCHES "REQUIRE" )
set( ENABLE_${_p_FEATURE} ON CACHE BOOL "" FORCE )
ecbuild_debug("ecbuild_add_option(${_p_FEATURE}): ENABLE_${_p_FEATURE} was required")
set( ${_p_FEATURE}_user_provided_input 1 CACHE BOOL "" FORCE )
- elseif( NOT "${ENABLE_${_p_FEATURE}}" STREQUAL "" AND _in_cache )
- ecbuild_debug("ecbuild_add_option(${_p_FEATURE}): ENABLE_${_p_FEATURE} was found in cache")
+ elseif( NOT ENABLE_${_p_FEATURE} STREQUAL "" AND _in_cache )
+ ecbuild_debug("ecbuild_add_option(${_p_FEATURE}): ENABLE_${_p_FEATURE}=${ENABLE_${_p_FEATURE}} was found in cache")
set( ${_p_FEATURE}_user_provided_input 1 CACHE BOOL "" )
else()
ecbuild_debug("ecbuild_add_option(${_p_FEATURE}): ENABLE_${_p_FEATURE} not found in cache")
@@ -162,13 +161,9 @@ macro( ecbuild_add_option )
TYPE ${_p_TYPE}
PURPOSE "${_p_PURPOSE}" )
- ecbuild_debug("ecbuild_add_option(${_p_FEATURE}): ENABLE_${_p_FEATURE} = ${ENABLE_${_p_FEATURE}}")
- set( _do_search ${ENABLE_${_p_FEATURE}} )
- if( _p_FEATURE STREQUAL "OMP" )
- set( _do_search TRUE )
- endif()
+ ecbuild_debug("ecbuild_add_option(${_p_FEATURE}): ENABLE_${_p_FEATURE}=${ENABLE_${_p_FEATURE}}")
- if( _do_search )
+ if( ENABLE_${_p_FEATURE} )
ecbuild_debug("ecbuild_add_option(${_p_FEATURE}): feature enabled")
set( HAVE_${_p_FEATURE} 1 )
@@ -304,13 +299,13 @@ macro( ecbuild_add_option )
endif()
- else( _do_search )
+ else()
ecbuild_debug("ecbuild_add_option(${_p_FEATURE}): feature disabled")
set( HAVE_${_p_FEATURE} 0 )
ecbuild_set_feature( ${_p_FEATURE} ENABLED OFF )
- endif( _do_search )
+ endif()
if( ${_p_ADVANCED} )
diff --git a/cmake/ecbuild_add_test.cmake b/cmake/ecbuild_add_test.cmake
index c8c9864..1dcf2c6 100644
--- a/cmake/ecbuild_add_test.cmake
+++ b/cmake/ecbuild_add_test.cmake
@@ -19,6 +19,7 @@
# [ OBJECTS <obj1> [<obj2> ...] ]
# [ COMMAND <executable> ]
# [ TYPE EXE|SCRIPT|PYTHON ]
+# [ LABELS <label1> [<label2> ...] ]
# [ ARGS <argument1> [<argument2> ...] ]
# [ RESOURCES <file1> [<file2> ...] ]
# [ TEST_DATA <file1> [<file2> ...] ]
@@ -63,6 +64,22 @@
# :SCRIPT: run command or script, default if COMMAND is provided
# :PYTHON: run a Python script (requires the Python interpreter to be found)
#
+# LABELS : optional
+# list of labels to assign to the test
+#
+# The project name in lower case is always added as a label. Additional
+# labels are assigned depending on the type of test:
+#
+# :executable: for type ``EXE``
+# :script: for type ``SCRIPT``
+# :python: for type ``PYTHON``
+# :boost: uses Boost unit test
+# :mpi: if ``MPI`` is set
+# :openmp: if ``OMP`` is set
+#
+# This allows selecting tests to run via ``ctest -L <regex>`` or tests
+# to exclude via ``ctest -LE <regex>``.
+#
# ARGS : optional
# list of arguments to pass to TARGET or COMMAND when running the test
#
@@ -76,9 +93,9 @@
# use the Boost Unit Test Framework
#
# MPI : optional
-# number of MPI tasks to use.
+# Run with MPI using the given number of MPI tasks.
#
-# If greater than 1, and MPI is not available, the test is disabled.
+# If greater than 1, and ``MPIEXEC`` is not available, the test is disabled.
#
# OMP : optional
# number of OpenMP threads per MPI task to use.
@@ -138,7 +155,7 @@ macro( ecbuild_add_test )
set( options BOOST )
set( single_value_args TARGET ENABLED COMMAND TYPE LINKER_LANGUAGE MPI OMP WORKING_DIRECTORY )
- set( multi_value_args SOURCES OBJECTS LIBS INCLUDES TEST_DEPENDS DEPENDS ARGS
+ set( multi_value_args SOURCES OBJECTS LIBS INCLUDES TEST_DEPENDS DEPENDS LABELS ARGS
PERSISTENT DEFINITIONS RESOURCES TEST_DATA CFLAGS
CXXFLAGS FFLAGS GENERATED CONDITION ENVIRONMENT )
@@ -150,21 +167,31 @@ macro( ecbuild_add_test )
set( _TEST_DIR ${CMAKE_CURRENT_BINARY_DIR} )
- # Check for MPI
- if(_PAR_MPI)
- if( (_PAR_MPI GREATER 1) AND ( (NOT MPI_FOUND) OR (NOT MPIEXEC) ) )
- ecbuild_debug("ecbuild_add_test(${_PAR_TARGET}): ${_PAR_MPI} MPI ranks requested but MPI not available - disabling test")
+ # Undocumented flag for disabling all MPI tests for test environment without suitable MPI(EXEC)
+ if( _PAR_MPI AND ECBUILD_DISABLE_MPI_TESTS )
+ ecbuild_debug("ecbuild_add_test(${_PAR_TARGET}): ECBUILD_DISABLE_MPI_TESTS set - disabling test")
+ set( _PAR_ENABLED 0 )
+ elseif( _PAR_MPI )
+ # Check for MPIEXEC if it not set
+ find_program( MPIEXEC NAMES mpiexec mpirun lamexec srun
+ DOC "Executable for running MPI programs." )
+ if( MPIEXEC )
+ set(MPIEXEC_NUMPROC_FLAG "-np" CACHE STRING "Flag used by MPI to specify the number of processes for MPIEXEC")
+ ecbuild_debug("ecbuild_add_test(${_PAR_TARGET}): Running using ${MPIEXEC} on ${_PAR_MPI} MPI rank(s)")
+ set( _PAR_LABELS mpi ${_PAR_LABELS} )
+ elseif( _PAR_MPI GREATER 1 )
+ ecbuild_debug("ecbuild_add_test(${_PAR_TARGET}): ${_PAR_MPI} MPI ranks requested but MPIEXEC not available - disabling test")
set( _PAR_ENABLED 0 )
- elseif( (_PAR_MPI EQUAL 1) AND (NOT MPI_FOUND) )
- ecbuild_debug("ecbuild_add_test(${_PAR_TARGET}): 1 MPI rank requested but MPI not available - disabling MPI")
- set( _PAR_MPI 0 )
else()
- ecbuild_debug("ecbuild_add_test(${_PAR_TARGET}): Running using ${_PAR_MPI} MPI rank(s)")
+ ecbuild_debug("ecbuild_add_test(${_PAR_TARGET}): 1 MPI rank requested but MPIEXEC not available - running sequentially")
+ set( _PAR_MPI 0 )
endif()
endif()
# Check for OMP
- if( NOT DEFINED _PAR_OMP )
+ if( DEFINED _PAR_OMP )
+ set( _PAR_LABELS openmp ${_PAR_LABELS} )
+ else()
set( _PAR_OMP 1 )
endif()
list( APPEND _PAR_ENVIRONMENT "OMP_NUM_THREADS=${_PAR_OMP}" )
@@ -181,11 +208,13 @@ macro( ecbuild_add_test )
# command implies script
if( DEFINED _PAR_COMMAND )
set( _PAR_TYPE "SCRIPT" )
+ set( _PAR_LABELS script ${_PAR_LABELS} )
endif()
# default of TYPE
if( NOT _PAR_TYPE AND DEFINED _PAR_TARGET )
set( _PAR_TYPE "EXE" )
+ set( _PAR_LABELS executable ${_PAR_LABELS} )
if( NOT _PAR_SOURCES )
ecbuild_critical("The call to ecbuild_add_test() defines a TARGET without SOURCES.")
endif()
@@ -194,6 +223,7 @@ macro( ecbuild_add_test )
if( _PAR_TYPE MATCHES "PYTHON" )
if( PYTHONINTERP_FOUND )
set( _PAR_COMMAND ${PYTHON_EXECUTABLE} )
+ set( _PAR_LABELS python ${_PAR_LABELS} )
else()
ecbuild_warn( "Requested a python test but python interpreter not found - disabling test\nPYTHON_EXECUTABLE: [${PYTHON_EXECUTABLE}]" )
set( _PAR_ENABLED 0 )
@@ -233,6 +263,7 @@ macro( ecbuild_add_test )
if( _PAR_BOOST AND ENABLE_TESTS AND _${_PAR_TARGET}_condition )
if( HAVE_BOOST_UNIT_TEST )
+ set( _PAR_LABELS boost ${_PAR_LABELS} )
if( BOOST_UNIT_TEST_FRAMEWORK_HEADER_ONLY )
include_directories( ${ECBUILD_BOOST_HEADER_DIRS} )
include_directories( ${Boost_INCLUDE_DIRS} ) # temporary until we ship Boost Unit Test with ecBuild
@@ -431,6 +462,12 @@ macro( ecbuild_add_test )
endif()
+ # Add lower case project name to custom test labels
+ set( _PAR_LABELS ${PROJECT_NAME_LOWCASE} ${_PAR_LABELS} )
+ list( REMOVE_DUPLICATES _PAR_LABELS )
+ ecbuild_debug("ecbuild_add_test(${_PAR_TARGET}): assign labels ${_PAR_LABELS}")
+ set_property( TEST ${_PAR_TARGET} APPEND PROPERTY LABELS "${_PAR_LABELS}" )
+
if( DEFINED _PAR_ENVIRONMENT )
set_property( TEST ${_PAR_TARGET} APPEND PROPERTY ENVIRONMENT "${_PAR_ENVIRONMENT}" )
endif()
diff --git a/cmake/ecbuild_check_cxx11.cmake b/cmake/ecbuild_check_cxx11.cmake
index 1639a6a..9552389 100644
--- a/cmake/ecbuild_check_cxx11.cmake
+++ b/cmake/ecbuild_check_cxx11.cmake
@@ -41,97 +41,98 @@
function( ecbuild_check_cxx11 )
- # parse parameters
+ # parse parameters
- set( options PRINT )
- set( single_value_args )
- set( multi_value_args FEATURES REQUIRED )
+ set( options PRINT )
+ set( single_value_args )
+ set( multi_value_args FEATURES REQUIRED )
- cmake_parse_arguments( _p "${options}" "${single_value_args}" "${multi_value_args}" ${_FIRST_ARG} ${ARGN} )
+ cmake_parse_arguments( _p "${options}" "${single_value_args}" "${multi_value_args}" ${_FIRST_ARG} ${ARGN} )
- if(_PAR_UNPARSED_ARGUMENTS)
- ecbuild_critical("Unknown keywords given to ecbuild_check_cxx11(): \"${_PAR_UNPARSED_ARGUMENTS}\"")
- endif()
+ if(_PAR_UNPARSED_ARGUMENTS)
+ ecbuild_critical("Unknown keywords given to ecbuild_check_cxx11(): \"${_PAR_UNPARSED_ARGUMENTS}\"")
+ endif()
- include( ${ECBUILD_MACROS_DIR}/contrib/GreatCMakeCookOff/CheckCXX11Features.cmake )
+ include( ${ECBUILD_MACROS_DIR}/contrib/GreatCMakeCookOff/CheckCXX11Features.cmake )
- cxx11_find_all_features( ALL_FEATURES ) # list all available features to check
+ cxx11_find_all_features( ALL_FEATURES ) # list all available features to check
- # Save CXX flags
- set( CXX_FLAGS_SNASHOT ${CMAKE_CXX_FLAGS} )
+ # Save CXX flags
+ set( CXX_FLAGS_SNASHOT ${CMAKE_CXX_FLAGS} )
- # Add C++11 flags
- include( ${ECBUILD_MACROS_DIR}/ecbuild_get_cxx11_flags.cmake )
- ecbuild_get_cxx11_flags( CXX11_FLAGS )
- set( CMAKE_CXX_FLAGS "${CXX11_FLAGS} ${CMAKE_CXX_FLAGS}" )
+ # Add C++11 flags
+ include( ${ECBUILD_MACROS_DIR}/ecbuild_get_cxx11_flags.cmake )
+ ecbuild_get_cxx11_flags( CXX11_FLAGS )
+ ecbuild_debug( "ecbuild_check_cxx11: detected C++11 flag as ${CXX11_FLAGS}" )
+ set( CMAKE_CXX_FLAGS "${CXX11_FLAGS} ${CMAKE_CXX_FLAGS}" )
- if( NOT _p_FEATURES AND NOT _p_REQUIRED ) # no input, then search for all features
+ if( NOT _p_FEATURES AND NOT _p_REQUIRED ) # no input, then search for all features
- cxx11_feature_check()
+ cxx11_feature_check()
- else()
+ else()
- foreach( _f ${_p_FEATURES} )
- cxx11_feature_check( ${_f} )
- endforeach()
+ foreach( _f ${_p_FEATURES} )
+ cxx11_feature_check( ${_f} )
+ endforeach()
- foreach( _f ${_p_REQUIRED} )
- cxx11_feature_check( REQUIRED ${_f} )
- endforeach()
+ foreach( _f ${_p_REQUIRED} )
+ cxx11_feature_check( REQUIRED ${_f} )
+ endforeach()
- endif()
+ endif()
- # Restore CXX flags
- set( CMAKE_CXX_FLAGS ${CXX_FLAGS_SNAPSHOT} )
+ # Restore CXX flags
+ set( CMAKE_CXX_FLAGS ${CXX_FLAGS_SNAPSHOT} )
- if( _p_FEATURES OR _p_REQUIRED )
- set( CXX11_CHECKED_FEATURES ${_p_FEATURES} ${_p_REQUIRED} )
- else()
- set( CXX11_CHECKED_FEATURES ${ALL_FEATURES} )
- endif()
+ if( _p_FEATURES OR _p_REQUIRED )
+ set( CXX11_CHECKED_FEATURES ${_p_FEATURES} ${_p_REQUIRED} )
+ else()
+ set( CXX11_CHECKED_FEATURES ${ALL_FEATURES} )
+ endif()
- foreach( f ${CXX11_CHECKED_FEATURES} )
- string( TOUPPER ${f} FEAT )
- if( HAS_CXX11_${FEAT} )
- list( APPEND CXX11_SUPPORTED_FEATURES ${f} )
- else()
- list( APPEND CXX11_NOT_SUPPORTED_FEATURES ${f} )
- endif()
- endforeach()
+ foreach( f ${CXX11_CHECKED_FEATURES} )
+ string( TOUPPER ${f} FEAT )
+ if( HAS_CXX11_${FEAT} )
+ list( APPEND CXX11_SUPPORTED_FEATURES ${f} )
+ else()
+ list( APPEND CXX11_NOT_SUPPORTED_FEATURES ${f} )
+ endif()
+ endforeach()
if( CXX11_CHECKED_FEATURES )
list( SORT CXX11_CHECKED_FEATURES )
- endif()
- if( CXX11_SUPPORTED_FEATURES )
- list( SORT CXX11_SUPPORTED_FEATURES )
- endif()
- if( CXX11_NOT_SUPPORTED_FEATURES )
- list( SORT CXX11_NOT_SUPPORTED_FEATURES )
- endif()
-
- set( CXX11_CHECKED_FEATURES ${CXX11_CHECKED_FEATURES} PARENT_SCOPE )
- set( CXX11_SUPPORTED_FEATURES ${CXX11_SUPPORTED_FEATURES} PARENT_SCOPE )
- set( CXX11_NOT_SUPPORTED_FEATURES ${CXX11_NOT_SUPPORTED_FEATURES} PARENT_SCOPE )
-
- if( _p_PRINT )
- if( CXX11_CHECKED_FEATURES )
- join( CXX11_CHECKED_FEATURES " " CXX11_CHECKED_FEATURES_STR )
- ecbuild_info( "Checked C++11 features: ${CXX11_CHECKED_FEATURES_STR}" )
- else()
- ecbuild_info( "Checked no C++11 features" )
- endif()
- if( CXX11_SUPPORTED_FEATURES )
- join( CXX11_SUPPORTED_FEATURES " " CXX11_SUPPORTED_FEATURES_STR )
- ecbuild_info( "Found C++11 features: ${CXX11_SUPPORTED_FEATURES_STR}" )
- else()
- ecbuild_info( "Found no C++11 features" )
- endif()
- if( CXX11_NOT_SUPPORTED_FEATURES )
- join( CXX11_NOT_SUPPORTED_FEATURES " " CXX11_NOT_SUPPORTED_FEATURES_STR )
- ecbuild_info( "Not found C++11 features: ${CXX11_NOT_SUPPORTED_FEATURES_STR}" )
- else()
- ecbuild_info( "Found all checked C++11 features" )
- endif()
- endif()
+ endif()
+ if( CXX11_SUPPORTED_FEATURES )
+ list( SORT CXX11_SUPPORTED_FEATURES )
+ endif()
+ if( CXX11_NOT_SUPPORTED_FEATURES )
+ list( SORT CXX11_NOT_SUPPORTED_FEATURES )
+ endif()
+
+ set( CXX11_CHECKED_FEATURES ${CXX11_CHECKED_FEATURES} PARENT_SCOPE )
+ set( CXX11_SUPPORTED_FEATURES ${CXX11_SUPPORTED_FEATURES} PARENT_SCOPE )
+ set( CXX11_NOT_SUPPORTED_FEATURES ${CXX11_NOT_SUPPORTED_FEATURES} PARENT_SCOPE )
+
+ if( _p_PRINT )
+ if( CXX11_CHECKED_FEATURES )
+ join( CXX11_CHECKED_FEATURES " " CXX11_CHECKED_FEATURES_STR )
+ ecbuild_info( "Checked C++11 features: ${CXX11_CHECKED_FEATURES_STR}" )
+ else()
+ ecbuild_info( "Checked no C++11 features" )
+ endif()
+ if( CXX11_SUPPORTED_FEATURES )
+ join( CXX11_SUPPORTED_FEATURES " " CXX11_SUPPORTED_FEATURES_STR )
+ ecbuild_info( "Found C++11 features: ${CXX11_SUPPORTED_FEATURES_STR}" )
+ else()
+ ecbuild_info( "Found no C++11 features" )
+ endif()
+ if( CXX11_NOT_SUPPORTED_FEATURES )
+ join( CXX11_NOT_SUPPORTED_FEATURES " " CXX11_NOT_SUPPORTED_FEATURES_STR )
+ ecbuild_info( "Not found C++11 features: ${CXX11_NOT_SUPPORTED_FEATURES_STR}" )
+ else()
+ ecbuild_info( "Found all checked C++11 features" )
+ endif()
+ endif()
endfunction( ecbuild_check_cxx11 )
diff --git a/cmake/ecbuild_define_paths.cmake b/cmake/ecbuild_define_paths.cmake
index 856903d..6584b26 100644
--- a/cmake/ecbuild_define_paths.cmake
+++ b/cmake/ecbuild_define_paths.cmake
@@ -1,8 +1,8 @@
# (C) Copyright 1996-2016 ECMWF.
-#
+#
# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# In applying this licence, ECMWF does not waive the privileges and immunities
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+# In applying this licence, ECMWF does not waive the privileges and immunities
# granted to it by virtue of its status as an intergovernmental organisation nor
# does it submit to any jurisdiction.
@@ -15,17 +15,22 @@ file( MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/lib )
# setup library building rpaths (both in build dir and then when installed)
-set( CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE ) # add the automatic parts to RPATH which point to dirs outside build tree
+# add the automatic parts to RPATH which point to dirs outside build tree
+set( CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE )
# use RPATHs for the build tree
set( CMAKE_SKIP_BUILD_RPATH FALSE )
-if( ENABLE_RELATIVE_RPATHS )
- # when building, use the install RPATH immedietly
- set( CMAKE_BUILD_WITH_INSTALL_RPATH TRUE )
+# If INSTALL_LIB_DIR is set to anything other than lib, the relative install
+# RPATH is wrong in the build tree
+if( ENABLE_RELATIVE_RPATHS AND (NOT INSTALL_LIB_DIR OR INSTALL_LIB_DIR STREQUAL "lib") )
+ # when building, use the install RPATH immediately (we don't want to relink)
+ set( CMAKE_BUILD_WITH_INSTALL_RPATH TRUE )
+ ecbuild_debug( "Building with install RPATH" )
else()
- # when building, don't use the install RPATH yet, but later on when installing
- set( CMAKE_BUILD_WITH_INSTALL_RPATH FALSE )
+ # when building, don't use the install RPATH yet, but later on when installing
+ set( CMAKE_BUILD_WITH_INSTALL_RPATH FALSE )
+ ecbuild_debug( "Not building with install RPATH, need to relink when installing" )
endif()
# Always include srcdir and builddir in include path
diff --git a/cmake/ecbuild_find_omp.cmake b/cmake/ecbuild_find_omp.cmake
index 47c05c2..914da24 100644
--- a/cmake/ecbuild_find_omp.cmake
+++ b/cmake/ecbuild_find_omp.cmake
@@ -30,7 +30,7 @@ macro( lookup_omp_flags )
#ifdef _OPENMP
#pragma omp parallel
{
- int id = omp_get_thread_num();
+ (void)omp_get_thread_num();
}
return 0;
#else
@@ -53,7 +53,7 @@ macro( lookup_omp_flags )
#pragma omp parallel
{
// This pragma should have passed compilation
- int id = 0;
+ (void)0;
}
return 0;
#endif
diff --git a/cmake/ecbuild_get_test_data.cmake b/cmake/ecbuild_get_test_data.cmake
index d908399..42185f1 100644
--- a/cmake/ecbuild_get_test_data.cmake
+++ b/cmake/ecbuild_get_test_data.cmake
@@ -241,6 +241,7 @@ endfunction(ecbuild_get_test_data)
# ecbuild_get_test_multidata( NAMES <name1> [ <name2> ... ]
# TARGET <target>
# [ DIRNAME <dir> ]
+# [ LABELS <label1> [<label2> ...] ]
# [ EXTRACT ]
# [ NOCHECK ] )
#
@@ -258,6 +259,14 @@ endfunction(ecbuild_get_test_data)
# DIRNAME : optional, defaults to <project>/<relative path to current dir>
# directory in which the test data resides
#
+# LABELS : optional
+# list of labels to assign to the test
+#
+# Lower case project name and ``download_data`` are always added as labels.
+#
+# This allows selecting tests to run via ``ctest -L <regex>`` or tests
+# to exclude via ``ctest -LE <regex>``.
+#
# EXTRACT : optional
# extract downloaded files (supported archives: tar, zip, tar.gz, tar.bz2)
#
@@ -303,7 +312,7 @@ function( ecbuild_get_test_multidata )
set( options EXTRACT NOCHECK )
set( single_value_args TARGET DIRNAME )
- set( multi_value_args NAMES )
+ set( multi_value_args NAMES LABELS )
cmake_parse_arguments( _p "${options}" "${single_value_args}" "${multi_value_args}" ${_FIRST_ARG} ${ARGN} )
@@ -386,6 +395,9 @@ endfunction()\n\n" )
if( ENABLE_TESTS )
add_test( NAME ${_p_TARGET} COMMAND ${CMAKE_COMMAND} -P ${_script} )
+ set( _p_LABELS ${PROJECT_NAME_LOWCASE} download_data ${_p_LABELS} )
+ list( REMOVE_DUPLICATES _p_LABELS )
+ set_property( TEST ${_p_TARGET} APPEND PROPERTY LABELS "${_p_LABELS}" )
endif()
endfunction(ecbuild_get_test_multidata)
diff --git a/cmake/ecbuild_log.cmake b/cmake/ecbuild_log.cmake
index f982d07..32a1398 100644
--- a/cmake/ecbuild_log.cmake
+++ b/cmake/ecbuild_log.cmake
@@ -62,7 +62,7 @@
#
##############################################################################
-# Define colour escape sequences (https://stackoverflow.com/a/19578320/396967)
+# Define colour escape sequences (not available on Windows)
if(NOT (WIN32 OR ECBUILD_NO_COLOUR))
string(ASCII 27 Esc)
set(ColourReset "${Esc}[m")
diff --git a/notebook/WCS.ipynb b/notebook/WCS.ipynb
new file mode 100644
index 0000000..6b51541
--- /dev/null
+++ b/notebook/WCS.ipynb
@@ -0,0 +1,156 @@
+{
+ "cells": [
+ {
+ "cell_type": "code",
+ "execution_count": 1,
+ "metadata": {
+ "collapsed": false
+ },
+ "outputs": [],
+ "source": [
+ "# Load required libraries\n",
+ "\n",
+ "import requests\n",
+ "import numpy as np\n",
+ "import os\n",
+ "\n",
+ "from Magics import toolbox as magics\n",
+ "from ipywidgets import interact\n",
+ "import ipywidgets as widgets\n"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": 2,
+ "metadata": {
+ "collapsed": false,
+ "scrolled": true
+ },
+ "outputs": [
+ {
+ "data": {
+ "image/png": "iVBORw0KGgoAAAANSUhEUgAAAyAAAAI2CAIAAAAn6nsNAAAABmJLR0QA/wD/AP+gvaeTAAAgAElE\nQVR4nOzdd3xb1fk/8HO1tyXvGSeOnUE2YWVAQwhQSkgLHZRSoFAa2nRCx7df+qOL0tIBdJC2hPYb\nWqA0bQOUhA0hIRASMpyYLM94b9mytce99/eHjCxrXklX697P+5U/5KOrc0+sxH50znmeQ7EsSwAA\nAACAP5JsDwAAAABAaBBgAQAAAPAMARYAAAAAzxBgAQAAAPAMARYAAAAAzxBgAQAAAPAMARYAAAAA\nzxBgAQAAAPAMARYAAAAAzxBgAQAAAPAMARYAAAAAzxBgAQAAAPAMARYAAAAAzxBgAQAAAPAMARYA\nAAAAzxBgAQAAAPAMARYAAAAAzxBgAQAAAPAMARYAAAAAzxBgAQAAAPAMARYAAAAAzxBgAQAAAPAM\nARYA [...]
+ "text/plain": [
+ "<IPython.core.display.Image object>"
+ ]
+ },
+ "metadata": {},
+ "output_type": "display_data"
+ },
+ {
+ "data": {
+ "text/plain": [
+ "<function __main__.graph>"
+ ]
+ },
+ "execution_count": 2,
+ "metadata": {},
+ "output_type": "execute_result"
+ }
+ ],
+ "source": [
+ "\n",
+ "def graph (lat, lon, param, color, style) :\n",
+ " url_fmt = 'http://earthserver.ecmwf.int/rasdaman/ows?service=WCS&version=2.0.1' \\\n",
+ " '&request=ProcessCoverages' \\\n",
+ " '&query=for c in (%s) return encode(c[Lat(%s), Long(%s), ansi(\"%s\":\"%s\")], \"csv\") '\n",
+ "\n",
+ " url = url_fmt%(param, lat, lon, \"2000-01-01T00:00:00+00:00\",\"2005-12-31T00:00:00+00:00\")\n",
+ " \n",
+ " r= requests.get(url,\n",
+ " proxies={'http':None}\n",
+ " )\n",
+ "\n",
+ " r.raise_for_status()\n",
+ "\n",
+ " # Store the requested data in a numpy array\n",
+ " yy = np.array(eval(r.text.replace('{','[').replace('}',']')))\n",
+ " xx = range(len(yy))\n",
+ " \n",
+ " \n",
+ " \n",
+ " return magics.graph(yy, xx, \n",
+ " title = \"Time series %s at %d/%d\" % ( param , lat, lon), \n",
+ " graph = { \"graph_line_colour\" : color, \"graph_line_style\" : style },\n",
+ " )\n",
+ " \n",
+ "# , \n",
+ "\n",
+ "interact(graph, lon=widgets.IntSlider(min=-180,max=180,step=1,value=10,continuous_update=False),\n",
+ " lat=widgets.IntSlider(min=-90,max=90,step=1,value=10,continuous_update=False),\n",
+ " param = widgets.Dropdown(\n",
+ " options=['temp2m', 'precipitation', ],\n",
+ " value='temp2m',\n",
+ " ),\n",
+ " color = widgets.Dropdown(\n",
+ " options=[ \"ecmwf_blue\", 'navy', 'evergreen', ],\n",
+ " value='ecmwf_blue',),\n",
+ " style = widgets.Dropdown(\n",
+ " options=[ \"solid\", 'dash', 'dot', ],\n",
+ " value='solid',) \n",
+ " )\n"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {
+ "collapsed": true
+ },
+ "outputs": [],
+ "source": []
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {
+ "collapsed": true
+ },
+ "outputs": [],
+ "source": []
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {
+ "collapsed": true
+ },
+ "outputs": [],
+ "source": []
+ }
+ ],
+ "metadata": {
+ "celltoolbar": "Edit Metadata",
+ "kernelspec": {
+ "display_name": "Python 2",
+ "language": "python",
+ "name": "python2"
+ },
+ "language_info": {
+ "codemirror_mode": {
+ "name": "ipython",
+ "version": 2
+ },
+ "file_extension": ".py",
+ "mimetype": "text/x-python",
+ "name": "python",
+ "nbconvert_exporter": "python",
+ "pygments_lexer": "ipython2",
+ "version": "2.7.12"
+ },
+ "widgets": {
+ "state": {
+ "e2ad91f584b549f08bcd6ff26212b574": {
+ "views": [
+ {
+ "cell_index": 1
+ }
+ ]
+ }
+ },
+ "version": "1.2.0"
+ }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 0
+}
diff --git a/notebook/epsgrams.ipynb b/notebook/epsgrams.ipynb
new file mode 100644
index 0000000..83ac80b
--- /dev/null
+++ b/notebook/epsgrams.ipynb
@@ -0,0 +1,304 @@
+{
+ "cells": [
+ {
+ "cell_type": "code",
+ "execution_count": 1,
+ "metadata": {
+ "collapsed": false
+ },
+ "outputs": [],
+ "source": [
+ "from ecmwfapi import ECMWFService\n",
+ "from Magics import toolbox as magics\n",
+ "import ipywidgets as widgets\n",
+ "from ipywidgets import interact, interactive, fixed\n",
+ "\n",
+ "import random\n",
+ "from datetime import date, timedelta\n"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": 5,
+ "metadata": {
+ "collapsed": false
+ },
+ "outputs": [],
+ "source": [
+ "def data(meteogram, parameter):\n",
+ " yesterday = date.today() - timedelta(1)\n",
+ " print yesterday.strftime('%Y%m%d')\n",
+ " print meteogram, parameter\n",
+ " json = \"%s.json\"\n",
+ " key = {\n",
+ " \"url\" : \"https://api.ecmwf.int/v1\",\n",
+ " \"key\" : \"83253855c912864513eb33f5fb1de322\",\n",
+ " \"email\" : \"Sylvie.Lamy-Thepaut at ecmwf.int\"\n",
+ " }\n",
+ "\n",
+ "\n",
+ " lat = random.randrange(-90, 90)\n",
+ " lon = random.randrange(-180, 180)\n",
+ "\n",
+ " server = ECMWFService(\"meteogram\", verbose=True, **key)\n",
+ "\n",
+ " yesterday = date.today() - timedelta(0)\n",
+ " print yesterday.strftime('%Y%m%d')\n",
+ "\n",
+ "\n",
+ " request = {\n",
+ " \"meteogram\": meteogram,\n",
+ " \"param\": parameter,\n",
+ " \"location\": \"%f/%f\" % (lat, lon),\n",
+ " \"date\": yesterday.strftime('%Y%m%d'),\n",
+ " \"time\": \"0000\"\n",
+ " }\n",
+ " \n",
+ " server.execute( request, json % parameter )\n"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": 6,
+ "metadata": {
+ "collapsed": false
+ },
+ "outputs": [
+ {
+ "name": "stdout",
+ "output_type": "stream",
+ "text": [
+ "20161031\n",
+ "10days 2t\n",
+ "20161101\n",
+ "2016-11-01 15:16:31 ECMWF API python library 1.4.1\n",
+ "2016-11-01 15:16:31 ECMWF API at https://api.ecmwf.int/v1\n",
+ "GET https://api.ecmwf.int/v1/who-am-i\n",
+ "Code 200\n",
+ "Content-Type application/json\n",
+ "Content-Length None\n",
+ "Location None\n",
+ "{\n",
+ " \"first_name\": \"Sylvie\", \n",
+ " \"last_name\": \"Lamy-Thepaut\", \n",
+ " \"uid\": \"cgs\", \n",
+ " \"code\": 200, \n",
+ " \"full_name\": \"Sylvie Lamy-Thepaut\", \n",
+ " \"email\": \"Sylvie.Lamy-Thepaut at ecmwf.int\"\n",
+ "}\n",
+ "Status None\n",
+ "2016-11-01 15:16:31 Welcome Sylvie Lamy-Thepaut\n",
+ "GET https://api.ecmwf.int/v1/services/meteogram/news\n",
+ "Code 200\n",
+ "Content-Type application/json\n",
+ "Content-Length None\n",
+ "Location None\n",
+ "{\n",
+ " \"news\": \"Welcome to ECMWF Web API Meteogram Service\\r\\n\", \n",
+ " \"code\": 200\n",
+ "}\n",
+ "Status None\n",
+ "2016-11-01 15:16:31 Welcome to ECMWF Web API Meteogram Service\n",
+ "2016-11-01 15:16:31 \n",
+ "POST https://api.ecmwf.int/v1/services/meteogram/requests\n",
+ "Code 303\n",
+ "Content-Type application/json\n",
+ "Content-Length None\n",
+ "Location http://stream.ecmwf.int/data/atls01/data/data01/scratch/meteogram_data-atls01-95e2cf679cd58ee9b4db4dd119a05a8d-sY8zgm.json\n",
+ "{\n",
+ " \"status\": \"complete\", \n",
+ " \"code\": 303, \n",
+ " \"name\": \"e66af64d-b2d0-415c-a28b-18da5ecd466c\", \n",
+ " \"href\": \"http://stream.ecmwf.int/data/atls01/data/data01/scratch/meteogram_data-atls01-95e2cf679cd58ee9b4db4dd119a05a8d-sY8zgm.json\", \n",
+ " \"type\": \"application/json\", \n",
+ " \"size\": 11504\n",
+ "}\n",
+ "Status complete\n",
+ "2016-11-01 15:16:33 Request submitted\n",
+ "2016-11-01 15:16:33 Request id: e66af64d-b2d0-415c-a28b-18da5ecd466c\n",
+ "2016-11-01 15:16:33 Request is complete\n",
+ "2016-11-01 15:16:33 Transfering 11.2344 Kbytes into 2t.json\n",
+ "2016-11-01 15:16:33 From http://stream.ecmwf.int/data/atls01/data/data01/scratch/meteogram_data-atls01-95e2cf679cd58ee9b4db4dd119a05a8d-sY8zgm.json\n",
+ "2016-11-01 15:16:33 Transfer rate 904.978 Kbytes/s\n",
+ "2016-11-01 15:16:33 Done.\n"
+ ]
+ },
+ {
+ "data": {
+ "image/png": "iVBORw0KGgoAAAANSUhEUgAAAyAAAAI2CAIAAAAn6nsNAAAABmJLR0QA/wD/AP+gvaeTAAAgAElE\nQVR4nOzdd1gUV9cA8LPL0puAiqAICAoCVqqKaERR7EQBC8FObC8aY+wtaoK9V4wiFoxiATsRbFRR\nVCz03ntbFpZt8/0xfhtemoCLu8x7fs8+T9g7d+69M0OW4527Z2gEQQBCCCGEEBIdurgHgBBCCCFE\nNRhgIYQQQgiJGAZYCCGEEEIihgEWQgghhJCIYYCFEEIIISRiGGAhhBBCCIkYBlgIIYQQQiKGARZC\nCCGEkIhhgIUQQgghJGIYYCGEEEIIiRgGWAghhBBCIoYBFkIIIYSQiGGAhRBCCCEkYhhgIYQQQgiJ\nGAZYCCGEEEIihgEWQgghhJCIYYCFEEIIISRiGGAhhBBCCIkYBlgIIYQQQiKGARZCCCGEkIhhgIUQ\nQggh [...]
+ "text/plain": [
+ "<IPython.core.display.Image object>"
+ ]
+ },
+ "metadata": {},
+ "output_type": "display_data"
+ }
+ ],
+ "source": [
+ "\n",
+ "\n",
+ "colour = widgets.ColorPicker(\n",
+ " concise= False,\n",
+ " description='Pick a color',\n",
+ " value='blue'\n",
+ ")\n",
+ "colour.layout.width = \"50%\"\n",
+ "meteogram = widgets.Dropdown(\n",
+ " options=['10days', '15days'],\n",
+ " value='10days',\n",
+ " description='meteogran:',\n",
+ " disabled=False,\n",
+ " button_style='' # 'success', 'info', 'warning', 'danger' or ''\n",
+ ")\n",
+ "\n",
+ "parameter = widgets.Dropdown(\n",
+ " options=['2t', \"tcc\", \"10fg6\", \"hcc\", \"lcc\", \"mcc\", \"sf\", \"tp\", \"ws\"],\n",
+ " value='2t',\n",
+ " description='Parameter:',\n",
+ " disabled=False,\n",
+ " button_style='' # 'success', 'info', 'warning', 'danger' or ''\n",
+ ")\n",
+ "\n",
+ "def epsgram(meteogram, parameter, colour):\n",
+ " data(meteogram, parameter)\n",
+ " return magics.epsgram(parameter, \n",
+ " \"%s.json\" % parameter, \n",
+ " title = \"My title for %s\" % (parameter), \n",
+ " colour = colour)\n",
+ "\n",
+ "from IPython.display import display\n",
+ "\n",
+ "ui = interactive(epsgram, meteogram=meteogram, parameter = parameter, colour=colour)\n",
+ "\n",
+ "box = widgets.VBox(ui.children)\n",
+ "display(box)\n",
+ "\n",
+ "\n",
+ "\n"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {
+ "collapsed": true
+ },
+ "outputs": [],
+ "source": []
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {
+ "collapsed": false
+ },
+ "outputs": [],
+ "source": []
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {
+ "collapsed": false
+ },
+ "outputs": [],
+ "source": []
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {
+ "collapsed": false
+ },
+ "outputs": [],
+ "source": [
+ "\n"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {
+ "collapsed": true
+ },
+ "outputs": [],
+ "source": []
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {
+ "collapsed": true
+ },
+ "outputs": [],
+ "source": []
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {
+ "collapsed": true
+ },
+ "outputs": [],
+ "source": []
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {
+ "collapsed": true
+ },
+ "outputs": [],
+ "source": []
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {
+ "collapsed": true
+ },
+ "outputs": [],
+ "source": []
+ }
+ ],
+ "metadata": {
+ "kernelspec": {
+ "display_name": "Python 2",
+ "language": "python",
+ "name": "python2"
+ },
+ "language_info": {
+ "codemirror_mode": {
+ "name": "ipython",
+ "version": 2
+ },
+ "file_extension": ".py",
+ "mimetype": "text/x-python",
+ "name": "python",
+ "nbconvert_exporter": "python",
+ "pygments_lexer": "ipython2",
+ "version": "2.7.12"
+ },
+ "widgets": {
+ "state": {
+ "b4420652ae1447a1bed6f953098f9e77": {
+ "views": [
+ {
+ "cell_index": 4
+ }
+ ]
+ },
+ "c1d9e98c8af74b34b18d52c87bd266c5": {
+ "views": [
+ {
+ "cell_index": 4
+ }
+ ]
+ }
+ },
+ "version": "1.2.0"
+ }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 1
+}
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index f5585f5..1038965 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -10,6 +10,7 @@ if( HAVE_PYTHON )
# configure_file ensures the copy is triggered if the file changes
configure_file( Magics/__init__.py Magics/__init__.py COPYONLY )
configure_file( Magics/macro.py Magics/macro.py COPYONLY )
+ configure_file( Magics/toolbox.py Magics/toolbox.py COPYONLY )
configure_file( Magics/metgram.py Magics/metgram.py COPYONLY )
set( _magics_swig "_Magics${CMAKE_SHARED_LIBRARY_SUFFIX}" )
@@ -22,6 +23,6 @@ if( HAVE_PYTHON )
# Build the extension module for use in install tree with RPATH pointing to install tree
install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} setup.py build_ext --rpath ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
# Call distutils for installation
- install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} setup.py install --prefix $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
+ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} setup.py install --root \$ENV{DESTDIR}/ --prefix ${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
endif()
diff --git a/python/Magics/macro.py b/python/Magics/macro.py
index aa1fdca..9184360 100644
--- a/python/Magics/macro.py
+++ b/python/Magics/macro.py
@@ -11,359 +11,359 @@ import Magics
import numpy
class Context(object):
- def __init__(self):
- self.tmp = []
- pass
+ def __init__(self):
+ self.tmp = []
+ pass
global context
context = Context()
actions={
- "mobs": "pobs",
- "mcoast": "pcoast",
- "pcoast": "pcoast",
- "mtext": "ptext",
- "ptext": "ptext",
- "psymb": "psymb",
- "msymb": "psymb",
- "pcont": "pcont",
- "mcont": "pcont",
- "pgeo": "pgeo",
- "mgeojson": "pgeojson",
- "mgeo": "pgeo",
- "mlegend": "",
- "plegend": "",
- "mgrib": "pgrib",
- "pgrib": "pgrib",
- "mwind": "pwind",
- "pwind": "pwind",
- "mgraph": "pgraph",
- "pgraph": "pgraph",
- "maxis": "paxis",
- "paxis": "paxis",
- "minput": "pinput",
- "mtable": "ptable",
- "ptable": "ptable",
- "pboxplot": "pboxplot",
- "mboxplot": "pboxplot",
- "pinput": "pinput"
- }
+ "mobs": "pobs",
+ "mcoast": "pcoast",
+ "pcoast": "pcoast",
+ "mtext": "ptext",
+ "ptext": "ptext",
+ "psymb": "psymb",
+ "msymb": "psymb",
+ "pcont": "pcont",
+ "mcont": "pcont",
+ "pgeo": "pgeo",
+ "mgeojson": "pgeojson",
+ "mgeo": "pgeo",
+ "mlegend": "",
+ "plegend": "",
+ "mgrib": "pgrib",
+ "pgrib": "pgrib",
+ "mwind": "pwind",
+ "pwind": "pwind",
+ "mgraph": "pgraph",
+ "pgraph": "pgraph",
+ "maxis": "paxis",
+ "paxis": "paxis",
+ "minput": "pinput",
+ "mtable": "ptable",
+ "ptable": "ptable",
+ "pboxplot": "pboxplot",
+ "mboxplot": "pboxplot",
+ "pinput": "pinput"
+ }
class Action(object):
- def __init__(self, verb, action, html, args):
- self.verb = verb
- self.action = action
- self.args = args
- if ( html == "") :
- self.html = verb
- else :
- self.html = "<a href=/wiki/display/MAGP/%s target='_blank'>%s</a>" % (html, verb)
-
- def __repr__(self):
- x = ""
- for key in self.args.keys():
- x = x + " %s = '%s'\n" % (key, self.args[key])
- return x
-
- def inspect(self):
- print self
-
- def quote(self, v):
- return "\"" + v + "\""
-
- def tohtml(self, file):
- sep=""
- val="%s("%self.html
-
- for key in self.args.keys():
- if isinstance(self.args[key], str):
- if key == 'odb_data':
- Magics.setc('odb_filename', self.args[key])
- else:
- val+= '%s%s = "%s"'%(sep, key, self.args[key])
- elif isinstance(self.args[key], int):
- val += '%s%s = %d'%(sep, key, self.args[key])
- elif isinstance(self.args[key], float):
- val += '%s%s = %0.2f'%(sep, key, self.args[key])
- elif isinstance(self.args[key], list) :
- if isinstance (self.args[key][0], str):
- vval = ""
- vsep = ""
- if (len(self.args[key]) < 5 ):
- for v in self.args[key]:
- vval += vsep + self.quote(v)
- vsep = ", "
- else :
- vval = self.quote(self.args[key][0]) + ", " + self.quote(self.args[key][1]) + ",...," + self.quote(self.args[key][-2]) + ", " + self.quote(self.args[key][-1])
- vval += ""
- val+= '%s%s = [%s]'%(sep, key, vval)
- elif isinstance(self.args[key][0], int):
- vval = ""
- vsep = ""
- if (len(self.args[key]) < 5 ):
- for v in self.args[key]:
- vval += vsep + ("%df"%v)
- vsep = ", "
- else :
- vval = ("%d"%self.args[key][0]) + ", " + ("%d"%self.args[key][1]) + ",...," + ("%d"%self.args[key][-2]) + ", " + ("%d"%self.args[key][-1])
- vval += ""
- val+= '%s%s = %s'%(sep, key, vval)
- elif isinstance(self.args[key][0], float):
- vval = ""
- vsep = ""
- if (len(self.args[key]) < 5 ):
- for v in self.args[key]:
- vval += vsep + ("%0.2f"%v)
- vsep = ", "
- else :
- vval = ("%0.2f"%self.args[key][0]) + ", " + ("%0.2f"%self.args[key][1]) + ",...," + ("%0.2f"%self.args[key][-2]) + ", " + ("%0.2f"%self.args[key][-1])
-
- vval += ""
- val+= '%s%s = [%s]'%(sep, key, vval)
- elif isinstance(self.args[key], numpy.ndarray) :
- type = self.args[key].dtype
- dim = len(self.args[key].shape)
- if isinstance(self.args[key][0], int):
- if (dim == 2) :
- print "pset2i"
- else :
- print "pset1i"
- elif ( type == 'float64' or type == 'float32') :
- if (dim == 2) :
- print "pset2r"
- else :
- vval = ""
- vsep = ""
- if (len(self.args[key]) < 5 ):
- for v in self.args[key]:
- vval += vsep + ("%0.2f"%v)
- vsep = ", "
- else :
- vval = ("%0.2f"%self.args[key][0]) + ", " + ("%0.2f"%self.args[key][1]) + ",...," + ("%0.2f"%self.args[key][-2]) + ", " + ("%0.2f"%self.args[key][-1])
- vval += ""
- val+= '%s%s = [%s]'%(sep, key, vval)
- else :
- print "type???->", key
- sep=",\n\t"
-
- print >>file, val + ")\n"
-
- def tomv4(self, file):
- sep="\t"
- val="%s,\n"%self.verb.upper()
-
- for key in self.args.keys():
- if isinstance(self.args[key], str):
- if key == 'odb_data':
- Magics.setc('odb_filename', self.args[key])
- else:
- val+= '%s%s = %s'%(sep, key.upper(), self.args[key].upper())
- elif isinstance(self.args[key], int):
- val += '%s%s = %d'%(sep, key.upper(), self.args[key])
- elif isinstance(self.args[key], float):
- val += '%s%s = %0.2f'%(sep, key.upper(), self.args[key])
- elif isinstance(self.args[key], list) :
- if isinstance (self.args[key][0], str):
- vval = "["
- vsep = ""
- for v in self.args[key]:
- vval += vsep + v
- vsep = ", "
- vval += "]"
- val+= '%s%s = %s'%(sep, key.upper(), vval)
- elif isinstance(self.args[key][0], int):
- print "pset1i"
- elif isinstance(self.args[key][0], float):
- print "pset1r"
- elif isinstance(self.args[key], numpy.ndarray) :
- type = self.args[key].dtype
- dim = len(self.args[key].shape)
- if isinstance(self.args[key][0], int):
- if (dim == 2) :
- print "pset2i"
- else :
- print "pset1i"
- elif ( type == 'float64' or type == 'float32') :
- if (dim == 2) :
- print "pset2r"
- else :
- vval = "["
- vsep = ""
- for v in self.args[key]:
- vval += vsep + ("%0.2f"%v)
- vsep = ", "
- vval += "]"
- val+= '%s%s = %s'%(sep, key.upper(), vval)
-
- else :
- print "type???->", key
- sep=",\n\t"
-
- print >> file, val + "\n"
-
-
-
-
-
- def tofortran(self, f):
- if self.action == Magics.new_page :
- print >> f, '\tcall pnew("page")'
- return
- for key in self.args.keys():
- if isinstance(self.args[key], str):
- if key == 'odb_data':
- Magics.setc('odb_filename', self.args[key])
- else:
- print >> f, '\tcall psetc("%s", "%s")'%(key, self.args[key])
- elif isinstance(self.args[key], int):
- print >>f, '\tcall pseti("%s", %d)'%(key, self.args[key])
- elif isinstance(self.args[key], float):
- print >> f, '\tcall psetr("%s", %0.2f)'%(key, self.args[key])
- elif isinstance(self.args[key], list) :
- if isinstance (self.args[key][0], str):
- nb = 0
- for v in self.args[key]:
- nb = max(nb, len(v))
-
- val = "(/"
- sep = ""
- newline = 70
- for v in self.args[key]:
- val += sep + self.quote(v.ljust(nb))
- sep = ", "
- if len(val) > newline :
- sep = ",&\n\t\t"
- newline = newline + 70
- val += "/)"
- print >>f, '\tcall pset1c("%s", %s, %d)'%(key, val, len(self.args[key]))
- elif isinstance(self.args[key][0], int):
- print "pset1i"
- elif isinstance(self.args[key][0], float):
- val = "(/"
- sep = ""
- for v in self.args[key]:
- val += sep + ("%0.2f" % v)
- sep = ", "
- val += "/)"
- print >>f, '\tcall pset1r("%s", %s, %d)'%(key, val, len(self.args[key]))
- elif isinstance(self.args[key], numpy.ndarray) :
- type = self.args[key].dtype
- dim = len(self.args[key].shape)
- if isinstance(self.args[key][0], int):
- if (dim == 2) :
- print "pset2i"
- else :
- print "pset1i"
- elif ( type == 'float64' or type == 'float32') :
- if (dim == 2) :
- print "pset2r"
- else :
- val = "(/"
- sep = ""
- for v in self.args[key]:
- val += sep + ("%0.2f" % v)
- sep = ", "
- val += "/)"
- print >>f, '\tcall pset1r("%s", %s, %d)'%(key, val, len(self.args[key]))
- elif isinstance(self.args[key][0], int):
- print "pset1r"
- else :
- print "type???->", key
-
- if self.action != None and actions[self.verb] != "" and actions[self.verb] != "pinput":
- print >>f, "\tcall %s\n"%actions[self.verb]
- for key in self.args.keys():
- print >>f, "\tcall preset('%s')"%key
- print >>f, ""
-
- else:
- print >>f, ""
-
-
- def clean_object(self, obj):
-
- if type(obj) in (int, float, str, bool, numpy.float64):
- return obj
- elif type(obj) == unicode:
- return str(obj)
- elif type(obj) in (list, tuple, set, numpy.ndarray):
- if type(obj[0]) != unicode:
- return obj
- obj = list(obj)
- for i,v in enumerate(obj):
- obj[i] = self.clean_object(v)
- elif type(obj) == dict:
- for i,v in obj.iteritems():
- obj[i] = self.clean_object(v)
- else:
- print "Invalid object in data, converting to string: "
- print type(obj)
- obj = str(obj)
- return obj
-
-
- def execute(self):
-
- if ( self.action != Magics.odb) :
- self.args = self.clean_object(self.args)
- for key in self.args.keys():
- if isinstance(self.args[key], str):
- if key == 'odb_data':
- Magics.setc('odb_filename', self.args[key])
- else:
- Magics.setc(key, self.args[key])
- elif isinstance(self.args[key], int):
- Magics.seti(key, self.args[key])
- elif isinstance(self.args[key], float):
- Magics.setr(key, self.args[key])
- elif isinstance(self.args[key], list) :
- if isinstance(self.args[key][0], str):
- Magics.set1c(key, self.args[key])
- elif isinstance(self.args[key][0], int):
- Magics.set1i(key, numpy.array(self.args[key], dtype='i'))
- elif isinstance(self.args[key][0], float):
- Magics.set1r(key, numpy.array(self.args[key]))
- elif isinstance(self.args[key], numpy.ndarray) :
- type = self.args[key].dtype
- dim = len(self.args[key].shape)
- if isinstance(self.args[key][0], int):
- if (dim == 2) :
- Magics.set2i(key, self.args[key].copy())
- else :
- Magics.set1i(key, self.args[key].copy())
- elif ( type == 'float64' or type == 'float32') :
- if (dim == 2) :
- Magics.set2r(key, self.args[key].copy())
- else :
- Magics.set1r(key, self.args[key].copy())
- else :
- print "type???->", key
-
- else:
- self.args[key].execute(key)
-
- if self.action != None :
- if self.action != Magics.new_page :
- if self.action == Magics.legend :
- Magics.setc("legend", "on")
- self.action()
- if self.action != Magics.obs and self.action != Magics.minput:
- for key in self.args.keys():
- Magics.reset(key)
- else:
- self.action("page")
+ def __init__(self, verb, action, html, args):
+ self.verb = verb
+ self.action = action
+ self.args = args
+ if ( html == "") :
+ self.html = verb
+ else :
+ self.html = "<a href=/wiki/display/MAGP/%s target='_blank'>%s</a>" % (html, verb)
+
+ def __repr__(self):
+ x = ""
+ for key in self.args.keys():
+ x = x + " %s = '%s'\n" % (key, self.args[key])
+ return x
+
+ def inspect(self):
+ print self
+
+ def quote(self, v):
+ return "\"" + v + "\""
+
+ def tohtml(self, file):
+ sep=""
+ val="%s("%self.html
+
+ for key in self.args.keys():
+ if isinstance(self.args[key], str):
+ if key == 'odb_data':
+ Magics.setc('odb_filename', self.args[key])
+ else:
+ val+= '%s%s = "%s"'%(sep, key, self.args[key])
+ elif isinstance(self.args[key], int):
+ val += '%s%s = %d'%(sep, key, self.args[key])
+ elif isinstance(self.args[key], float):
+ val += '%s%s = %0.2f'%(sep, key, self.args[key])
+ elif isinstance(self.args[key], list) :
+ if isinstance (self.args[key][0], str):
+ vval = ""
+ vsep = ""
+ if (len(self.args[key]) < 5 ):
+ for v in self.args[key]:
+ vval += vsep + self.quote(v)
+ vsep = ", "
+ else :
+ vval = self.quote(self.args[key][0]) + ", " + self.quote(self.args[key][1]) + ",...," + self.quote(self.args[key][-2]) + ", " + self.quote(self.args[key][-1])
+ vval += ""
+ val+= '%s%s = [%s]'%(sep, key, vval)
+ elif isinstance(self.args[key][0], int):
+ vval = ""
+ vsep = ""
+ if (len(self.args[key]) < 5 ):
+ for v in self.args[key]:
+ vval += vsep + ("%df"%v)
+ vsep = ", "
+ else :
+ vval = ("%d"%self.args[key][0]) + ", " + ("%d"%self.args[key][1]) + ",...," + ("%d"%self.args[key][-2]) + ", " + ("%d"%self.args[key][-1])
+ vval += ""
+ val+= '%s%s = %s'%(sep, key, vval)
+ elif isinstance(self.args[key][0], float):
+ vval = ""
+ vsep = ""
+ if (len(self.args[key]) < 5 ):
+ for v in self.args[key]:
+ vval += vsep + ("%0.2f"%v)
+ vsep = ", "
+ else :
+ vval = ("%0.2f"%self.args[key][0]) + ", " + ("%0.2f"%self.args[key][1]) + ",...," + ("%0.2f"%self.args[key][-2]) + ", " + ("%0.2f"%self.args[key][-1])
+
+ vval += ""
+ val+= '%s%s = [%s]'%(sep, key, vval)
+ elif isinstance(self.args[key], numpy.ndarray) :
+ type = self.args[key].dtype
+ dim = len(self.args[key].shape)
+ if isinstance(self.args[key][0], int):
+ if (dim == 2) :
+ print "pset2i"
+ else :
+ print "pset1i"
+ elif ( type == 'float64' or type == 'float32') :
+ if (dim == 2) :
+ print "pset2r"
+ else :
+ vval = ""
+ vsep = ""
+ if (len(self.args[key]) < 5 ):
+ for v in self.args[key]:
+ vval += vsep + ("%0.2f"%v)
+ vsep = ", "
+ else :
+ vval = ("%0.2f"%self.args[key][0]) + ", " + ("%0.2f"%self.args[key][1]) + ",...," + ("%0.2f"%self.args[key][-2]) + ", " + ("%0.2f"%self.args[key][-1])
+ vval += ""
+ val+= '%s%s = [%s]'%(sep, key, vval)
+ else :
+ print "type???->", key
+ sep=",\n\t"
+
+ print >>file, val + ")\n"
+
+ def tomv4(self, file):
+ sep="\t"
+ val="%s,\n"%self.verb.upper()
+
+ for key in self.args.keys():
+ if isinstance(self.args[key], str):
+ if key == 'odb_data':
+ Magics.setc('odb_filename', self.args[key])
+ else:
+ val+= '%s%s = %s'%(sep, key.upper(), self.args[key].upper())
+ elif isinstance(self.args[key], int):
+ val += '%s%s = %d'%(sep, key.upper(), self.args[key])
+ elif isinstance(self.args[key], float):
+ val += '%s%s = %0.2f'%(sep, key.upper(), self.args[key])
+ elif isinstance(self.args[key], list) :
+ if isinstance (self.args[key][0], str):
+ vval = "["
+ vsep = ""
+ for v in self.args[key]:
+ vval += vsep + v
+ vsep = ", "
+ vval += "]"
+ val+= '%s%s = %s'%(sep, key.upper(), vval)
+ elif isinstance(self.args[key][0], int):
+ print "pset1i"
+ elif isinstance(self.args[key][0], float):
+ print "pset1r"
+ elif isinstance(self.args[key], numpy.ndarray) :
+ type = self.args[key].dtype
+ dim = len(self.args[key].shape)
+ if isinstance(self.args[key][0], int):
+ if (dim == 2) :
+ print "pset2i"
+ else :
+ print "pset1i"
+ elif ( type == 'float64' or type == 'float32') :
+ if (dim == 2) :
+ print "pset2r"
+ else :
+ vval = "["
+ vsep = ""
+ for v in self.args[key]:
+ vval += vsep + ("%0.2f"%v)
+ vsep = ", "
+ vval += "]"
+ val+= '%s%s = %s'%(sep, key.upper(), vval)
+
+ else :
+ print "type???->", key
+ sep=",\n\t"
+
+ print >> file, val + "\n"
+
+
+
+
+
+ def tofortran(self, f):
+ if self.action == Magics.new_page :
+ print >> f, '\tcall pnew("page")'
+ return
+ for key in self.args.keys():
+ if isinstance(self.args[key], str):
+ if key == 'odb_data':
+ Magics.setc('odb_filename', self.args[key])
+ else:
+ print >> f, '\tcall psetc("%s", "%s")'%(key, self.args[key])
+ elif isinstance(self.args[key], int):
+ print >>f, '\tcall pseti("%s", %d)'%(key, self.args[key])
+ elif isinstance(self.args[key], float):
+ print >> f, '\tcall psetr("%s", %0.2f)'%(key, self.args[key])
+ elif isinstance(self.args[key], list) :
+ if isinstance (self.args[key][0], str):
+ nb = 0
+ for v in self.args[key]:
+ nb = max(nb, len(v))
+
+ val = "(/"
+ sep = ""
+ newline = 70
+ for v in self.args[key]:
+ val += sep + self.quote(v.ljust(nb))
+ sep = ", "
+ if len(val) > newline :
+ sep = ",&\n\t\t"
+ newline = newline + 70
+ val += "/)"
+ print >>f, '\tcall pset1c("%s", %s, %d)'%(key, val, len(self.args[key]))
+ elif isinstance(self.args[key][0], int):
+ print "pset1i"
+ elif isinstance(self.args[key][0], float):
+ val = "(/"
+ sep = ""
+ for v in self.args[key]:
+ val += sep + ("%0.2f" % v)
+ sep = ", "
+ val += "/)"
+ print >>f, '\tcall pset1r("%s", %s, %d)'%(key, val, len(self.args[key]))
+ elif isinstance(self.args[key], numpy.ndarray) :
+ type = self.args[key].dtype
+ dim = len(self.args[key].shape)
+ if isinstance(self.args[key][0], int):
+ if (dim == 2) :
+ print "pset2i"
+ else :
+ print "pset1i"
+ elif ( type == 'float64' or type == 'float32') :
+ if (dim == 2) :
+ print "pset2r"
+ else :
+ val = "(/"
+ sep = ""
+ for v in self.args[key]:
+ val += sep + ("%0.2f" % v)
+ sep = ", "
+ val += "/)"
+ print >>f, '\tcall pset1r("%s", %s, %d)'%(key, val, len(self.args[key]))
+ elif isinstance(self.args[key][0], int):
+ print "pset1r"
+ else :
+ print "type???->", key
+
+ if self.action != None and actions[self.verb] != "" and actions[self.verb] != "pinput":
+ print >>f, "\tcall %s\n"%actions[self.verb]
+ for key in self.args.keys():
+ print >>f, "\tcall preset('%s')"%key
+ print >>f, ""
+
+ else:
+ print >>f, ""
+
+
+ def clean_object(self, obj):
+
+ if type(obj) in (int, float, str, bool, numpy.float64):
+ return obj
+ elif type(obj) == unicode:
+ return str(obj)
+ elif type(obj) in (list, tuple, set, numpy.ndarray):
+ if type(obj[0]) != unicode:
+ return obj
+ obj = list(obj)
+ for i,v in enumerate(obj):
+ obj[i] = self.clean_object(v)
+ elif type(obj) == dict:
+ for i,v in obj.iteritems():
+ obj[i] = self.clean_object(v)
+ else:
+ print "Invalid object in data, converting to string: "
+ print type(obj)
+ obj = str(obj)
+ return obj
+
+
+ def execute(self):
+
+ if ( self.action != Magics.odb) :
+ self.args = self.clean_object(self.args)
+ for key in self.args.keys():
+ if isinstance(self.args[key], str):
+ if key == 'odb_data':
+ Magics.setc('odb_filename', self.args[key])
+ else:
+ Magics.setc(key, self.args[key])
+ elif isinstance(self.args[key], int):
+ Magics.seti(key, self.args[key])
+ elif isinstance(self.args[key], float):
+ Magics.setr(key, self.args[key])
+ elif isinstance(self.args[key], list) :
+ if isinstance(self.args[key][0], str):
+ Magics.set1c(key, self.args[key])
+ elif isinstance(self.args[key][0], int):
+ Magics.set1i(key, numpy.array(self.args[key], dtype='i'))
+ elif isinstance(self.args[key][0], float):
+ Magics.set1r(key, numpy.array(self.args[key]))
+ elif isinstance(self.args[key], numpy.ndarray) :
+ type = self.args[key].dtype
+ dim = len(self.args[key].shape)
+ if isinstance(self.args[key][0], int):
+ if (dim == 2) :
+ Magics.set2i(key, self.args[key].copy())
+ else :
+ Magics.set1i(key, self.args[key].copy())
+ elif ( type == 'float64' or type == 'float32') :
+ if (dim == 2) :
+ Magics.set2r(key, self.args[key].copy())
+ else :
+ Magics.set1r(key, self.args[key].copy())
+ else :
+ print "type???->", key
+
+ else:
+ self.args[key].execute(key)
+
+ if self.action != None :
+ if self.action != Magics.new_page :
+ if self.action == Magics.legend :
+ Magics.setc("legend", "on")
+ self.action()
+ if self.action != Magics.obs and self.action != Magics.minput:
+ for key in self.args.keys():
+ Magics.reset(key)
+ else:
+ self.action("page")
def make_action(verb, action, html=""):
- def f(_m = None,**kw):
- args = {}
- if _m is not None:
- args.update(_m)
- args.update(kw)
- return Action(verb, action, html, args)
- return f
+ def f(_m = None,**kw):
+ args = {}
+ if _m is not None:
+ args.update(_m)
+ args.update(kw)
+ return Action(verb, action, html, args)
+ return f
mcoast = make_action("mcoast", Magics.coast, "Coastlines")
pcoast = make_action("pcoast", Magics.coast)
@@ -415,6 +415,7 @@ mgeojson = make_action("mgeojson", Magics.geojson, "GeoJSon")
mwrepjson = make_action("mwrepjson", Magics.wrepjson, "WrepJSon")
mepsinput = make_action("mepsinput", Magics.epsinput, "EpsInput")
mepscloud = make_action("mepscloud", Magics.epscloud)
+mepslight = make_action("mepslight", Magics.epslight)
mepsbar = make_action("mepsbar", Magics.epsbar)
mepswind = make_action("mepswind", Magics.epswind)
mepswave = make_action("mepswave", Magics.epswave)
@@ -427,74 +428,113 @@ mmetgraph = make_action("mmetgraph", Magics.mmetgraph)
mmetbufr = make_action("mmetbufr", Magics.mmetbufr)
def examine(*args):
- for n in args:
- try :
- n.inspect()
- except:
- break
-
-
-def plot(*args):
- Magics.init()
- for n in args:
- if isinstance(n, list):
- for nn in n:
- nn.execute()
- else:
- n.execute()
-
- #Collect the drivers!
- Magics.finalize()
- for f in context.tmp:
- if os.path.exists(f):
- os.remove(f)
+ for n in args:
+ try :
+ n.inspect()
+ except:
+ break
+
+def _execute(o):
+ if isinstance(o, list):
+ for x in o:
+ _execute(x)
+ else:
+
+ o.execute()
+
+def _plot(*args):
+ Magics.init()
+ for n in args:
+ _execute(n)
+
+ #Collect the drivers!
+ Magics.finalize()
+ for f in context.tmp:
+ if os.path.exists(f):
+ os.remove(f)
+
+
def tofortran(file, *args):
- f = open(file+".f90",'w')
- print >>f, "\tprogram magics\n"
- print >>f, "\tcall popen\n"
- for n in args:
- n.tofortran(f)
- print >>f, "\tcall pclose\n"
- print >>f, "\tend"
+ f = open(file+".f90",'w')
+ print >>f, "\tprogram magics\n"
+ print >>f, "\tcall popen\n"
+ for n in args:
+ n.tofortran(f)
+ print >>f, "\tcall pclose\n"
+ print >>f, "\tend"
def tohtml(file, *args):
- f = open(file+".html",'w')
- print >>f, "<html>"
- for n in args:
- n.tohtml(f)
- print >>f, "</html>"
+ f = open(file+".html",'w')
+ print >>f, "<html>"
+ for n in args:
+ n.tohtml(f)
+ print >>f, "</html>"
def tomv4(file, *args):
- f = open(file+".mv4",'w')
- for n in args:
- n.tomv4(f)
+ f = open(file+".mv4",'w')
+ for n in args:
+ n.tomv4(f)
class odb_filter(object):
- def __init__(self, _m = None,**kw):
- args = {}
- self.verb = "odbfilter"
- if _m is not None:
- args.update(_m)
- self.args = args
- def execute(self, key):
- file = "data%d" % numpy.random.randint(1,1000)
- odb = "%s.odb" % file
- context.tmp.append(odb)
- cmd = "odbsql -q \"" + self.args["query"] + "\" -i " + self.args["path"] + " -f newodb -o " + odb
- print cmd
- if (os.system(cmd)) :
- print "Error in filtering ODB data... Aborting"
- os.abort();
- Magics.setc('odb_filename', odb)
- def inspect(self):
- cmd = "odbsql -q \"" + self.args["query"] + "\" -i " + self.args["path"] + " -o data.ascii"
- if (os.system(cmd)) :
- print "Error in filtering ODB data... Aborting"
- os.abort();
- cmd = os.environ['ODB_REPORTER'] + " %s" % "data.ascii"
- if (os.system(cmd)) :
- print "Error in viewing ODB data... Aborting"
- os.abort();
+ def __init__(self, _m = None,**kw):
+ args = {}
+ self.verb = "odbfilter"
+ if _m is not None:
+ args.update(_m)
+ self.args = args
+ def execute(self, key):
+ file = "data%d" % numpy.random.randint(1,1000)
+ odb = "%s.odb" % file
+ context.tmp.append(odb)
+ cmd = "odbsql -q \"" + self.args["query"] + "\" -i " + self.args["path"] + " -f newodb -o " + odb
+ print cmd
+ if (os.system(cmd)) :
+ print "Error in filtering ODB data... Aborting"
+ os.abort();
+ Magics.setc('odb_filename', odb)
+ def inspect(self):
+ cmd = "odbsql -q \"" + self.args["query"] + "\" -i " + self.args["path"] + " -o data.ascii"
+ if (os.system(cmd)) :
+ print "Error in filtering ODB data... Aborting"
+ os.abort();
+ cmd = os.environ['ODB_REPORTER'] + " %s" % "data.ascii"
+ if (os.system(cmd)) :
+ print "Error in viewing ODB data... Aborting"
+ os.abort();
+
+
+import threading
+import tempfile
+
+try:
+ from IPython.display import Image
+
+ LOCK = threading.Lock()
+
+ def plot(*args):
+
+ with LOCK:
+ f, tmp = tempfile.mkstemp(".png")
+ os.close(f)
+
+ base, ext = os.path.splitext(tmp)
+
+
+
+ img = output(output_formats=["png"],
+ output_name_first_page_number='off',
+ output_name=base)
+ all = []
+ all.append(img)
+ for i in args :
+ all.append(i)
+ _plot(all)
+
+ image = Image(tmp)
+ os.unlink(tmp)
+ return image
+except ImportError:
+ plot = _plot
diff --git a/python/Magics/toolbox.py b/python/Magics/toolbox.py
new file mode 100644
index 0000000..5f6a4f3
--- /dev/null
+++ b/python/Magics/toolbox.py
@@ -0,0 +1,248 @@
+
+import macro
+
+def substitute(default, user):
+ out = default
+ if user != None:
+ for key in user:
+ out[key] = user[key]
+
+ print out
+
+ return out
+
+
+
+
+def xyplot(data, contour=None, output=None):
+
+
+ default = {
+ "contour" : { }
+ }
+
+ #Setting the cartesian view
+ projection = macro.mmap(subpage_map_projection = 'cartesian',
+ subpage_x_automatic = 'on',
+ subpage_y_automatic = 'on',
+ )
+ #Vertical axis
+ vertical = macro.maxis(axis_orientation = "vertical",
+ axis_grid = "on",
+ axis_grid_colour = "grey",
+ axis_grid_thickness = 1,
+ axis_grid_line_style = "dot")
+
+ #Horizontal axis
+ horizontal = macro.maxis(axis_orientation = "horizontal",
+ axis_grid = "on",
+ axis_grid_colour = "grey",
+ axis_grid_thickness = 1,
+ axis_grid_line_style = "dot")
+
+
+ #Define the graph
+ contour = macro.mcont( substitute(default["contour"], contour)
+ )
+ #Define the title
+ title = macro.mtext(
+ text_font_size = 0.8,
+ text_justification = "left"
+ )
+
+ return macro.plot(output, projection, vertical, horizontal, data, contour, title)
+
+def graph(x,y, title="", graph = None) :
+
+ default = {
+ "graph" : { "graph_line_colour" : "ecmwf_blue",
+ "graph_line_thickness" : 2,
+ }
+ }
+
+
+ x[0] = x[0]*1.
+ y[0] = y[0]*1.
+
+
+ #Setting the cartesian view
+ projection = macro.mmap(subpage_map_projection = 'cartesian',
+ subpage_x_automatic = 'on',
+ subpage_y_automatic = 'on',
+ )
+ #Vertical axis
+ vertical = macro.maxis(axis_orientation = "vertical",
+ axis_grid = "on",
+ axis_grid_colour = "grey",
+ axis_grid_thickness = 1,
+ axis_grid_line_style = "dot")
+
+ #Horizontal axis
+ horizontal = macro.maxis(axis_orientation = "horizontal",
+ axis_grid = "on",
+ axis_grid_colour = "grey",
+ axis_grid_thickness = 1,
+ axis_grid_line_style = "dot")
+
+ #define the input data
+ input = macro.minput(input_x_values = x,
+ input_y_values = y)
+
+ #Define the graph
+ graph = macro.mgraph( substitute(default["graph"], graph)
+ )
+ #Define the title
+ title = macro.mtext(text_lines = [title],
+ text_font_size = 0.8,
+ text_justification = "left"
+ )
+ return macro.plot(projection, vertical, horizontal, input, graph, title)
+
+
+colour = "ecmwf_blue"
+font_size = 0.35
+defaults = { "eps" :
+ {
+ "projection" : {
+ "subpage_map_projection" : 'cartesian',
+ "subpage_x_axis_type" : 'date',
+ "subpage_x_automatic" : 'on',
+ "subpage_y_axis_type" : 'regular',
+ "subpage_y_automatic" : 'on',
+ },
+ "vertical_axis" : {
+ "axis_orientation" : "vertical",
+ "axis_grid" : "on",
+ "axis_grid_colour" : "navy",
+ "axis_grid_line_style" :"dash",
+ "axis_grid_reference_level" : 0.,
+ "axis_grid_reference_thickness" : 1,
+ "axis_line" : "on",
+ "axis_line_colour" : "navy",
+ "axis_tick_colour" : "navy",
+ "axis_tick_label_colour" : "navy",
+ "axis_tick_label_height": font_size
+ },
+ "horizontal_axis" : {
+ "axis_orientation" : "horizontal",
+ "axis_date_type" : "days",
+ "axis_days_label" : "both",
+ "axis_days_label_colour" : "navy",
+ "axis_days_label_height" : font_size,
+ "axis_grid" : "on",
+ "axis_grid_colour" : "navy",
+ "axis_grid_line_style" : "dash",
+ "axis_line_colour" : "navy",
+ "axis_minor_tick" : "off",
+ "axis_minor_tick_colour=" : "navy",
+ "axis_months_label" : "off",
+ "axis_tick_colour" : "navy",
+ "axis_type" : "date",
+ "axis_years_label" : "off"
+ },
+ "epsgraph" : {
+ "eps_box_border_thickness" : 2,
+ "eps_box_width" : 1.5,
+ "eps_box_colour" : colour,
+ "eps_box_forecast_colour" : "black",
+ "eps_font_colour" :"navy",
+ "eps_legend_font_size" : font_size,
+ "eps_grey_legend" : "off",
+ "legend" :'off'
+ },
+ "epsclim" : {
+ "eps_shade_colour": colour,
+ "eps_shade_line_thickness": 4,
+ }
+ }
+ }
+
+def epsgram(parameter, input, **args):
+
+ print parameter, input, "ARGS--->", args
+
+ actions = []
+
+ projection = macro.mmap( substitute(defaults["eps"]["projection"], args.get("projection", None)) )
+
+ # define horizontal axis
+ horizontal = macro.maxis(substitute(defaults["eps"]["horizontal_axis"], args.get("horizontal_axis", None)))
+ vertical = macro.maxis(substitute(defaults["eps"]["vertical_axis"], args.get("vertical_axis", None)))
+
+
+ data = macro.mwrepjson(
+ wrepjson_family = "eps",
+ wrepjson_keyword = "eps",
+ wrepjson_input_filename = input,
+ wrepjson_parameter = parameter,
+ wrepjson_parameter_information = args.get("title", parameter),
+ wrepjson_parameter_scaling_factor = 1.,
+ )
+
+ graph = macro.mepsgraph(substitute(defaults["eps"]["epsgraph"], args.get("epsgraph", None)) )
+
+ actions.append(projection)
+ actions.append(vertical)
+ actions.append(horizontal)
+
+ print "DATA", input
+
+ if "clim" in args :
+ print "FILE--->", data
+ clim = macro.mwrepjson(
+ wrepjson_family = "eps",
+ wrepjson_keyword = "clim",
+ wrepjson_input_filename = input,
+ wrepjson_parameter = parameter,
+ wrepjson_parameter_scaling_factor = 1.,
+ wrepjson_ignore_keys = ["100"],
+ wrepjson_parameter_information = "none",
+ wrepjson_position_information = "off"
+
+ )
+ shade = macro.mepsshading(substitute(defaults["eps"]["epsclim"], args.get("epsclim", None)) )
+ actions.append(clim)
+ actions.append(shade)
+
+ actions.append(data)
+ actions.append(graph)
+
+
+ text = macro.mtext(
+ text_colour = "navy",
+ text_font_size = font_size*2,
+ text_justification = "left",
+ text_lines = ["ENS Meteogram",
+ "<json_info key='station_name'/><json_info key='location'/><json_info key='grid_point'/><json_info key='height'/>",
+ "<json_info key='product_info'/><json_info key='date'/>",
+ "<font size='0.5' colour='white'>.</font>",
+ "<json_info key='parameter_info'/>",]
+
+ )
+
+ actions.append(text)
+
+ if "output" in args != "" :
+ #Setting of the output file name
+ png = macro.output(output_formats = ['png'],
+ output_name_first_page_number = "off",
+ output_name = args["output"])
+
+ return macro._plot(
+ png,
+ actions
+ )
+
+ return macro.plot(
+ actions
+ )
+
+def epsclimgram(**kw):
+
+ print kw
+ args = {"clim" :True }
+ args.update(kw)
+ print args
+
+ return epsgram(**args)
+
diff --git a/python/Magics_interface.cc b/python/Magics_interface.cc
index d0e65b3..0728bd5 100755
--- a/python/Magics_interface.cc
+++ b/python/Magics_interface.cc
@@ -122,10 +122,13 @@ void epsgraph() {
void epscloud() {
mag_epscloud();
}
+void epslight() {
+ mag_epslight();
+}
void epsplumes() {
mag_epsplumes();
}
-
+
void epswind() {
mag_epswind();
}
diff --git a/share/ecbuild/toolchains/ecmwf-XC30-Cray.cmake b/share/ecbuild/toolchains/ecmwf-XC30-Cray.cmake
index 31a241b..c6947e8 100644
--- a/share/ecbuild/toolchains/ecmwf-XC30-Cray.cmake
+++ b/share/ecbuild/toolchains/ecmwf-XC30-Cray.cmake
@@ -20,14 +20,6 @@ set( ECBUILD_FIND_MPI OFF )
set( ECBUILD_TRUST_FLAGS ON )
####################################################################
-# MPI
-####################################################################
-
-set( MPIEXEC "aprun" )
-set( MPIEXEC_NUMPROC_FLAG "-n" )
-set( MPIEXEC_NUMTHREAD_FLAG "-d" )
-
-####################################################################
# OpenMP FLAGS
####################################################################
@@ -43,7 +35,7 @@ set( OMPSTUBS_Fortran_FLAGS "-hnoomp" )
# LINK FLAGS
####################################################################
-set( ECBUILD_C_LINK_FLAGS "-Wl,-Map,loadmap -Wl,--as-needed -Ktrap=fp" )
-set( ECBUILD_CXX_LINK_FLAGS "-Wl,-Map,loadmap -Wl,--as-needed -Ktrap=fp" )
-set( ECBUILD_Fortran_LINK_FLAGS "-Wl,-Map,loadmap -Wl,--as-needed -Ktrap=fp" )
+set( ECBUILD_C_LINK_FLAGS "-Wl,-Map,loadmap -Wl,--as-needed -Wl,--eh-frame-hdr -Ktrap=fp" )
+set( ECBUILD_CXX_LINK_FLAGS "-Wl,-Map,loadmap -Wl,--as-needed -Wl,--eh-frame-hdr -Ktrap=fp" )
+set( ECBUILD_Fortran_LINK_FLAGS "-Wl,-Map,loadmap -Wl,--as-needed -Wl,--eh-frame-hdr -Ktrap=fp" )
set( ECBUILD_CXX_IMPLICIT_LINK_LIBRARIES "$ENV{CC_X86_64}/lib/x86-64/libcray-c++-rts.so" CACHE STRING "" )
diff --git a/share/ecbuild/toolchains/ecmwf-XC30-GNU.cmake b/share/ecbuild/toolchains/ecmwf-XC30-GNU.cmake
index 3f69f06..3ea294f 100644
--- a/share/ecbuild/toolchains/ecmwf-XC30-GNU.cmake
+++ b/share/ecbuild/toolchains/ecmwf-XC30-GNU.cmake
@@ -20,14 +20,6 @@ set( ECBUILD_FIND_MPI OFF )
set( ECBUILD_TRUST_FLAGS ON )
####################################################################
-# MPI
-####################################################################
-
-set( MPIEXEC "aprun" )
-set( MPIEXEC_NUMPROC_FLAG "-n" )
-set( MPIEXEC_NUMTHREAD_FLAG "-d" )
-
-####################################################################
# OpenMP FLAGS
####################################################################
@@ -47,6 +39,6 @@ set( ECBUILD_Fortran_FLAGS_DEBUG "-ffree-line-length-none -O0 -g -fcheck=bounds
# LINK FLAGS
####################################################################
-set( ECBUILD_C_LINK_FLAGS "-Wl,-Map,load.map -Wl,--as-needed" )
-set( ECBUILD_CXX_LINK_FLAGS "-Wl,-Map,load.map -Wl,--as-needed" )
-set( ECBUILD_Fortran_LINK_FLAGS "-Wl,-Map,load.map -Wl,--as-needed" )
+set( ECBUILD_C_LINK_FLAGS "-Wl,-Map,load.map -Wl,--as-needed -Wl,--eh-frame-hdr" )
+set( ECBUILD_CXX_LINK_FLAGS "-Wl,-Map,load.map -Wl,--as-needed -Wl,--eh-frame-hdr" )
+set( ECBUILD_Fortran_LINK_FLAGS "-Wl,-Map,load.map -Wl,--as-needed -Wl,--eh-frame-hdr" )
diff --git a/share/ecbuild/toolchains/ecmwf-XC30-Intel.cmake b/share/ecbuild/toolchains/ecmwf-XC30-Intel.cmake
index 01c6267..d5fdb32 100644
--- a/share/ecbuild/toolchains/ecmwf-XC30-Intel.cmake
+++ b/share/ecbuild/toolchains/ecmwf-XC30-Intel.cmake
@@ -21,14 +21,6 @@ set( ECBUILD_FIND_MPI OFF )
set( ECBUILD_TRUST_FLAGS ON )
####################################################################
-# MPI
-####################################################################
-
-set( MPIEXEC "aprun" )
-set( MPIEXEC_NUMPROC_FLAG "-n" )
-set( MPIEXEC_NUMTHREAD_FLAG "-d" )
-
-####################################################################
# OpenMP FLAGS
####################################################################
@@ -68,6 +60,6 @@ set( ECBUILD_Fortran_FLAGS_DEBUG "-O0 -g -traceback -warn all -heap-arrays -fpe
# LINK FLAGS
####################################################################
-set( ECBUILD_C_LINK_FLAGS "-Wl,-Map,load.map -Wl,--as-needed" )
-set( ECBUILD_CXX_LINK_FLAGS "-Wl,-Map,load.map -Wl,--as-needed" )
-set( ECBUILD_Fortran_LINK_FLAGS "-Wl,-Map,load.map -Wl,--as-needed" )
+set( ECBUILD_C_LINK_FLAGS "-Wl,-Map,load.map -Wl,--as-needed -Wl,--eh-frame-hdr" )
+set( ECBUILD_CXX_LINK_FLAGS "-Wl,-Map,load.map -Wl,--as-needed -Wl,--eh-frame-hdr" )
+set( ECBUILD_Fortran_LINK_FLAGS "-Wl,-Map,load.map -Wl,--as-needed -Wl,--eh-frame-hdr" )
diff --git a/share/magics/C3S_combined.svg b/share/magics/C3S_combined.svg
new file mode 100644
index 0000000..9e8e03f
--- /dev/null
+++ b/share/magics/C3S_combined.svg
@@ -0,0 +1,581 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.1"
+ id="Layer_1"
+ x="0px"
+ y="0px"
+ viewBox="0 0 632.2 283.5"
+ style="enable-background:new 0 0 632.2 283.5;"
+ xml:space="preserve"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="C3S_combined.svg"
+ inkscape:export-filename="/Users/stephan/Downloads/Fwd C3S emblem and Copernicus logo in vector formats/C3S_combined.png"
+ inkscape:export-xdpi="300"
+ inkscape:export-ydpi="300"><metadata
+ id="metadata3614"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs3612" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1230"
+ inkscape:window-height="714"
+ id="namedview3610"
+ showgrid="true"
+ inkscape:zoom="1.36"
+ inkscape:cx="288.9821"
+ inkscape:cy="155.825"
+ inkscape:window-x="-1"
+ inkscape:window-y="5"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="Layer_1"><inkscape:grid
+ type="xygrid"
+ id="grid5315" /></sodipodi:namedview><style
+ type="text/css"
+ id="style3512">
+ .st0{fill:#9D9D9C;}
+ .st1{fill:#951932;}
+</style><g
+ id="g3558"
+ transform="matrix(0.93372216,0,0,0.93372216,164.15344,6.8776906)"><path
+ class="st1"
+ d="m 257.2,121.7 c -0.6,0.3 -1.2,0.5 -1.7,0.7 -0.5,0.2 -1.1,0.5 -1.9,0.7 -0.7,0.2 -1.4,0.4 -2.2,0.5 -0.8,0.1 -1.7,0.2 -2.6,0.2 -1.8,0 -3.4,-0.3 -4.9,-0.8 -1.5,-0.5 -2.7,-1.3 -3.8,-2.4 -1.1,-1.1 -1.9,-2.4 -2.5,-4 -0.6,-1.6 -0.9,-3.5 -0.9,-5.7 0,-2 0.3,-3.9 0.9,-5.5 0.6,-1.6 1.4,-3 2.5,-4.1 1.1,-1.1 2.3,-1.9 3.8,-2.5 1.5,-0.6 3.1,-0.8 5,-0.8 1.3,0 2.7,0.2 4,0.5 1.3,0.3 2.8,0.9 4.4,1.7 l 0,3.9 -0.2,0 c -1.4,-1.1 -2.7,-2 -4.1,-2.5 -1.3,-0.5 -2.8,-0.8 -4.3,-0.8 -1.3,0 -2.4,0.2 -3.4,0.6 [...]
+ id="path3560"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 264.7,123.5 -3.1,0 0,-25.8 3.1,0 0,25.8 z"
+ id="path3562"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 274.3,101.8 -3.5,0 0,-3.2 3.5,0 0,3.2 z m -0.2,21.7 -3.1,0 0,-18.5 3.1,0 0,18.5 z"
+ id="path3564"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 307.3,123.5 -3.1,0 0,-10.6 c 0,-0.8 0,-1.6 -0.1,-2.3 -0.1,-0.7 -0.2,-1.3 -0.5,-1.8 -0.3,-0.5 -0.6,-0.8 -1.1,-1.1 -0.5,-0.2 -1.2,-0.4 -2.1,-0.4 -0.9,0 -1.8,0.2 -2.6,0.7 -0.9,0.4 -1.8,1 -2.6,1.7 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0,0.7 0,1 l 0,11.9 -3.1,0 0,-10.6 c 0,-0.8 0,-1.6 -0.1,-2.3 -0.1,-0.7 -0.2,-1.3 -0.5,-1.8 -0.3,-0.5 -0.6,-0.8 -1.1,-1.1 -0.5,-0.2 -1.2,-0.4 -2.1,-0.4 -0.9,0 -1.7,0.2 -2.6,0.6 -0.9,0.4 -1.7,1 -2.6,1.6 l 0,13.8 -3.1,0 0,-18.5 3.1,0 0,2.1 c 1,-0.8 1.9,-1.4 2.9,- [...]
+ id="path3566"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 327.7,123.5 -3.1,0 0,-2 c -0.3,0.2 -0.7,0.5 -1.1,0.8 -0.5,0.3 -0.9,0.6 -1.4,0.8 -0.5,0.3 -1.1,0.5 -1.8,0.6 -0.7,0.2 -1.5,0.3 -2.4,0.3 -1.7,0 -3.1,-0.6 -4.3,-1.7 -1.2,-1.1 -1.7,-2.5 -1.7,-4.2 0,-1.4 0.3,-2.5 0.9,-3.4 0.6,-0.9 1.5,-1.6 2.6,-2.1 1.1,-0.5 2.5,-0.8 4.1,-1 1.6,-0.2 3.3,-0.3 5.1,-0.4 l 0,-0.5 c 0,-0.7 -0.1,-1.3 -0.4,-1.8 -0.2,-0.5 -0.6,-0.8 -1.1,-1.1 -0.4,-0.3 -1,-0.4 -1.6,-0.5 -0.6,-0.1 -1.3,-0.1 -1.9,-0.1 -0.8,0 -1.7,0.1 -2.7,0.3 -1,0.2 -2,0.5 -3.1,0.9 l -0.2,0 0, [...]
+ id="path3568"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 343.4,123.3 c -0.6,0.2 -1.2,0.3 -1.9,0.4 -0.7,0.1 -1.3,0.1 -1.9,0.1 -1.9,0 -3.3,-0.5 -4.3,-1.5 -1,-1 -1.5,-2.7 -1.5,-4.9 l 0,-9.9 -2.1,0 0,-2.6 2.1,0 0,-5.3 3.1,0 0,5.3 6.4,0 0,2.6 -6.4,0 0,8.5 c 0,1 0,1.7 0.1,2.3 0,0.5 0.2,1.1 0.5,1.5 0.2,0.4 0.6,0.8 1,1 0.4,0.2 1.1,0.3 2,0.3 0.5,0 1,-0.1 1.6,-0.2 0.6,-0.1 1,-0.3 1.2,-0.4 l 0.2,0 0,2.8 z"
+ id="path3570"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 362.7,114.5 -13.7,0 c 0,1.1 0.2,2.1 0.5,3 0.3,0.8 0.8,1.5 1.4,2.1 0.6,0.5 1.3,0.9 2.1,1.2 0.8,0.3 1.7,0.4 2.6,0.4 1.3,0 2.5,-0.3 3.8,-0.8 1.3,-0.5 2.2,-1 2.7,-1.5 l 0.2,0 0,3.4 c -1.1,0.4 -2.1,0.8 -3.2,1.1 -1.1,0.3 -2.2,0.4 -3.5,0.4 -3.1,0 -5.5,-0.8 -7.2,-2.5 -1.7,-1.7 -2.6,-4 -2.6,-7.1 0,-3 0.8,-5.4 2.5,-7.2 1.7,-1.8 3.8,-2.7 6.5,-2.7 2.5,0 4.4,0.7 5.8,2.2 1.4,1.5 2,3.5 2,6.2 l 0,1.8 z m -3.1,-2.4 c 0,-1.6 -0.4,-2.9 -1.2,-3.8 -0.8,-0.9 -2.1,-1.3 -3.7,-1.3 -1.7,0 -3,0.5 -4,1. [...]
+ id="path3572"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 257.2,162.5 c -0.6,0.3 -1.2,0.5 -1.7,0.7 -0.5,0.2 -1.1,0.5 -1.9,0.7 -0.7,0.2 -1.4,0.4 -2.2,0.5 -0.8,0.1 -1.7,0.2 -2.6,0.2 -1.8,0 -3.4,-0.3 -4.9,-0.8 -1.5,-0.5 -2.7,-1.3 -3.8,-2.4 -1.1,-1.1 -1.9,-2.4 -2.5,-4 -0.6,-1.6 -0.9,-3.5 -0.9,-5.7 0,-2 0.3,-3.9 0.9,-5.5 0.6,-1.6 1.4,-3 2.5,-4.1 1.1,-1.1 2.3,-1.9 3.8,-2.5 1.5,-0.6 3.1,-0.8 5,-0.8 1.3,0 2.7,0.2 4,0.5 1.3,0.3 2.8,0.9 4.4,1.7 l 0,3.9 -0.2,0 c -1.4,-1.1 -2.7,-2 -4.1,-2.5 -1.3,-0.5 -2.8,-0.8 -4.3,-0.8 -1.3,0 -2.4,0.2 -3.4,0.6 [...]
+ id="path3574"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 277.1,164.3 -3.1,0 0,-10.6 c 0,-0.9 -0.1,-1.7 -0.2,-2.4 -0.1,-0.7 -0.3,-1.3 -0.5,-1.8 -0.3,-0.5 -0.7,-0.8 -1.2,-1 -0.5,-0.2 -1.2,-0.3 -2,-0.3 -0.9,0 -1.7,0.2 -2.7,0.6 -0.9,0.4 -1.8,1 -2.7,1.6 l 0,13.8 -3.1,0 0,-25.8 3.1,0 0,9.3 c 1,-0.8 2,-1.4 3,-1.9 1,-0.5 2.1,-0.7 3.2,-0.7 2,0 3.5,0.6 4.6,1.8 1.1,1.2 1.6,2.9 1.6,5.2 l 0,12.2 z"
+ id="path3576"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 297.5,164.3 -3.1,0 0,-2 c -0.3,0.2 -0.7,0.5 -1.1,0.8 -0.5,0.3 -0.9,0.6 -1.4,0.8 -0.5,0.3 -1.1,0.5 -1.8,0.6 -0.7,0.2 -1.5,0.3 -2.4,0.3 -1.7,0 -3.1,-0.6 -4.3,-1.7 -1.2,-1.1 -1.7,-2.5 -1.7,-4.2 0,-1.4 0.3,-2.5 0.9,-3.4 0.6,-0.9 1.5,-1.6 2.6,-2 1.1,-0.5 2.5,-0.8 4.1,-1 1.6,-0.2 3.3,-0.3 5.1,-0.4 l 0,-0.5 c 0,-0.7 -0.1,-1.3 -0.4,-1.8 -0.2,-0.5 -0.6,-0.8 -1.1,-1.1 -0.4,-0.3 -1,-0.4 -1.6,-0.5 -0.6,-0.1 -1.3,-0.1 -1.9,-0.1 -0.8,0 -1.7,0.1 -2.7,0.3 -1,0.2 -2,0.5 -3.1,0.9 l -0.2,0 0,-3 [...]
+ id="path3578"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 319,164.3 -3.1,0 0,-10.6 c 0,-0.9 -0.1,-1.7 -0.2,-2.4 -0.1,-0.7 -0.3,-1.3 -0.5,-1.8 -0.3,-0.5 -0.7,-0.8 -1.2,-1 -0.5,-0.2 -1.2,-0.3 -2,-0.3 -0.9,0 -1.7,0.2 -2.7,0.6 -0.9,0.4 -1.8,1 -2.7,1.6 l 0,13.8 -3.1,0 0,-18.5 3.1,0 0,2.1 c 1,-0.8 2,-1.4 3,-1.9 1,-0.5 2.1,-0.7 3.2,-0.7 2,0 3.5,0.6 4.6,1.8 1.1,1.2 1.6,2.9 1.6,5.2 l 0,12.1 z"
+ id="path3580"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 340.1,162.2 c 0,3.1 -0.7,5.5 -2.1,6.9 -1.4,1.5 -3.6,2.2 -6.6,2.2 -1,0 -1.9,-0.1 -2.9,-0.2 -0.9,-0.1 -1.9,-0.3 -2.8,-0.6 l 0,-3.2 0.2,0 c 0.5,0.2 1.3,0.4 2.4,0.7 1.1,0.3 2.2,0.4 3.3,0.4 1.1,0 1.9,-0.1 2.6,-0.4 0.7,-0.3 1.2,-0.6 1.6,-1.1 0.4,-0.4 0.7,-1 0.8,-1.6 0.2,-0.6 0.3,-1.3 0.3,-2 l 0,-1.7 c -0.9,0.8 -1.8,1.3 -2.7,1.7 -0.9,0.4 -2,0.6 -3.3,0.6 -2.2,0 -4,-0.8 -5.3,-2.4 -1.3,-1.6 -2,-3.9 -2,-6.8 0,-1.6 0.2,-3 0.7,-4.1 0.4,-1.2 1.1,-2.2 1.8,-3 0.7,-0.8 1.6,-1.4 2.6,-1.8 1,-0. [...]
+ id="path3582"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 361.7,155.3 -13.7,0 c 0,1.1 0.2,2.1 0.5,3 0.3,0.8 0.8,1.5 1.4,2.1 0.6,0.5 1.3,0.9 2,1.2 0.8,0.3 1.7,0.4 2.6,0.4 1.3,0 2.5,-0.3 3.8,-0.8 1.3,-0.5 2.2,-1 2.7,-1.5 l 0.2,0 0,3.4 c -1.1,0.4 -2.1,0.8 -3.2,1.1 -1.1,0.3 -2.2,0.4 -3.5,0.4 -3.1,0 -5.5,-0.8 -7.2,-2.5 -1.7,-1.7 -2.6,-4 -2.6,-7.1 0,-3 0.8,-5.4 2.5,-7.2 1.7,-1.8 3.8,-2.7 6.5,-2.7 2.5,0 4.4,0.7 5.8,2.2 1.4,1.5 2,3.5 2,6.2 l 0,1.8 z m -3,-2.4 c 0,-1.6 -0.4,-2.9 -1.2,-3.8 -0.8,-0.9 -2,-1.3 -3.7,-1.3 -1.7,0 -3,0.5 -4,1.5 -1,1 [...]
+ id="path3584"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 396.6,157.2 c 0,1 -0.2,1.9 -0.7,2.9 -0.4,0.9 -1.1,1.7 -1.9,2.4 -0.9,0.7 -1.9,1.3 -3.1,1.7 -1.2,0.4 -2.6,0.6 -4.3,0.6 -1.8,0 -3.4,-0.2 -4.8,-0.5 -1.4,-0.3 -2.9,-0.8 -4.3,-1.5 l 0,-4.1 0.2,0 c 1.3,1 2.7,1.8 4.3,2.4 1.6,0.6 3.2,0.8 4.6,0.8 2,0 3.6,-0.4 4.8,-1.1 1.1,-0.8 1.7,-1.8 1.7,-3.1 0,-1.1 -0.3,-1.9 -0.8,-2.4 -0.5,-0.5 -1.4,-0.9 -2.4,-1.2 -0.8,-0.2 -1.7,-0.4 -2.7,-0.5 -1,-0.1 -2,-0.3 -3.1,-0.5 -2.2,-0.5 -3.8,-1.3 -4.9,-2.4 -1.1,-1.1 -1.6,-2.6 -1.6,-4.4 0,-2.1 0.9,-3.8 2.6,- [...]
+ id="path3586"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 417.2,155.3 -13.7,0 c 0,1.1 0.2,2.1 0.5,3 0.3,0.8 0.8,1.5 1.4,2.1 0.6,0.5 1.3,0.9 2,1.2 0.8,0.3 1.7,0.4 2.6,0.4 1.3,0 2.5,-0.3 3.8,-0.8 1.3,-0.5 2.2,-1 2.7,-1.5 l 0.2,0 0,3.4 c -1.1,0.4 -2.1,0.8 -3.2,1.1 -1.1,0.3 -2.2,0.4 -3.5,0.4 -3.1,0 -5.5,-0.8 -7.2,-2.5 -1.7,-1.7 -2.6,-4 -2.6,-7.1 0,-3 0.8,-5.4 2.5,-7.2 1.7,-1.8 3.8,-2.7 6.5,-2.7 2.5,0 4.4,0.7 5.8,2.2 1.4,1.5 2,3.5 2,6.2 l 0,1.8 z m -3,-2.4 c 0,-1.6 -0.4,-2.9 -1.2,-3.8 -0.8,-0.9 -2,-1.3 -3.7,-1.3 -1.7,0 -3,0.5 -4,1.5 -1,1 [...]
+ id="path3588"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 433.5,149.1 -0.2,0 c -0.5,-0.1 -0.9,-0.2 -1.4,-0.2 -0.4,-0.1 -1,-0.1 -1.6,-0.1 -1,0 -1.9,0.2 -2.8,0.6 -0.9,0.4 -1.8,1 -2.6,1.7 l 0,13.2 -3.1,0 0,-18.5 3.1,0 0,2.7 c 1.2,-1 2.3,-1.7 3.3,-2.1 0.9,-0.4 1.9,-0.6 2.9,-0.6 0.5,0 0.9,0 1.2,0 0.2,0 0.6,0.1 1.1,0.2 l 0,3.1 z"
+ id="path3590"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 452.5,145.7 -7.5,18.5 -3.1,0 -7.5,-18.5 3.4,0 5.7,14.8 5.7,-14.8 3.3,0 z"
+ id="path3592"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 459.9,142.6 -3.5,0 0,-3.2 3.5,0 0,3.2 z m -0.2,21.7 -3.1,0 0,-18.5 3.1,0 0,18.5 z"
+ id="path3594"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 479.6,163.1 c -1,0.5 -2,0.9 -3,1.2 -0.9,0.3 -1.9,0.4 -3,0.4 -1.3,0 -2.6,-0.2 -3.7,-0.6 -1.1,-0.4 -2.1,-1 -2.9,-1.8 -0.8,-0.8 -1.4,-1.8 -1.9,-3 -0.4,-1.2 -0.7,-2.6 -0.7,-4.3 0,-3 0.8,-5.4 2.5,-7.1 1.7,-1.7 3.9,-2.6 6.6,-2.6 1.1,0 2.1,0.1 3.1,0.4 1,0.3 2,0.7 2.8,1.1 l 0,3.5 -0.2,0 c -1,-0.7 -1.9,-1.3 -2.9,-1.7 -1,-0.4 -2,-0.6 -3,-0.6 -1.8,0 -3.2,0.6 -4.2,1.8 -1,1.2 -1.5,2.9 -1.5,5.2 0,2.2 0.5,4 1.5,5.2 1,1.2 2.4,1.8 4.2,1.8 0.6,0 1.3,-0.1 1.9,-0.2 0.7,-0.2 1.2,-0.4 1.8,-0.6 0.5 [...]
+ id="path3596"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 499.1,155.3 -13.7,0 c 0,1.1 0.2,2.1 0.5,3 0.3,0.8 0.8,1.5 1.4,2.1 0.6,0.5 1.3,0.9 2.1,1.2 0.8,0.3 1.7,0.4 2.6,0.4 1.3,0 2.5,-0.3 3.8,-0.8 1.3,-0.5 2.2,-1 2.7,-1.5 l 0.2,0 0,3.4 c -1.1,0.4 -2.1,0.8 -3.2,1.1 -1.1,0.3 -2.2,0.4 -3.5,0.4 -3.1,0 -5.5,-0.8 -7.2,-2.5 -1.7,-1.7 -2.6,-4 -2.6,-7.1 0,-3 0.8,-5.4 2.5,-7.2 1.7,-1.8 3.8,-2.7 6.5,-2.7 2.5,0 4.4,0.7 5.8,2.2 1.4,1.5 2,3.5 2,6.2 l 0,1.8 z m -3,-2.4 c 0,-1.6 -0.4,-2.9 -1.2,-3.8 -0.8,-0.9 -2.1,-1.3 -3.7,-1.3 -1.7,0 -3,0.5 -4,1.5 [...]
+ id="path3598"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /></g><g
+ id="g3600"
+ transform="matrix(0.4680662,0,0,0.4680662,282.43177,62.731692)"><path
+ class="st1"
+ d="m 27.2,133.2 c 0,54.1 43.4,97.9 97,97.9 15.5,0 29.9,-3.6 42.9,-10.1 0,0 0.2,-0.1 0.1,-0.4 -0.1,-0.2 -0.4,-0.1 -0.4,-0.1 -10,4 -20.6,6 -32,6 -48.8,0 -88.3,-40 -88.3,-89.4 0,-49.4 39.5,-89.4 88.3,-89.4 34.6,0 64.5,20 79,49.4 0,0 0.1,0.3 0.3,0.2 0.2,-0.1 0.1,-0.3 0.1,-0.3 C 200,60.8 165,35.4 124.1,35.4 70.6,35.3 27.2,79.1 27.2,133.2"
+ id="path3602"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 151.6,156.9 0,-40.3 6.6,0 0,40.3 c 3.4,1.3 5.8,4.6 5.8,8.4 0,5 -4,9 -9,9 -5,0 -9,-4 -9,-9 -0.1,-3.9 2.3,-7.1 5.6,-8.4"
+ id="path3604"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 167,117.3 c 0,-0.7 -0.1,-1.6 -0.2,-2.4 -0.3,-1.6 -1,-3.2 -1.9,-4.5 -1.8,-2.7 -4.6,-4.4 -7.6,-5 -3,-0.6 -6,0.1 -8.4,1.5 -2.4,1.5 -4.1,3.7 -4.9,6.2 -0.4,1.2 -0.6,2.5 -0.6,3.7 l 0.1,3 c 0.5,15.6 1.1,25.3 1.8,25.3 0.7,0 1.4,-12.5 1.9,-28.1 0,-4.1 3.4,-7.5 7.5,-7.5 4.1,0 7.5,3.4 7.5,7.5 l 0,36.2 c 0.5,0.4 1,0.9 1.6,1.3 0.3,0.3 0.5,0.4 0.7,0.6 0.4,0.4 0.8,0.8 1.2,1.3 0.7,0.9 1.3,1.9 1.8,2.9 0.9,2.1 1.3,4.4 1.1,6.6 -0.4,4.4 -3,8.3 -6.5,10.5 -3.5,2.2 -7.7,2.5 -11.2,1.5 -3.5,-1 -6.4,- [...]
+ id="path3606"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /><path
+ class="st1"
+ d="m 65.1,132.1 c 0,0 3.2,-10.8 15.6,-13.4 C 81.4,103.9 94,92 109.5,92 c 5.7,0 11.1,1.6 15.5,4.4 5.9,-10.2 17.2,-17 30.3,-17 19.1,0 34.5,14.7 34.5,32.9 0,2 -0.2,4 -0.6,6 7,0.4 11.6,4 11.6,4 3.7,2.6 5.8,5.9 7,8.7 1.2,2.8 1.4,5.2 1.4,6.8 0,1.6 -0.3,2.4 -0.5,2.4 -0.2,0 -0.4,-0.8 -0.8,-2.2 -0.4,-1.4 -1,-3.5 -2.3,-5.9 -1.4,-2.3 -3.5,-4.9 -6.7,-6.8 l 0,0 c -2.6,-1.7 -6.9,-2.7 -11.8,-2.7 -1,0 -2,0.1 -3,0.1 0.5,-2.1 0.8,-4.5 0.8,-6.8 0,-16.7 -13.3,-30.3 -29.7,-30.3 -12.9,0 -24.1,8.3 -28.2 [...]
+ id="path3608"
+ inkscape:connector-curvature="0"
+ style="fill:#951932" /></g><style
+ id="style4854"
+ type="text/css">
+ .st0{clip-path:url(#SVGID_2_);fill:url(#SVGID_3_);}
+ .st1{clip-path:url(#SVGID_5_);fill:#FFCD0D;}
+ .st2{clip-path:url(#SVGID_7_);fill:url(#SVGID_8_);}
+ .st3{clip-path:url(#SVGID_10_);fill:url(#SVGID_11_);}
+ .st4{clip-path:url(#SVGID_13_);fill:url(#SVGID_14_);}
+ .st5{clip-path:url(#SVGID_16_);fill:url(#SVGID_17_);}
+ .st6{clip-path:url(#SVGID_19_);fill:url(#SVGID_20_);}
+ .st7{clip-path:url(#SVGID_22_);fill:url(#SVGID_23_);}
+ .st8{clip-path:url(#SVGID_25_);fill:url(#SVGID_26_);}
+ .st9{clip-path:url(#SVGID_28_);fill:url(#SVGID_29_);}
+ .st10{clip-path:url(#SVGID_31_);fill:url(#SVGID_32_);}
+ .st11{fill:#285D97;}
+</style><g
+ id="g4856"
+ transform="matrix(0.46635534,0,0,0.46635534,-53.749723,-13.1677)"><defs
+ id="defs4858"><path
+ inkscape:connector-curvature="0"
+ id="SVGID_1_"
+ d="m 137.5,297.6 c 0,53.9 43.2,97.5 96.6,97.5 15.4,0 29.8,-3.6 42.7,-10.1 0,0 0.2,-0.1 0.1,-0.4 -0.1,-0.2 -0.4,-0.1 -0.4,-0.1 -9.9,3.9 -20.5,6 -31.9,6 -48.6,0 -87.9,-39.9 -87.9,-89.1 0,-49.2 39.4,-89.1 87.9,-89.1 34.5,0 64.3,19.9 78.7,49.2 0,0 0.1,0.3 0.3,0.2 0.2,-0.1 0.1,-0.4 0.1,-0.4 -14.2,-36.1 -49,-61.4 -89.8,-61.4 -53.2,0.2 -96.4,43.9 -96.4,97.7" /></defs><clipPath
+ id="SVGID_2_"><use
+ height="100%"
+ width="100%"
+ y="0"
+ x="0"
+ xlink:href="#SVGID_1_"
+ style="overflow:visible"
+ id="use4862" /></clipPath><linearGradient
+ id="SVGID_3_"
+ gradientUnits="userSpaceOnUse"
+ x1="0.002081109"
+ y1="595.2774"
+ x2="1.0021"
+ y2="595.2774"
+ gradientTransform="matrix(0,-195.0859,-195.0859,0,116360.96,395.5871)"><stop
+ offset="0"
+ style="stop-color:#226295"
+ id="stop4865" /><stop
+ offset="1"
+ style="stop-color:#78AEDF"
+ id="stop4867" /></linearGradient><rect
+ style="fill:url(#SVGID_3_)"
+ x="137.5"
+ y="200.10001"
+ class="st0"
+ width="186.5"
+ height="195.10001"
+ id="rect4869"
+ clip-path="url(#SVGID_2_)" /></g><g
+ id="g4871"
+ transform="matrix(0.46635534,0,0,0.46635534,-53.749723,-13.1677)"><defs
+ id="defs4873"><rect
+ y="0"
+ x="0"
+ id="SVGID_4_"
+ width="841.90002"
+ height="595.29999" /></defs><clipPath
+ id="SVGID_5_"><use
+ height="100%"
+ width="100%"
+ y="0"
+ x="0"
+ xlink:href="#SVGID_4_"
+ style="overflow:visible"
+ id="use4877" /></clipPath><path
+ style="fill:#ffcd0d"
+ inkscape:connector-curvature="0"
+ class="st1"
+ d="m 507.8,316.6 c -0.9,-2.2 -2.2,-4.1 -3.8,-5.8 -1.6,-1.6 -3.5,-2.9 -5.6,-3.9 -2.1,-0.9 -4.4,-1.4 -6.8,-1.4 -2.4,0 -4.6,0.5 -6.8,1.5 -2.1,1 -4,2.4 -5.6,4 -0.8,0.9 -1.6,1.8 -2.2,2.8 0,0.1 0,0.2 0,0.4 0,12 9.8,21.8 21.8,21.8 3.7,0 7.3,-0.9 10.3,-2.6 l 0,-9.9 c 0.1,-2.4 -0.4,-4.8 -1.3,-6.9"
+ id="path4879"
+ clip-path="url(#SVGID_5_)" /></g><g
+ id="g4881"
+ transform="matrix(0.46635534,0,0,0.46635534,-53.749723,-13.1677)"><defs
+ id="defs4883"><path
+ inkscape:connector-curvature="0"
+ id="SVGID_6_"
+ d="m 246.3,351.5 c -2.9,-1.3 -5.4,-3 -7.5,-5.2 -2.1,-2.2 -3.8,-4.8 -5,-7.7 -1.2,-2.9 -1.8,-6 -1.8,-9.3 0,-3.3 0.6,-6.4 1.8,-9.3 1.2,-2.9 2.9,-5.5 5,-7.7 2.1,-2.2 4.6,-3.9 7.5,-5.2 2.9,-1.3 5.9,-1.9 9.1,-1.9 3.2,0 6.2,0.6 9.1,1.9 2.9,1.3 5.4,3 7.5,5.2 2.1,2.2 3.8,4.8 5,7.7 1.2,2.9 1.8,6 1.8,9.3 0,3.3 -0.6,6.4 -1.8,9.3 -1.2,2.9 -2.9,5.5 -5,7.7 -2.1,2.2 -4.6,3.9 -7.5,5.2 -2.9,1.3 -5.9,1.9 -9.1,1.9 -3.2,0 -6.2,-0.6 -9.1,-1.9 m -3.1,-51.9 c -3.8,1.7 -7.2,4 -10,6.9 -2.9,2.9 -5.1,6.4 - [...]
+ id="SVGID_7_"><use
+ height="100%"
+ width="100%"
+ y="0"
+ x="0"
+ xlink:href="#SVGID_6_"
+ style="overflow:visible"
+ id="use4887" /></clipPath><linearGradient
+ id="SVGID_8_"
+ gradientUnits="userSpaceOnUse"
+ x1="0.00203372"
+ y1="595.27478"
+ x2="1.002"
+ y2="595.27478"
+ gradientTransform="matrix(0,-64.5586,-64.5586,0,38685.551,361.7587)"><stop
+ offset="0"
+ style="stop-color:#19294B"
+ id="stop4890" /><stop
+ offset="1"
+ style="stop-color:#284491"
+ id="stop4892" /></linearGradient><rect
+ style="fill:url(#SVGID_8_)"
+ x="223.89999"
+ y="297.10001"
+ class="st2"
+ width="63"
+ height="64.599998"
+ id="rect4894"
+ clip-path="url(#SVGID_7_)" /></g><g
+ id="g4896"
+ transform="matrix(0.46635534,0,0,0.46635534,-53.749723,-13.1677)"><defs
+ id="defs4898"><path
+ inkscape:connector-curvature="0"
+ id="SVGID_9_"
+ d="m 315,351.7 c -2.9,-1.3 -5.4,-3 -7.5,-5.2 -2.1,-2.2 -3.8,-4.8 -5,-7.7 -1.2,-2.9 -1.8,-6 -1.8,-9.3 0,-3.3 0.6,-6.4 1.8,-9.3 1.2,-2.9 2.9,-5.5 5,-7.7 2.1,-2.2 4.6,-3.9 7.5,-5.2 2.9,-1.3 5.9,-1.9 9.1,-1.9 3.2,0 6.2,0.6 9.1,1.9 2.9,1.3 5.4,3 7.5,5.2 2.1,2.2 3.8,4.8 5,7.7 1.2,2.9 1.8,6 1.8,9.3 0,3.3 -0.6,6.4 -1.8,9.3 -1.2,2.9 -2.9,5.5 -5,7.7 -2.1,2.2 -4.6,3.9 -7.5,5.2 -2.9,1.3 -5.9,1.9 -9.1,1.9 -3.2,-0.1 -6.2,-0.7 -9.1,-1.9 m -3.1,-52 c -3.8,1.7 -7.2,4 -10,6.9 -2.9,2.9 -5.1,6.4 -6 [...]
+ id="SVGID_10_"><use
+ height="100%"
+ width="100%"
+ y="0"
+ x="0"
+ xlink:href="#SVGID_9_"
+ style="overflow:visible"
+ id="use4902" /></clipPath><linearGradient
+ id="SVGID_11_"
+ gradientUnits="userSpaceOnUse"
+ x1="0.0040094149"
+ y1="595.27979"
+ x2="1.0039999"
+ y2="595.27979"
+ gradientTransform="matrix(0,-85.248,-85.248,0,51070.555,382.7759)"><stop
+ offset="0"
+ style="stop-color:#19294B"
+ id="stop4905" /><stop
+ offset="1"
+ style="stop-color:#284491"
+ id="stop4907" /></linearGradient><rect
+ style="fill:url(#SVGID_11_)"
+ x="292.60001"
+ y="297.20001"
+ class="st3"
+ width="63"
+ height="85.199997"
+ id="rect4909"
+ clip-path="url(#SVGID_10_)" /></g><g
+ id="g4911"
+ transform="matrix(0.46635534,0,0,0.46635534,-53.749723,-13.1677)"><defs
+ id="defs4913"><path
+ inkscape:connector-curvature="0"
+ id="SVGID_12_"
+ d="m 375.4,312.3 c 2.1,-2.2 4.6,-3.9 7.5,-5.2 2.9,-1.3 5.9,-1.9 9.1,-1.9 3.2,0 6.2,0.6 9.1,1.9 2.9,1.3 5.4,3 7.5,5.2 1.8,1.9 3.2,4 4.4,6.3 l -42,0 c 1.1,-2.3 2.6,-4.4 4.4,-6.3 m 4.3,-12.7 c -3.8,1.7 -7.2,4 -10,6.9 -2.9,2.9 -5.1,6.4 -6.8,10.3 -1.6,3.9 -2.5,8.1 -2.5,12.6 0,4.5 0.8,8.6 2.5,12.6 1.6,3.9 3.9,7.3 6.8,10.3 2.9,2.9 6.2,5.2 10,6.9 3.8,1.7 7.9,2.5 12.3,2.5 4.4,0 8.4,-0.8 12.3,-2.5 3.8,-1.7 7.2,-4 10,-6.9 2.9,-2.9 5.1,-6.4 6.7,-10.3 l 0.3,-0.9 -8.8,0 c -1.1,2 -2.4,3.8 -3.9 [...]
+ id="SVGID_13_"><use
+ height="100%"
+ width="100%"
+ y="0"
+ x="0"
+ xlink:href="#SVGID_12_"
+ style="overflow:visible"
+ id="use4917" /></clipPath><linearGradient
+ id="SVGID_14_"
+ gradientUnits="userSpaceOnUse"
+ x1="0.00203372"
+ y1="595.27478"
+ x2="1.002"
+ y2="595.27478"
+ gradientTransform="matrix(0,-64.5586,-64.5586,0,38822.051,361.7587)"><stop
+ offset="0"
+ style="stop-color:#19294B"
+ id="stop4920" /><stop
+ offset="1"
+ style="stop-color:#284491"
+ id="stop4922" /></linearGradient><rect
+ style="fill:url(#SVGID_14_)"
+ x="360.5"
+ y="297.10001"
+ class="st4"
+ width="62.900002"
+ height="64.599998"
+ id="rect4924"
+ clip-path="url(#SVGID_13_)" /></g><g
+ id="g4926"
+ transform="matrix(0.46635534,0,0,0.46635534,-53.749723,-13.1677)"><defs
+ id="defs4928"><path
+ inkscape:connector-curvature="0"
+ id="SVGID_15_"
+ d="m 448.6,302.4 c -3.8,1.7 -7.2,4 -10.1,7 -0.5,0.5 -0.9,1.1 -1.3,1.9 l 0,-11.2 -7.9,0 0.1,58.7 7.9,0 0,-26.6 c 0,-3.3 0.6,-6.4 1.8,-9.3 1.2,-2.9 2.9,-5.5 5,-7.7 2.1,-2.2 4.6,-3.9 7.5,-5.2 2.9,-1.3 5.9,-1.9 9.1,-1.9 l 0,-8.2 c -4.2,0 -8.3,0.8 -12.1,2.5" /></defs><clipPath
+ id="SVGID_16_"><use
+ height="100%"
+ width="100%"
+ y="0"
+ x="0"
+ xlink:href="#SVGID_15_"
+ style="overflow:visible"
+ id="use4932" /></clipPath><linearGradient
+ id="SVGID_17_"
+ gradientUnits="userSpaceOnUse"
+ x1="0.00075169158"
+ y1="595.27258"
+ x2="1.0007"
+ y2="595.27258"
+ gradientTransform="matrix(0,-58.9258,-58.9258,0,35522.035,358.8553)"><stop
+ offset="0"
+ style="stop-color:#19294B"
+ id="stop4935" /><stop
+ offset="1"
+ style="stop-color:#284491"
+ id="stop4937" /></linearGradient><rect
+ style="fill:url(#SVGID_17_)"
+ x="429.39999"
+ y="299.89999"
+ class="st5"
+ width="31.5"
+ height="58.900002"
+ id="rect4939"
+ clip-path="url(#SVGID_16_)" /></g><g
+ id="g4941"
+ transform="matrix(0.46635534,0,0,0.46635534,-53.749723,-13.1677)"><defs
+ id="defs4943"><path
+ inkscape:connector-curvature="0"
+ id="SVGID_18_"
+ d="m 486.4,297.7 c -1.8,0.4 -3.4,1 -5,1.7 -1.6,0.7 -3,1.6 -4.3,2.7 -1.3,1.1 -2.3,2.2 -3.1,3.5 l 0,-5.4 -8,0 0,58.7 8.1,0 -0.1,-35.2 c 0,-2.3 0.5,-4.5 1.4,-6.7 1,-2.2 2.2,-4.1 3.8,-5.8 1.6,-1.7 3.5,-3 5.6,-4 2.1,-1 4.4,-1.5 6.8,-1.5 2.4,0 4.6,0.5 6.8,1.4 2.1,0.9 4,2.2 5.6,3.9 1.6,1.6 2.9,3.6 3.8,5.8 0.9,2.2 1.4,4.5 1.4,7 l 0.1,35.2 8.2,0 -0.1,-35.2 c 0,-3.6 -0.7,-7 -2.1,-10.3 -1.4,-3.2 -3.2,-6.1 -5.6,-8.5 -2.3,-2.4 -5.1,-4.3 -8.2,-5.7 -3.1,-1.4 -6.5,-2.1 -10,-2.1 -1.6,-0.1 -3.4,0 [...]
+ id="SVGID_19_"><use
+ height="100%"
+ width="100%"
+ y="0"
+ x="0"
+ xlink:href="#SVGID_18_"
+ style="overflow:visible"
+ id="use4947" /></clipPath><linearGradient
+ id="SVGID_20_"
+ gradientUnits="userSpaceOnUse"
+ x1="0.001157944"
+ y1="595.27338"
+ x2="1.0012"
+ y2="595.27338"
+ gradientTransform="matrix(0,-61.7422,-61.7422,0,37245.25,358.8825)"><stop
+ offset="0"
+ style="stop-color:#19294B"
+ id="stop4950" /><stop
+ offset="1"
+ style="stop-color:#284491"
+ id="stop4952" /></linearGradient><rect
+ style="fill:url(#SVGID_20_)"
+ x="466"
+ y="297.10001"
+ class="st6"
+ width="51.5"
+ height="61.700001"
+ id="rect4954"
+ clip-path="url(#SVGID_19_)" /></g><g
+ id="g4956"
+ transform="matrix(0.46635534,0,0,0.46635534,-53.749723,-13.1677)"><defs
+ id="defs4958"><path
+ inkscape:connector-curvature="0"
+ id="SVGID_21_"
+ d="m 525.7,358.8 8,0 0,-58.7 -8,0 0,58.7 z m 0.7,-80.7 c -0.9,0.9 -1.4,2.1 -1.4,3.5 0,1.4 0.5,2.6 1.4,3.5 0.9,0.9 2.1,1.4 3.4,1.4 1.4,0 2.5,-0.5 3.4,-1.4 0.9,-0.9 1.4,-2.1 1.4,-3.5 0,-1.4 -0.5,-2.6 -1.4,-3.5 -0.9,-0.9 -2.1,-1.4 -3.4,-1.4 -1.3,-0.1 -2.5,0.4 -3.4,1.4" /></defs><clipPath
+ id="SVGID_22_"><use
+ height="100%"
+ width="100%"
+ y="0"
+ x="0"
+ xlink:href="#SVGID_21_"
+ style="overflow:visible"
+ id="use4962" /></clipPath><linearGradient
+ id="SVGID_23_"
+ gradientUnits="userSpaceOnUse"
+ x1="0.00098451949"
+ y1="595.27728"
+ x2="1.001"
+ y2="595.27728"
+ gradientTransform="matrix(0,-82.166,-82.166,0,49441.391,358.8919)"><stop
+ offset="0"
+ style="stop-color:#19294B"
+ id="stop4965" /><stop
+ offset="1"
+ style="stop-color:#284491"
+ id="stop4967" /></linearGradient><rect
+ style="fill:url(#SVGID_23_)"
+ x="525"
+ y="276.60001"
+ class="st7"
+ width="9.6000004"
+ height="82.199997"
+ id="rect4969"
+ clip-path="url(#SVGID_22_)" /></g><g
+ id="g4971"
+ transform="matrix(0.46635534,0,0,0.46635534,-53.749723,-13.1677)"><defs
+ id="defs4973"><path
+ inkscape:connector-curvature="0"
+ id="SVGID_24_"
+ d="m 559.3,299.6 c -3.8,1.7 -7.2,4 -10,6.9 -2.9,2.9 -5.1,6.4 -6.8,10.3 -1.6,3.9 -2.5,8.1 -2.5,12.6 0,4.5 0.8,8.6 2.5,12.6 1.6,3.9 3.9,7.3 6.8,10.3 2.9,2.9 6.2,5.2 10,6.9 3.8,1.7 7.9,2.5 12.3,2.5 4.4,0 8.4,-0.8 12.3,-2.5 3.8,-1.7 7.2,-4 10,-6.9 2.9,-2.9 5.1,-6.4 6.7,-10.3 l 0.3,-0.9 -8.8,0 c -1.1,2 -2.4,3.8 -3.9,5.4 -2.1,2.2 -4.6,3.9 -7.5,5.2 -2.9,1.3 -5.9,1.9 -9.1,1.9 -3.2,0 -6.2,-0.6 -9.1,-1.9 -2.9,-1.3 -5.4,-3 -7.5,-5.2 -2.1,-2.2 -3.8,-4.8 -5,-7.7 -1.2,-2.9 -1.8,-6 -1.8,-9.3 0 [...]
+ id="SVGID_25_"><use
+ height="100%"
+ width="100%"
+ y="0"
+ x="0"
+ xlink:href="#SVGID_24_"
+ style="overflow:visible"
+ id="use4977" /></clipPath><linearGradient
+ id="SVGID_26_"
+ gradientUnits="userSpaceOnUse"
+ x1="0.00203372"
+ y1="595.27448"
+ x2="1.002"
+ y2="595.27448"
+ gradientTransform="matrix(0,-64.5586,-64.5586,0,39000.551,361.7587)"><stop
+ offset="0"
+ style="stop-color:#19294B"
+ id="stop4980" /><stop
+ offset="1"
+ style="stop-color:#284491"
+ id="stop4982" /></linearGradient><rect
+ style="fill:url(#SVGID_26_)"
+ x="540"
+ y="297.10001"
+ class="st8"
+ width="60.799999"
+ height="64.599998"
+ id="rect4984"
+ clip-path="url(#SVGID_25_)" /></g><g
+ id="g4986"
+ transform="matrix(0.46635534,0,0,0.46635534,-53.749723,-13.1677)"><defs
+ id="defs4988"><path
+ inkscape:connector-curvature="0"
+ id="SVGID_27_"
+ d="m 649.1,300.1 0,32.3 c 0,2.5 -0.5,4.9 -1.4,7 -0.9,2.2 -2.2,4.1 -3.8,5.7 -1.6,1.6 -3.5,2.9 -5.6,3.8 -2.1,0.9 -4.4,1.4 -6.9,1.4 -2.4,0 -4.7,-0.5 -6.8,-1.4 -2.1,-0.9 -4,-2.2 -5.6,-3.8 -1.6,-1.6 -2.9,-3.5 -3.8,-5.7 -0.9,-2.2 -1.4,-4.5 -1.4,-7 l 0,-0.1 -0.1,-32.2 -8.2,0 0.1,32.2 0,0.1 c 0,3.6 0.7,7 2.1,10.2 1.4,3.2 3.2,6 5.6,8.4 2.3,2.4 5.1,4.3 8.2,5.7 3.1,1.4 6.5,2.1 10,2.1 3.5,0 6.8,-0.7 10,-2.1 3.1,-1.4 5.9,-3.3 8.2,-5.7 2.3,-2.4 4.2,-5.2 5.5,-8.4 1.3,-3.2 2,-6.6 2,-10.2 l 0,-3 [...]
+ id="SVGID_28_"><use
+ height="100%"
+ width="100%"
+ y="0"
+ x="0"
+ xlink:href="#SVGID_27_"
+ style="overflow:visible"
+ id="use4992" /></clipPath><linearGradient
+ id="SVGID_29_"
+ gradientUnits="userSpaceOnUse"
+ x1="-0.0048067542"
+ y1="595.27228"
+ x2="0.99519998"
+ y2="595.27228"
+ gradientTransform="matrix(0,-58.6895,-58.6895,0,35567.617,358.5289)"><stop
+ offset="0"
+ style="stop-color:#19294B"
+ id="stop4995" /><stop
+ offset="1"
+ style="stop-color:#284491"
+ id="stop4997" /></linearGradient><rect
+ style="fill:url(#SVGID_29_)"
+ x="605.59998"
+ y="300.10001"
+ class="st9"
+ width="51.5"
+ height="58.700001"
+ id="rect4999"
+ clip-path="url(#SVGID_28_)" /></g><g
+ id="g5001"
+ transform="matrix(0.46635534,0,0,0.46635534,-53.749723,-13.1677)"><defs
+ id="defs5003"><path
+ inkscape:connector-curvature="0"
+ id="SVGID_30_"
+ d="m 676.2,298.6 c -2.5,1.1 -4.7,2.4 -6.5,4.1 -1.8,1.7 -3.2,3.6 -4.2,5.8 -1,2.2 -1.3,4.6 -1,7.1 0.4,3.3 1.5,6 3.3,8.2 1.8,2.2 4,3.8 6.5,4.9 2.5,1.1 5.3,2 8.2,2.8 3,0.8 5.5,1.6 7.4,2.6 2,0.9 3.5,2.1 4.5,3.6 1,1.5 1.5,3.6 1.4,6.2 -0.2,2.6 -1.2,4.8 -3,6.6 -1.9,1.8 -4.7,2.8 -8.5,2.8 -3.3,0.1 -6,-0.6 -8.1,-2 -2.1,-1.4 -3.6,-3 -4.4,-4.8 -0.8,-1.7 -1.2,-3.6 -1.2,-5.6 l -8,0 c -0.1,3.4 0.5,6.3 1.7,8.7 1.2,2.5 2.8,4.6 4.8,6.3 2,1.8 4.3,3.1 6.9,4.1 2.6,1 5.2,1.5 7.9,1.5 2.7,0 5.2,-0.4 7.7 [...]
+ id="SVGID_31_"><use
+ height="100%"
+ width="100%"
+ y="0"
+ x="0"
+ xlink:href="#SVGID_30_"
+ style="overflow:visible"
+ id="use5007" /></clipPath><linearGradient
+ id="SVGID_32_"
+ gradientUnits="userSpaceOnUse"
+ x1="0.00203372"
+ y1="595.27539"
+ x2="1.002"
+ y2="595.27539"
+ gradientTransform="matrix(0,-64.5586,-64.5586,0,39113.727,361.7587)"><stop
+ offset="0"
+ style="stop-color:#19294B"
+ id="stop5010" /><stop
+ offset="1"
+ style="stop-color:#284491"
+ id="stop5012" /></linearGradient><rect
+ style="fill:url(#SVGID_32_)"
+ x="662.79999"
+ y="297.10001"
+ class="st10"
+ width="41.700001"
+ height="64.599998"
+ id="rect5014"
+ clip-path="url(#SVGID_31_)" /></g><g
+ id="g5016"
+ transform="matrix(0.51094843,0,0,0.51094843,-66.678375,-24.26469)"><defs
+ id="defs5018"><rect
+ y="0"
+ x="0"
+ id="SVGID_33_"
+ width="841.90002"
+ height="595.29999" /></defs><clipPath
+ id="SVGID_34_"><use
+ height="100%"
+ width="100%"
+ y="0"
+ x="0"
+ xlink:href="#SVGID_33_"
+ style="overflow:visible"
+ id="use5022" /></clipPath></g></svg>
\ No newline at end of file
diff --git a/share/magics/table_128.xml b/share/magics/table_128.xml
index acfdbe7..452bfcf 100644
--- a/share/magics/table_128.xml
+++ b/share/magics/table_128.xml
@@ -2,1315 +2,178 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='128'>
- <param code='1' mars=''
- short_title='strm fun'
- long_title='stream function'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='2' mars=''
- short_title='vel pot'
- long_title='velocity potential'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='3' mars=''
- short_title='pot temp'
- long_title='potential temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit='deg k'
- vector1='0' vector2='0'
- contour_interval='5.0' specification=''/>
- <param code='4' mars=''
- short_title='eq pot temp'
- long_title='equiv potential temp'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit='deg k'
- vector1='0' vector2='0'
- contour_interval='5.0' specification=''/>
- <param code='5' mars=''
- short_title='sat eq pot temp'
- long_title='sat equiv pot temp'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit='deg k'
- vector1='0' vector2='0'
- contour_interval='5.0' specification=''/>
- <param code='11' mars=''
- short_title='u-com div wind'
- long_title='u-comp divergent wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='12' mars=''
- short_title='v-com div wind'
- long_title='v-comp divergent wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='13' mars=''
- short_title='u-com rot wind'
- long_title='u-comp rotational wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='14' mars=''
- short_title='v-com rot wind'
- long_title='v-comp rotational wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='21' mars=''
- short_title='UCTP'
- long_title='Unbalanced component of temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='22' mars=''
- short_title='UCLN'
- long_title='Unbalanced component of logarithm of surface pressure'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='23' mars=''
- short_title='UCDV'
- long_title='Unbalanced component of divergence'
- scaling='1.0' offset='-0.0'
- original_unit='s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='24' mars=''
- short_title='None'
- long_title='Reserved for future unbalanced components'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='25' mars=''
- short_title='None'
- long_title='Reserved for future unbalanced components'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='26' mars=''
- short_title='CL'
- long_title='Lake cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='27' mars=''
- short_title='low veg cover'
- long_title='low vegetation cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='28' mars=''
- short_title='high veg cover'
- long_title='high vegetation cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='29' mars=''
- short_title='type low veg'
- long_title='type of low vegetation'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='30' mars=''
- short_title='type high veg'
- long_title='type of high vegetation'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='31' mars=''
- short_title='sea ice cover'
- long_title='sea ice cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='32' mars=''
- short_title='snow albedo'
- long_title='snow albedo'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='33' mars=''
- short_title='snow density'
- long_title='snow density'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-3' derived_unit='kg**3'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='34' mars=''
- short_title='sea surf temp'
- long_title='sea surface temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='35' mars=''
- short_title='ice surf temp layer1'
- long_title='ice surface temperature layer 1'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='36' mars=''
- short_title='ice surf temp layer2'
- long_title='ice surface temperature layer 2'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='37' mars=''
- short_title='ice surf temp layer3'
- long_title='ice surface temperature layer 3'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='38' mars=''
- short_title='ice surf temp layer4'
- long_title='ice surface temperature layer 4'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='39' mars=''
- short_title='vol soil water layer1'
- long_title='volumetric soil water layer 1'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit='m3m-3'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='40' mars=''
- short_title='vol soil water layer2'
- long_title='volumetric soil water layer 2'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit='m3m-3'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='41' mars=''
- short_title='vol soil water layer3'
- long_title='volumetric soil water layer 3'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit='m3m-3'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='42' mars=''
- short_title='vol soil water layer4'
- long_title='volumetric soil water layer 4'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit='m3m-3'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='43' mars=''
- short_title='SLT'
- long_title='Soil type'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='44' mars=''
- short_title='evap snow'
- long_title='evaporation of snow'
- scaling='100.0' offset='-0.0'
- original_unit='m of water' derived_unit='cm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p13'/>
- <param code='45' mars=''
- short_title='snow melt'
- long_title='snow melt'
- scaling='100.0' offset='-0.0'
- original_unit='m of water' derived_unit='cm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p13'/>
- <param code='46' mars=''
- short_title='SDUR'
- long_title='Solar duration'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='47' mars=''
- short_title='DSRP'
- long_title='Direct solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='w m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='48' mars=''
- short_title='MAGSS'
- long_title='Magnitude of surface stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='49' mars=''
- short_title='gust 10m'
- long_title='wind gust at 10m'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='50' mars=''
- short_title='LSPF'
- long_title='Large-scale precipitation fraction'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='51' mars=''
- short_title='MX2T24'
- long_title='Maximum 2 metre temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='52' mars=''
- short_title='MN2T24'
- long_title='Minimum 2 metre temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='53' mars=''
- short_title='mont pot'
- long_title='montgomery potential'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='54' mars=''
- short_title='pres'
- long_title='pressure'
- scaling='0.01' offset='-0.0'
- original_unit='Pa' derived_unit='hPa'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p43'/>
- <param code='55' mars=''
- short_title='MN2T24'
- long_title='Mean 2 metre temperature in past 24 hours'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='56' mars=''
- short_title='MN2D24'
- long_title='Mean 2 metre dewpoint temperature in past 24 hours'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='57' mars=''
- short_title='UVB'
- long_title='Downward UV radiation at the surface'
- scaling='1.0' offset='-0.0'
- original_unit='w m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='58' mars=''
- short_title='PAR'
- long_title='Photosynthetically active radiation at the surface'
- scaling='1.0' offset='-0.0'
- original_unit='w m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='59' mars=''
- short_title='CAPE'
- long_title='Convective available potential energy'
- scaling='1.0' offset='-0.0'
- original_unit='J kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='60' mars=''
- short_title='pv'
- long_title='potential vorticity'
- scaling='1000000.0' offset='-0.0'
- original_unit='K m**2 kg**-1 s**-1' derived_unit='pv units'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='61' mars=''
- short_title='TPO'
- long_title='Total precipitation from observations'
- scaling='1.0' offset='-0.0'
- original_unit='Millimetres*100 + number of stations' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='62' mars=''
- short_title='OBCT'
- long_title='Observation count'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='63' mars=''
- short_title='-'
- long_title='Start time for skin temperature difference'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='64' mars=''
- short_title='-'
- long_title='Finish time for skin temperature difference'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='65' mars=''
- short_title='-'
- long_title='Skin temperature difference'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='78' mars=''
- short_title='TCLW'
- long_title='Total Column Liquid Water'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='79' mars=''
- short_title='TCIW'
- long_title='Total Column Ice Water'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='125' mars=''
- short_title='-'
- long_title='Vertically integrated total energy'
- scaling='1.0' offset='-0.0'
- original_unit='J m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='126' mars=''
- short_title='-'
- long_title='Generic parameter for sensitive area prediction'
- scaling='1.0' offset='-0.0'
- original_unit='Various' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='127' mars=''
- short_title='atmos tide'
- long_title='atmospheric tide'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='128' mars=''
- short_title='budg val'
- long_title='budget values'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='129' mars=''
- short_title='geop'
- long_title='geopotential height'
- scaling='0.0101971621297793' offset='-0.0'
- original_unit='m**2 s**-2' derived_unit='dam'
- vector1='0' vector2='0'
- contour_interval='8.0' specification='p1'/>
- <param code='130' mars=''
- short_title='temp'
- long_title='temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p2'/>
- <param code='131' mars=''
- short_title='u-vel'
- long_title='u-velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p3'/>
- <param code='132' mars=''
- short_title='v-vel'
- long_title='v-velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p4'/>
- <param code='133' mars=''
- short_title='spec hum'
- long_title='specific humidity'
- scaling='1000.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit='g/kg'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p5'/>
- <param code='134' mars=''
- short_title='surf pres'
- long_title='surface pressure'
- scaling='0.01' offset='-0.0'
- original_unit='Pa' derived_unit='hpa'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p6'/>
- <param code='135' mars=''
- short_title='vert vel'
- long_title='vertical velocity'
- scaling='1.0' offset='-0.0'
- original_unit='Pa s**-1' derived_unit='pa/s'
- vector1='0' vector2='0'
- contour_interval='4.0' specification='p7'/>
- <param code='136' mars=''
- short_title='tot col wat'
- long_title='total column water'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-2' derived_unit='kg/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='137' mars=''
- short_title='tot col wat vap'
- long_title='total column water vapour'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-2' derived_unit='kg/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='138' mars=''
- short_title='vort'
- long_title='vorticity'
- scaling='100000.0' offset='-0.0'
- original_unit='s**-1' derived_unit='10**5/sec'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p10'/>
- <param code='139' mars=''
- short_title='soil temp lyr1'
- long_title='soil temperature layer1'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='4.0' specification='p11'/>
- <param code='140' mars=''
- short_title='soil wet lyr 1'
- long_title='soil wetness layer 1'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p12'/>
- <param code='141' mars=''
- short_title='snow depth'
- long_title='snow depth'
- scaling='1.0' offset='-0.0'
- original_unit='m of water equivalent' derived_unit='cm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p13'/>
- <param code='142' mars=''
- short_title='lge scl prec'
- long_title='large scale precip'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p14'/>
- <param code='143' mars=''
- short_title='conv prec'
- long_title='convective precip'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p15'/>
- <param code='144' mars=''
- short_title='snowf'
- long_title='snowfall'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water equivalent' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p16'/>
- <param code='145' mars=''
- short_title='bound lyr diss'
- long_title='boundary layer dissip'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p17'/>
- <param code='146' mars=''
- short_title='surf sens ht flux'
- long_title='surf sensible heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p18'/>
- <param code='147' mars=''
- short_title='surf lat ht flux'
- long_title='surf latent heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p19'/>
- <param code='148' mars=''
- short_title='CHNK'
- long_title='Charnock'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='149' mars=''
- short_title='SNR'
- long_title='Surface net radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='150' mars=''
- short_title='TNR'
- long_title='Top net radiation'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='151' mars=''
- short_title='msl'
- long_title='mean sea level pressure'
- scaling='0.01' offset='-0.0'
- original_unit='Pa' derived_unit='hpa'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p23'/>
- <param code='152' mars=''
- short_title='log surf pres'
- long_title='log surface pressure'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p24'/>
- <param code='153' mars=''
- short_title='SWHR'
- long_title='Short-wave heating rate'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='154' mars=''
- short_title='LWHR'
- long_title='Long-wave heating rate'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='155' mars=''
- short_title='diverg'
- long_title='divergence'
- scaling='100000.0' offset='-0.0'
- original_unit='s**-1' derived_unit='10**5/sec'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p27'/>
- <param code='156' mars=''
- short_title='hgt (geop)'
- long_title='height (geopotential)'
- scaling='1.0' offset='-0.0'
- original_unit='gpm' derived_unit='m'
- vector1='0' vector2='0'
- contour_interval='40.0' specification='p28'/>
- <param code='157' mars=''
- short_title='rel hum'
- long_title='relative humidity'
- scaling='1.0' offset='-0.0'
- original_unit='%' derived_unit='%'
- vector1='0' vector2='0'
- contour_interval='20.0' specification='p29'/>
- <param code='158' mars=''
- short_title='surf press tend'
- long_title='tendency of surf press'
- scaling='1.0' offset='-0.0'
- original_unit='Pa s**-1' derived_unit='pa/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p30'/>
- <param code='159' mars=''
- short_title='bound layer hgt'
- long_title='boundary layer height'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit='m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='160' mars=''
- short_title='stdev orog'
- long_title='std dev of orography'
- scaling='100.0' offset='-0.0'
- original_unit='' derived_unit='cm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='161' mars=''
- short_title='anisot sub-grid orog'
- long_title='anistropy of sub-gridscale orography'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='162' mars=''
- short_title='angle sub-grid orog'
- long_title='angle of sub-gridscale orography'
- scaling='1.0' offset='-0.0'
- original_unit='rad' derived_unit='rad'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='163' mars=''
- short_title='slope sub-grid orog'
- long_title='slope of sub-gridscale orography'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='164' mars=''
- short_title='tot cldcov'
- long_title='total cloudcover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.1' specification='p36'/>
- <param code='165' mars=''
- short_title='10m u'
- long_title='10 mtr u'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p37'/>
- <param code='166' mars=''
- short_title='10m v'
- long_title='10 mtr v'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p38'/>
- <param code='167' mars=''
- short_title='2m temp'
- long_title='2 metre temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p39'/>
- <param code='168' mars=''
- short_title='2m dewp'
- long_title='2 metre dewpoint temp'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p40'/>
- <param code='169' mars=''
- short_title='sur sol rad dwn'
- long_title='surf solar radiation downwards'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='170' mars=''
- short_title='soil temp lyr2'
- long_title='soil temperature layer2'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p42'/>
- <param code='171' mars=''
- short_title='soil wet lyr2'
- long_title='soil wetness layer2'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='1.0' specification='p43'/>
- <param code='172' mars=''
- short_title='l/sea mask'
- long_title='land/ sea mask'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='0/1'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='173' mars=''
- short_title='surf rough'
- long_title='surface roughness'
- scaling='100.0' offset='-0.0'
- original_unit='m' derived_unit='cm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='174' mars=''
- short_title='albedo'
- long_title='albedo'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='175' mars=''
- short_title='sur ther rad dwn'
- long_title='surf thermal radiation downwards'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='176' mars=''
- short_title='surf solrad'
- long_title='surf solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='177' mars=''
- short_title='surf ther rad'
- long_title='surf thermal radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='178' mars=''
- short_title='topsolrad'
- long_title='top solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='179' mars=''
- short_title='top ther rad'
- long_title='top thermal radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='180' mars=''
- short_title='u-stress'
- long_title='u-stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='181' mars=''
- short_title='v-stress'
- long_title='v-stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='182' mars=''
- short_title='evap'
- long_title='evaporation'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='183' mars=''
- short_title='soil temp lyr3'
- long_title='soil temperature layer3'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='184' mars=''
- short_title='soil wet lyr3'
- long_title='soil wetness layer3'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='185' mars=''
- short_title='conv cld cov'
- long_title='convective cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='186' mars=''
- short_title='low cld cov'
- long_title='low cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='187' mars=''
- short_title='med cld cov'
- long_title='medium cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='188' mars=''
- short_title='hi cld cov'
- long_title='high cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='189' mars=''
- short_title='sun duration'
- long_title='sunshine duration'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit='sec'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='190' mars=''
- short_title='ew comp subgrid orog var'
- long_title='ew comp subgrid orog var'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit='sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='191' mars=''
- short_title='ns comp subgrid orog var'
- long_title='ns comp subgrid orog var'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit='sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='192' mars=''
- short_title='nwse com subgrd orog var'
- long_title='nwse com subgrd orog var'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit='sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='193' mars=''
- short_title='nswe com subgrd orog var'
- long_title='nswe com subgrd orog var'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit='sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='194' mars=''
- short_title='BTMP'
- long_title='Brightness temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='195' mars=''
- short_title='lat comp grav wav stress'
- long_title='lat comp grav wav stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='196' mars=''
- short_title='mer comp grav wav stress'
- long_title='mer comp grav wav stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='197' mars=''
- short_title='grav wav diss'
- long_title='gravity wav dissipation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='198' mars=''
- short_title='skin res cont'
- long_title='skin reservoir content'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='199' mars=''
- short_title='percent of veg'
- long_title='percent of vegetation'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='%'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='200' mars=''
- short_title='var subgrid-scale orog'
- long_title='var subgrid-scale orog'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit='sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='201' mars=''
- short_title='max 2m tem'
- long_title='maximum temp at 2m'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='202' mars=''
- short_title='min 2m tem'
- long_title='minimum temp at 2 m'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='203' mars=''
- short_title='oz mass mix rat'
- long_title='ozone mass mixing ratio'
- scaling='1000.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit='g/kg'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='204' mars=''
- short_title='prec anal weights'
- long_title='precip. analys weights'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='205' mars=''
- short_title='runoff'
- long_title='runoff'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='206' mars=''
- short_title='tot col oz'
- long_title='total column ozone'
- scaling='46696.2409526033' offset='-0.0'
- original_unit='kg m**-2' derived_unit='Dob'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='207' mars=''
- short_title='10SI'
- long_title='10 metre wind speed'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='208' mars=''
- short_title='TSRC'
- long_title='Top net solar radiation, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='209' mars=''
- short_title='TTRC'
- long_title='Top net thermal radiation, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='210' mars=''
- short_title='SSRC'
- long_title='Surface net solar radiation, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='211' mars=''
- short_title='STRC'
- long_title='Surface net thermal radiation, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='212' mars=''
- short_title='TISR'
- long_title='TOA incident solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='214' mars=''
- short_title='DHR'
- long_title='Diabatic heating by radiation'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='215' mars=''
- short_title='DHVD'
- long_title='Diabatic heating by vertical diffusion'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='216' mars=''
- short_title='DHCC'
- long_title='Diabatic heating by cumulus convection'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='217' mars=''
- short_title='DHLC'
- long_title='Diabatic heating by large-scale condensation'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='218' mars=''
- short_title='VDZW'
- long_title='Vertical diffusion of zonal wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='219' mars=''
- short_title='VDMW'
- long_title='Vertical diffusion of meridional wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='220' mars=''
- short_title='EWGD'
- long_title='East-West gravity wave drag tendency'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='221' mars=''
- short_title='NSGD'
- long_title='North-South gravity wave drag tendency'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='222' mars=''
- short_title='CTZW'
- long_title='Convective tendency of zonal wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='223' mars=''
- short_title='CTMW'
- long_title='Convective tendency of meridional wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='224' mars=''
- short_title='VDH'
- long_title='Vertical diffusion of humidity'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='225' mars=''
- short_title='HTCC'
- long_title='Humidity tendency by cumulus convection'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='226' mars=''
- short_title='HTLC'
- long_title='Humidity tendency by large-scale condensation'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='227' mars=''
- short_title='CRNH'
- long_title='Change from removal of negative humidity'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='228' mars=''
- short_title='tot prec'
- long_title='total precipitation'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='229' mars=''
- short_title='instant e/w surf str'
- long_title='instant e/w surf stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='230' mars=''
- short_title='inst n/s surf str'
- long_title='instant n/s surf stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='231' mars=''
- short_title='inst surf sens heat flux'
- long_title='inst surf sens heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit='w/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='232' mars=''
- short_title='inst evap'
- long_title='instant evaporation'
- scaling='1000.0' offset='-0.0'
- original_unit='kg m**-2 s' derived_unit='g/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='233' mars=''
- short_title='appar surf hum'
- long_title='apparent surf humidity'
- scaling='1000.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit='g/kg'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='234' mars=''
- short_title='log surf rough for heat'
- long_title='log surf rough for heat'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='235' mars=''
- short_title='skin temp'
- long_title='skin temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p43'/>
- <param code='236' mars=''
- short_title='soil temp lyr4'
- long_title='soil temperature layer4'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p43'/>
- <param code='237' mars=''
- short_title='soil wet lyr 4'
- long_title='soil wetness layer 4'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p43'/>
- <param code='238' mars=''
- short_title='snow temp'
- long_title='snow temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p43'/>
- <param code='239' mars=''
- short_title='conv snow'
- long_title='convective snowfall'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water equivalent' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='240' mars=''
- short_title='lge scal snow'
- long_title='large scale snowfall'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water equivalent' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='241' mars=''
- short_title='ACF'
- long_title='Accumulated cloud fraction tendency'
- scaling='1.0' offset='-0.0'
- original_unit='(-1 to 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='242' mars=''
- short_title='ALW'
- long_title='Accumulated liquid water tendency'
- scaling='1.0' offset='-0.0'
- original_unit='(-1 to 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='243' mars=''
- short_title='fore albedo'
- long_title='forecast albedo'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='244' mars=''
- short_title='fore surf rough'
- long_title='forecast surface roughness'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='245' mars=''
- short_title='fore log surf rough/heat'
- long_title='forecast log surface roughness for heat'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='246' mars=''
- short_title='cloud liq wat con'
- long_title='cloud liquid water content'
- scaling='1000.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit='gm/kg'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='247' mars=''
- short_title='cloud ice wat con'
- long_title='cloud ice water content'
- scaling='1000.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit='gm/kg'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='248' mars=''
- short_title='cloud cov'
- long_title='cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='249' mars=''
- short_title='AIW'
- long_title='Accumulated ice water tendency'
- scaling='1.0' offset='-0.0'
- original_unit='(-1 to 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='250' mars=''
- short_title='ice age'
- long_title='ice age'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='%'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='251' mars=''
- short_title='unbal comp temp'
- long_title='unbalanced component of temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg C'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='252' mars=''
- short_title='unbal comp LNSP'
- long_title='unbalanced component of LNSP'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='253' mars=''
- short_title='unbal comp div'
- long_title='unbalanced component of divergence'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='254' mars=''
- short_title='ATMW'
- long_title='Adiabatic tendency of meridional wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='260510' mars=''
- short_title=''
- long_title=''
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- />
- </table>
-
-</center>
+ <param code='34'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='35'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='36'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='37'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='38'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='44'
+ original_unit='m of water' derived_unit='cm'
+ scaling='100.0' offset='-0.0'/>
+ <param code='45'
+ original_unit='m of water' derived_unit='cm'
+ scaling='100.0' offset='-0.0'/>
+ <param code='54'
+ original_unit='Pa' derived_unit='hPa'
+ scaling='0.01' offset='-0.0'/>
+ <param code='60'
+ original_unit='K m**2 kg**-1 s**-1' derived_unit='pv units'
+ scaling='1000000.0' offset='-0.0'/>
+ <param code='121'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='122'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='129'
+ original_unit='m**2 s**-2' derived_unit='dam'
+ scaling='0.0101971621297793' offset='-0.0'/>
+ <param code='130'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='133'
+ original_unit='kg kg**-1' derived_unit='g/kg'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='134'
+ original_unit='Pa' derived_unit='hpa'
+ scaling='0.01' offset='-0.0'/>
+ <param code='138'
+ original_unit='s**-1' derived_unit='10**5/sec'
+ scaling='100000.0' offset='-0.0'/>
+ <param code='139'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='140'
+ original_unit='m of water' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='142'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='143'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='144'
+ original_unit='m of water equivalent' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='151'
+ original_unit='Pa' derived_unit='hpa'
+ scaling='0.01' offset='-0.0'/>
+ <param code='155'
+ original_unit='s**-1' derived_unit='10**5/sec'
+ scaling='100000.0' offset='-0.0'/>
+ <param code='160'
+ original_unit='' derived_unit='cm'
+ scaling='100.0' offset='-0.0'/>
+ <param code='167'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='168'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='170'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='171'
+ original_unit='m of water' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='173'
+ original_unit='m' derived_unit='cm'
+ scaling='100.0' offset='-0.0'/>
+ <param code='182'
+ original_unit='m of water' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='183'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='184'
+ original_unit='m of water' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='198'
+ original_unit='m of water' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='201'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='202'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='203'
+ original_unit='kg kg**-1' derived_unit='g/kg'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='205'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='206'
+ original_unit='kg m**-2' derived_unit='Dob'
+ scaling='46696.2409526033' offset='-0.0'/>
+ <param code='228'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='232'
+ original_unit='kg m**-2 s' derived_unit='g/sq m'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='233'
+ original_unit='kg kg**-1' derived_unit='g/kg'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='235'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='236'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='237'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='238'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='239'
+ original_unit='m of water equivalent' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='240'
+ original_unit='m of water equivalent' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='244'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='246'
+ original_unit='kg kg**-1' derived_unit='gm/kg'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='247'
+ original_unit='kg kg**-1' derived_unit='gm/kg'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='251'
+ original_unit='K' derived_unit='deg C'
+ scaling='1.0' offset='-273.16'/>
+ <param code='260510'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='228004'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='228026'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='228027'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ </table>
+<centre/>
diff --git a/share/magics/table_129.xml b/share/magics/table_129.xml
index 6a9bb49..d2829b9 100644
--- a/share/magics/table_129.xml
+++ b/share/magics/table_129.xml
@@ -2,1294 +2,130 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='129'>
- <param code='1' mars=''
- short_title='strm fun'
- long_title='stream function'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='2' mars=''
- short_title='vel pot'
- long_title='velocity potential'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='3' mars=''
- short_title='pot temp'
- long_title='potential temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit='deg k'
- vector1='0' vector2='0'
- contour_interval='5.0' specification=''/>
- <param code='4' mars=''
- short_title='eq pot temp'
- long_title='equiv potential temp'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit='deg k'
- vector1='0' vector2='0'
- contour_interval='5.0' specification=''/>
- <param code='5' mars=''
- short_title='sat eq pot temp'
- long_title='sat equiv pot temp'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit='deg k'
- vector1='0' vector2='0'
- contour_interval='5.0' specification=''/>
- <param code='11' mars=''
- short_title='u-com div wind'
- long_title='u-comp divergent wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='12' mars=''
- short_title='v-com div wind'
- long_title='v-comp divergent wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='13' mars=''
- short_title='u-com rot wind'
- long_title='u-comp rotational wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='14' mars=''
- short_title='v-com rot wind'
- long_title='v-comp rotational wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='21' mars=''
- short_title='UCTP'
- long_title='Unbalanced component of temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='22' mars=''
- short_title='UCLN'
- long_title='Unbalanced component of logarithm of surface pressure'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='23' mars=''
- short_title='UCDV'
- long_title='Unbalanced component of divergence'
- scaling='1.0' offset='-0.0'
- original_unit='s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='24' mars=''
- short_title='None'
- long_title='Reserved for future unbalanced components'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='25' mars=''
- short_title='None'
- long_title='Reserved for future unbalanced components'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='26' mars=''
- short_title='CL'
- long_title='Lake cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='27' mars=''
- short_title='CVL'
- long_title='Low vegetation cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='28' mars=''
- short_title='CVH'
- long_title='High vegetation cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='29' mars=''
- short_title='TVL'
- long_title='Type of low vegetation'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='30' mars=''
- short_title='TVH'
- long_title='Type of high vegetation'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='31' mars=''
- short_title='CI'
- long_title='Sea-ice cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='32' mars=''
- short_title='ASN'
- long_title='Snow albedo'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='33' mars=''
- short_title='RSN'
- long_title='Snow density'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='34' mars=''
- short_title='SSTK'
- long_title='Sea surface temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='35' mars=''
- short_title='ISTL1'
- long_title='Ice surface temperature layer 1'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='36' mars=''
- short_title='ISTL2'
- long_title='Ice surface temperature layer 2'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='37' mars=''
- short_title='ISTL3'
- long_title='Ice surface temperature layer 3'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='38' mars=''
- short_title='ISTL4'
- long_title='Ice surface temperature layer 4'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='39' mars=''
- short_title='SWVL1'
- long_title='Volumetric soil water layer 1'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='40' mars=''
- short_title='SWVL2'
- long_title='Volumetric soil water layer 2'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='41' mars=''
- short_title='SWVL3'
- long_title='Volumetric soil water layer 3'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='42' mars=''
- short_title='SWVL4'
- long_title='Volumetric soil water layer 4'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='43' mars=''
- short_title='SLT'
- long_title='Soil type'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='44' mars=''
- short_title='ES'
- long_title='Snow evaporation'
- scaling='1.0' offset='-0.0'
- original_unit='m of water' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='45' mars=''
- short_title='SMLT'
- long_title='Snowmelt'
- scaling='1.0' offset='-0.0'
- original_unit='m of water' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='46' mars=''
- short_title='SDUR'
- long_title='Solar duration'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='47' mars=''
- short_title='DSRP'
- long_title='Direct solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='w m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='48' mars=''
- short_title='MAGSS'
- long_title='Magnitude of surface stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='49' mars=''
- short_title='10FG'
- long_title='10 metre wind gust'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='50' mars=''
- short_title='LSPF'
- long_title='Large-scale precipitation fraction'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='51' mars=''
- short_title='MX2T24'
- long_title='Maximum 2 metre temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='52' mars=''
- short_title='MN2T24'
- long_title='Minimum 2 metre temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='53' mars=''
- short_title='MONT'
- long_title='Montgomery potential'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='54' mars=''
- short_title='PRES'
- long_title='Pressure'
- scaling='1.0' offset='-0.0'
- original_unit='Pa' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='55' mars=''
- short_title='MN2T24'
- long_title='Mean 2 metre temperature in past 24 hours'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='56' mars=''
- short_title='MN2D24'
- long_title='Mean 2 metre dewpoint temperature in past 24 hours'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='57' mars=''
- short_title='UVB'
- long_title='Downward UV radiation at the surface'
- scaling='1.0' offset='-0.0'
- original_unit='w m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='58' mars=''
- short_title='PAR'
- long_title='Photosynthetically active radiation at the surface'
- scaling='1.0' offset='-0.0'
- original_unit='w m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='59' mars=''
- short_title='CAPE'
- long_title='Convective available potential energy'
- scaling='1.0' offset='-0.0'
- original_unit='J kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='60' mars=''
- short_title='PV'
- long_title='Potential vorticity'
- scaling='1.0' offset='-0.0'
- original_unit='K m**2 kg**-1 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='61' mars=''
- short_title='TPO'
- long_title='Total precipitation from observations'
- scaling='1.0' offset='-0.0'
- original_unit='Millimetres*100 + number of stations' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='62' mars=''
- short_title='OBCT'
- long_title='Observation count'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='63' mars=''
- short_title='-'
- long_title='Start time for skin temperature difference'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='64' mars=''
- short_title='-'
- long_title='Finish time for skin temperature difference'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='65' mars=''
- short_title='-'
- long_title='Skin temperature difference'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='125' mars=''
- short_title='-'
- long_title='Vertically integrated total energy'
- scaling='1.0' offset='-0.0'
- original_unit='J m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='126' mars=''
- short_title='-'
- long_title='Generic parameter for sensitive area prediction'
- scaling='1.0' offset='-0.0'
- original_unit='Various' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='127' mars=''
- short_title='atmos tide'
- long_title='atmospheric tide'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='128' mars=''
- short_title='budg val'
- long_title='budget values'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='129' mars=''
- short_title='geop'
- long_title='geopotential height'
- scaling='0.0101971621297793' offset='-0.0'
- original_unit='m**2 s**-2' derived_unit='dam'
- vector1='0' vector2='0'
- contour_interval='8.0' specification='p1'/>
- <param code='130' mars=''
- short_title='temp'
- long_title='temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p2'/>
- <param code='131' mars=''
- short_title='u-vel'
- long_title='u-velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p3'/>
- <param code='132' mars=''
- short_title='v-vel'
- long_title='v-velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p4'/>
- <param code='133' mars=''
- short_title='spec hum'
- long_title='specific humidity'
- scaling='1000.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit='g/kg'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p5'/>
- <param code='134' mars=''
- short_title='surf pres'
- long_title='surface pressure'
- scaling='0.01' offset='-0.0'
- original_unit='Pa' derived_unit='hpa'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p6'/>
- <param code='135' mars=''
- short_title='vert vel'
- long_title='vertical velocity'
- scaling='1.0' offset='-0.0'
- original_unit='Pa s**-1' derived_unit='pa/s'
- vector1='0' vector2='0'
- contour_interval='4.0' specification='p7'/>
- <param code='136' mars=''
- short_title='tot col wat'
- long_title='total column water'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-2' derived_unit='kg/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='137' mars=''
- short_title='tot col wat vap'
- long_title='total column water vapour'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-2' derived_unit='kg/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='138' mars=''
- short_title='vort'
- long_title='vorticity'
- scaling='100000.0' offset='-0.0'
- original_unit='s**-1' derived_unit='10**5/sec'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p10'/>
- <param code='139' mars=''
- short_title='soil temp lyr1'
- long_title='soil temperature layer1'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='4.0' specification='p11'/>
- <param code='140' mars=''
- short_title='soil wet lyr 1'
- long_title='soil wetness layer 1'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p12'/>
- <param code='141' mars=''
- short_title='snow depth'
- long_title='snow depth'
- scaling='100.0' offset='-0.0'
- original_unit='m of water equivalent' derived_unit='cm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p13'/>
- <param code='142' mars=''
- short_title='lge scl prec'
- long_title='large scale precip'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p14'/>
- <param code='143' mars=''
- short_title='conv prec'
- long_title='convective precip'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p15'/>
- <param code='144' mars=''
- short_title='snowf'
- long_title='snowfall'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water equivalent' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p16'/>
- <param code='145' mars=''
- short_title='bound lyr diss'
- long_title='boundary layer dissip'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p17'/>
- <param code='146' mars=''
- short_title='surf sens ht flux'
- long_title='surf sensible heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p18'/>
- <param code='147' mars=''
- short_title='surf lat ht flux'
- long_title='surf latent heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p19'/>
- <param code='148' mars=''
- short_title='CHNK'
- long_title='Charnock'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='149' mars=''
- short_title='SNR'
- long_title='Surface net radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='150' mars=''
- short_title='TNR'
- long_title='Top net radiation'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='151' mars=''
- short_title='msl'
- long_title='mean sea level pressure'
- scaling='0.01' offset='-0.0'
- original_unit='Pa' derived_unit='hpa'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p23'/>
- <param code='152' mars=''
- short_title='log surf pres'
- long_title='log surface pressure'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p24'/>
- <param code='153' mars=''
- short_title='SWHR'
- long_title='Short-wave heating rate'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='154' mars=''
- short_title='LWHR'
- long_title='Long-wave heating rate'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='155' mars=''
- short_title='diverg'
- long_title='divergence'
- scaling='100000.0' offset='-0.0'
- original_unit='s**-1' derived_unit='10**5/sec'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p27'/>
- <param code='156' mars=''
- short_title='hgt (geop)'
- long_title='height (geopotential)'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit='m'
- vector1='0' vector2='0'
- contour_interval='40.0' specification='p28'/>
- <param code='157' mars=''
- short_title='rel hum'
- long_title='relative humidity'
- scaling='1.0' offset='-0.0'
- original_unit='%' derived_unit='%'
- vector1='0' vector2='0'
- contour_interval='20.0' specification='p29'/>
- <param code='158' mars=''
- short_title='surf press tend'
- long_title='tendency of surf press'
- scaling='1.0' offset='-0.0'
- original_unit='Pa s**-1' derived_unit='pa/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p30'/>
- <param code='159' mars=''
- short_title='BLH'
- long_title='Boundary layer height'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='160' mars=''
- short_title='stdev orog'
- long_title='std dev of orography'
- scaling='100.0' offset='-0.0'
- original_unit='' derived_unit='cm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='161' mars=''
- short_title='anisot sub-grid orog'
- long_title='anistropy of sub-gridscale orography'
- scaling='0.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='162' mars=''
- short_title='angle sub-grid orog'
- long_title='angle of sub-gridscale orography'
- scaling='0.0' offset='-0.0'
- original_unit='rad' derived_unit='rad'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='163' mars=''
- short_title='slope sub-grid orog'
- long_title='slope of sub-gridscale orography'
- scaling='0.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='164' mars=''
- short_title='tot cldcov'
- long_title='total cloudcover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.1' specification='p36'/>
- <param code='165' mars=''
- short_title='10m u'
- long_title='10 mtr u'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p37'/>
- <param code='166' mars=''
- short_title='10m v'
- long_title='10 mtr v'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p38'/>
- <param code='167' mars=''
- short_title='2m temp'
- long_title='2 metre temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p39'/>
- <param code='168' mars=''
- short_title='2m dewp'
- long_title='2 metre dewpoint temp'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p40'/>
- <param code='169' mars=''
- short_title='sur sol rad dwn'
- long_title='surf solar radiation downwards'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='170' mars=''
- short_title='soil temp lyr2'
- long_title='soil temperature layer2'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p42'/>
- <param code='171' mars=''
- short_title='soil wet lyr2'
- long_title='soil wetness layer2'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='1.0' specification='p43'/>
- <param code='172' mars=''
- short_title='l/sea mask'
- long_title='land/ sea mask'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='0/1'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='173' mars=''
- short_title='surf rough'
- long_title='surface roughness'
- scaling='100.0' offset='-0.0'
- original_unit='m' derived_unit='cm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='174' mars=''
- short_title='albedo'
- long_title='albedo'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='175' mars=''
- short_title='sur ther rad dwn'
- long_title='surf thermal radiation downwards'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='176' mars=''
- short_title='surf solrad'
- long_title='surf solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='177' mars=''
- short_title='surf ther rad'
- long_title='surf thermal radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='178' mars=''
- short_title='topsolrad'
- long_title='top solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='179' mars=''
- short_title='top ther rad'
- long_title='top thermal radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='180' mars=''
- short_title='u-stress'
- long_title='u-stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='181' mars=''
- short_title='v-stress'
- long_title='v-stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='182' mars=''
- short_title='evap'
- long_title='evaporation'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='183' mars=''
- short_title='soil temp lyr3'
- long_title='soil temperature layer3'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='184' mars=''
- short_title='soil wet lyr3'
- long_title='soil wetness layer3'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='185' mars=''
- short_title='conv cld cov'
- long_title='convective cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='186' mars=''
- short_title='low cld cov'
- long_title='low cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='187' mars=''
- short_title='med cld cov'
- long_title='medium cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='188' mars=''
- short_title='hi cld cov'
- long_title='high cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='189' mars=''
- short_title='SUND'
- long_title='Sunshine duration'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='190' mars=''
- short_title='ew comp subgrid orog var'
- long_title='ew comp subgrid orog var'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit='sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='191' mars=''
- short_title='ns comp subgrid orog var'
- long_title='ns comp subgrid orog var'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit='sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='192' mars=''
- short_title='nwse com subgrd orog var'
- long_title='nwse com subgrd orog var'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit='sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='193' mars=''
- short_title='nswe com subgrd orog var'
- long_title='nswe com subgrd orog var'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit='sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='194' mars=''
- short_title='BTMP'
- long_title='Brightness temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='195' mars=''
- short_title='lat comp grav wav stress'
- long_title='lat comp grav wav stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='196' mars=''
- short_title='mer comp grav wav stress'
- long_title='mer comp grav wav stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='197' mars=''
- short_title='grav wav diss'
- long_title='gravity wav dissipation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='198' mars=''
- short_title='skin res cont'
- long_title='skin reservoir content'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='199' mars=''
- short_title='percent of veg'
- long_title='percent of vegetation'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='%'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='200' mars=''
- short_title='var subgrid-scale orog'
- long_title='var subgrid-scale orog'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit='sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='201' mars=''
- short_title='max 2m tem'
- long_title='maximum temp at 2m'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='202' mars=''
- short_title='min 2m tem'
- long_title='minimum temp at 2 m'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='203' mars=''
- short_title='O3'
- long_title='Ozone mass mixing ratio'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='204' mars=''
- short_title='prec anal weights'
- long_title='precip. analys weights'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='205' mars=''
- short_title='runoff'
- long_title='runoff'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='206' mars=''
- short_title='TCO3'
- long_title='Total column ozone'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='207' mars=''
- short_title='10SI'
- long_title='10 metre wind speed'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='208' mars=''
- short_title='TSRC'
- long_title='Top net solar radiation, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='209' mars=''
- short_title='TTRC'
- long_title='Top net thermal radiation, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='210' mars=''
- short_title='SSRC'
- long_title='Surface net solar radiation, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='211' mars=''
- short_title='STRC'
- long_title='Surface net thermal radiation, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='212' mars=''
- short_title='TISR'
- long_title='TOA incident solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='214' mars=''
- short_title='DHR'
- long_title='Diabatic heating by radiation'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='215' mars=''
- short_title='DHVD'
- long_title='Diabatic heating by vertical diffusion'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='216' mars=''
- short_title='DHCC'
- long_title='Diabatic heating by cumulus convection'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='217' mars=''
- short_title='DHLC'
- long_title='Diabatic heating by large-scale condensation'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='218' mars=''
- short_title='VDZW'
- long_title='Vertical diffusion of zonal wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='219' mars=''
- short_title='VDMW'
- long_title='Vertical diffusion of meridional wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='220' mars=''
- short_title='EWGD'
- long_title='East-West gravity wave drag tendency'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='221' mars=''
- short_title='NSGD'
- long_title='North-South gravity wave drag tendency'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='222' mars=''
- short_title='CTZW'
- long_title='Convective tendency of zonal wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='223' mars=''
- short_title='CTMW'
- long_title='Convective tendency of meridional wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='224' mars=''
- short_title='VDH'
- long_title='Vertical diffusion of humidity'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='225' mars=''
- short_title='HTCC'
- long_title='Humidity tendency by cumulus convection'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='226' mars=''
- short_title='HTLC'
- long_title='Humidity tendency by large-scale condensation'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='227' mars=''
- short_title='CRNH'
- long_title='Change from removal of negative humidity'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='228' mars=''
- short_title='tot prec'
- long_title='total precipitation'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='229' mars=''
- short_title='instant e/w surf str'
- long_title='instant e/w surf stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='230' mars=''
- short_title='inst n/s surf str'
- long_title='instant n/s surf stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='231' mars=''
- short_title='inst surf sens heat flux'
- long_title='inst surf sens heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit='w/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='232' mars=''
- short_title='inst evap'
- long_title='instant evaporation'
- scaling='1000.0' offset='-0.0'
- original_unit='kg m**-2 s' derived_unit='g/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='233' mars=''
- short_title='appar surf hum'
- long_title='apparent surf humidity'
- scaling='1000.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit='g/kg'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='234' mars=''
- short_title='log surf rough for heat'
- long_title='log surf rough for heat'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='235' mars=''
- short_title='skin temp'
- long_title='skin temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p43'/>
- <param code='236' mars=''
- short_title='soil temp lyr4'
- long_title='soil temperature layer4'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p43'/>
- <param code='237' mars=''
- short_title='soil wet lyr 4'
- long_title='soil wetness layer 4'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p43'/>
- <param code='238' mars=''
- short_title='snow temp'
- long_title='snow temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p43'/>
- <param code='239' mars=''
- short_title='conv snow'
- long_title='convective snowfall'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water equivalent' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='240' mars=''
- short_title='lge scal snow'
- long_title='large scale snowfall'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water equivalent' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='241' mars=''
- short_title='ACF'
- long_title='Accumulated cloud fraction tendency'
- scaling='1.0' offset='-0.0'
- original_unit='(-1 to 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='242' mars=''
- short_title='ALW'
- long_title='Accumulated liquid water tendency'
- scaling='1.0' offset='-0.0'
- original_unit='(-1 to 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='243' mars=''
- short_title='fore albedo'
- long_title='forecast albedo'
- scaling='0.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='244' mars=''
- short_title='fore surf rough'
- long_title='forecast surface roughness'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='245' mars=''
- short_title='fore log surf rough/heat'
- long_title='forecast log surface roughness for heat'
- scaling='0.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='246' mars=''
- short_title='cloud liq wat con'
- long_title='cloud liquid water content'
- scaling='1000.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit='gm/kg'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='247' mars=''
- short_title='cloud ice wat con'
- long_title='cloud ice water content'
- scaling='1000.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit='gm/kg'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='248' mars=''
- short_title='cloud cov'
- long_title='cloud cover'
- scaling='0.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='249' mars=''
- short_title='AIW'
- long_title='Accumulated ice water tendency'
- scaling='1.0' offset='-0.0'
- original_unit='(-1 to 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='250' mars=''
- short_title='ice age'
- long_title='ice age'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='%'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='251' mars=''
- short_title='unbal comp temp'
- long_title='unbalanced component of temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg C'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='252' mars=''
- short_title='unbal comp LNSP'
- long_title='unbalanced component of LNSP'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='253' mars=''
- short_title='unbal comp div'
- long_title='unbalanced component of divergence'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='254' mars=''
- short_title='ATMW'
- long_title='Adiabatic tendency of meridional wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- </table>
-</center>
+ <param code='129'
+ original_unit='m**2 s**-2' derived_unit='dam'
+ scaling='0.0101971621297793' offset='-0.0'/>
+ <param code='130'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='133'
+ original_unit='kg kg**-1' derived_unit='g/kg'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='134'
+ original_unit='Pa' derived_unit='hpa'
+ scaling='0.01' offset='-0.0'/>
+ <param code='138'
+ original_unit='s**-1' derived_unit='10**5/sec'
+ scaling='100000.0' offset='-0.0'/>
+ <param code='139'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='140'
+ original_unit='m of water' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='141'
+ original_unit='m of water equivalent' derived_unit='cm'
+ scaling='100.0' offset='-0.0'/>
+ <param code='142'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='143'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='144'
+ original_unit='m of water equivalent' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='151'
+ original_unit='Pa' derived_unit='hpa'
+ scaling='0.01' offset='-0.0'/>
+ <param code='155'
+ original_unit='s**-1' derived_unit='10**5/sec'
+ scaling='100000.0' offset='-0.0'/>
+ <param code='160'
+ original_unit='' derived_unit='cm'
+ scaling='100.0' offset='-0.0'/>
+ <param code='167'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='168'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='170'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='171'
+ original_unit='m of water' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='173'
+ original_unit='m' derived_unit='cm'
+ scaling='100.0' offset='-0.0'/>
+ <param code='182'
+ original_unit='m of water' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='183'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='184'
+ original_unit='m of water' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='198'
+ original_unit='m of water' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='201'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='202'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='205'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='228'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='232'
+ original_unit='kg m**-2 s' derived_unit='g/sq m'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='233'
+ original_unit='kg kg**-1' derived_unit='g/kg'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='235'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='236'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='237'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='238'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='239'
+ original_unit='m of water equivalent' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='240'
+ original_unit='m of water equivalent' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='244'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='246'
+ original_unit='kg kg**-1' derived_unit='gm/kg'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='247'
+ original_unit='kg kg**-1' derived_unit='gm/kg'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='251'
+ original_unit='K' derived_unit='deg C'
+ scaling='1.0' offset='-273.16'/>
+ </table>
+<centre/>
diff --git a/share/magics/table_130.xml b/share/magics/table_130.xml
index 951414c..a070948 100644
--- a/share/magics/table_130.xml
+++ b/share/magics/table_130.xml
@@ -2,188 +2,13 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='130'>
- <param code='208' mars=''
- short_title='TSRU'
- long_title='Top solar radiation upward'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='209' mars=''
- short_title='TTRU'
- long_title='Top thermal radiation upward'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='210' mars=''
- short_title='TSUC'
- long_title='Top solar radiation upward, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='211' mars=''
- short_title='TTUC'
- long_title='Top thermal radiation upward, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='212' mars=''
- short_title='CLW'
- long_title='Cloud liquid water'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='213' mars=''
- short_title='CF'
- long_title='Cloud fraction'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='214' mars=''
- short_title='DHR'
- long_title='Diabatic heating by radiation'
- scaling='1.0' offset='-0.0'
- original_unit='K s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='215' mars=''
- short_title='DHVD'
- long_title='Diabatic heating by vertical diffusion'
- scaling='1.0' offset='-0.0'
- original_unit='K s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='216' mars=''
- short_title='DHCC'
- long_title='Diabatic heating by cumulus convection'
- scaling='1.0' offset='-0.0'
- original_unit='K s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='217' mars=''
- short_title='DHLC'
- long_title='Diabatic heating by large-scale condensation'
- scaling='1.0' offset='-0.0'
- original_unit='K s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='218' mars=''
- short_title='VDZW'
- long_title='Vertical diffusion of zonal wind'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='219' mars=''
- short_title='VDMW'
- long_title='Vertical diffusion of meridional wind'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='220' mars=''
- short_title='EWGD'
- long_title='East-West gravity wave drag'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='221' mars=''
- short_title='NSGD'
- long_title='North-South gravity wave drag'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='222' mars=''
- short_title='CTZW'
- long_title='Convective tendency of zonal wind'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='223' mars=''
- short_title='CTMW'
- long_title='Convective tendency of meridional wind'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='224' mars=''
- short_title='VDH'
- long_title='Vertical diffusion of humidity'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='225' mars=''
- short_title='HTCC'
- long_title='Humidity tendency by cumulus convection'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='226' mars=''
- short_title='HTLC'
- long_title='Humidity tendency by large-scale condensation'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='227' mars=''
- short_title='CRNH'
- long_title='Change from removal of negative humidity'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='228' mars=''
- short_title='ATT'
- long_title='Adiabatic tendency of temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='229' mars=''
- short_title='ATH'
- long_title='Adiabatic tendency of humidity'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='230' mars=''
- short_title='ATZW'
- long_title='Adiabatic tendency of zonal wind'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='231' mars=''
- short_title='ATMWAX'
- long_title='Adiabatic tendency of meridional wind'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='232' mars=''
- short_title='MVV'
- long_title='Mean vertical velocity'
- scaling='1.0' offset='-0.0'
- original_unit='Pa s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- </table>
-</center>
+ </table>
+<centre/>
diff --git a/share/magics/table_131.xml b/share/magics/table_131.xml
index bded925..821d0de 100644
--- a/share/magics/table_131.xml
+++ b/share/magics/table_131.xml
@@ -2,76 +2,13 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='131'>
- <param code='6' mars=''
- short_title='tot prec'
- long_title='Probability total precipitation anomaly of at least 20 mm/week'
- scaling='1.0' offset='-0.0'
- original_unit='%' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='7' mars=''
- short_title='tot prec'
- long_title='Probability total precipitation anomaly of at least 10 mm/week'
- scaling='1.0' offset='-0.0'
- original_unit='%' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='49' mars=''
- short_title='gust 10m'
- long_title='wind gust at 10m'
- scaling='1.0' offset='-0.0'
- original_unit='percentage' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='130' mars=''
- short_title='temp anom'
- long_title='temperature anomaly'
- scaling='1.0' offset='-0.0'
- original_unit='percentage' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p2'/>
- <param code='165' mars=''
- short_title='10m spd prob'
- long_title='10m wind speed probability'
- scaling='1.0' offset='-0.0'
- original_unit='percentage' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p37'/>
- <param code='167' mars=''
- short_title='2m tmp prob'
- long_title='2m temperature probability'
- scaling='1.0' offset='-0.0'
- original_unit='percentage' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='228' mars=''
- short_title='tot prec'
- long_title='total precipitation'
- scaling='1.0' offset='-0.0'
- original_unit='percentage' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='229' mars=''
- short_title='Hs proba'
- long_title='significant wave height probability'
- scaling='1.0' offset='-0.0'
- original_unit='percentage' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='232' mars=''
- short_title='Period proba'
- long_title='mean wave period probability'
- scaling='1.0' offset='-0.0'
- original_unit='percentage' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- </table>
-</center>
+ </table>
+<centre/>
diff --git a/share/magics/table_132.xml b/share/magics/table_132.xml
index e40d46a..d20c07e 100644
--- a/share/magics/table_132.xml
+++ b/share/magics/table_132.xml
@@ -2,41 +2,13 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='132'>
- <param code='49' mars=''
- short_title='10GP'
- long_title='Maximum 10 metre wind gust index'
- scaling='1.0' offset='-0.0'
- original_unit='(-1 to 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='165' mars=''
- short_title='10SP'
- long_title='10 metre speed index'
- scaling='1.0' offset='-0.0'
- original_unit='(-1 to 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='167' mars=''
- short_title='2TP'
- long_title='2 metre temperature index'
- scaling='1.0' offset='-0.0'
- original_unit='(-1 to 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='228' mars=''
- short_title='TTP'
- long_title='Total precipitation index'
- scaling='1.0' offset='-0.0'
- original_unit='(-1 to 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- </table>
-</center>
+ </table>
+<centre/>
diff --git a/share/magics/table_140.xml b/share/magics/table_140.xml
index f9b12d4..829b35b 100644
--- a/share/magics/table_140.xml
+++ b/share/magics/table_140.xml
@@ -2,265 +2,13 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='140'>
- <param code='219' mars=''
- short_title='WMB'
- long_title='wave model bathymetry'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit='m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='220' mars=''
- short_title='mean wave per (m1)'
- long_title='mean wave period (m1)'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit='sec'
- vector1='0' vector2='0'
- contour_interval='1.0' specification='p43'/>
- <param code='221' mars=''
- short_title='mean wave per (m2)'
- long_title='mean wave period (m2)'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit='sec'
- vector1='0' vector2='0'
- contour_interval='1.0' specification='p43'/>
- <param code='222' mars=''
- short_title='wave spec dir width'
- long_title='wave spectral dir width'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.1' specification='p43'/>
- <param code='223' mars=''
- short_title='mean wave per (m1) wind wav'
- long_title='mean wave period (m1) wind waves'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit='sec'
- vector1='0' vector2='0'
- contour_interval='2.0' specification='p43'/>
- <param code='224' mars=''
- short_title='mean wave per (m2) wind wav'
- long_title='mean wave period (m2) wind waves'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit='sec'
- vector1='0' vector2='0'
- contour_interval='2.0' specification='p43'/>
- <param code='225' mars=''
- short_title='wave spec dir width wind wav'
- long_title='wave spectral dir width of wind waves'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.1' specification='p43'/>
- <param code='226' mars=''
- short_title='mean wave per (m1) swell'
- long_title='mean wave period (m1) swell'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit='sec'
- vector1='0' vector2='0'
- contour_interval='1.0' specification='p43'/>
- <param code='227' mars=''
- short_title='mean wave per (m2) swell'
- long_title='mean wave period (m2) swell'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit='sec'
- vector1='0' vector2='0'
- contour_interval='1.0' specification='p43'/>
- <param code='228' mars=''
- short_title='wave spec dir width swell'
- long_title='wave spectral dir width of swell'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.1' specification='p43'/>
- <param code='229' mars=''
- short_title='sig wave hgt'
- long_title='significant wave height'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit='m'
- vector1='0' vector2='0'
- contour_interval='1.0' specification='p43'/>
- <param code='230' mars=''
- short_title='mean wave dir'
- long_title='mean wave direction'
- scaling='1.0' offset='-0.0'
- original_unit='degrees' derived_unit='deg'
- vector1='0' vector2='0'
- contour_interval='10.0' specification='p43'/>
- <param code='231' mars=''
- short_title='peak per 1d spec'
- long_title='peak period 1d spectra'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit='sec'
- vector1='0' vector2='0'
- contour_interval='2.0' specification='p43'/>
- <param code='232' mars=''
- short_title='mean wave per'
- long_title='mean wave period'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit='sec'
- vector1='0' vector2='0'
- contour_interval='2.0' specification='p43'/>
- <param code='233' mars=''
- short_title='drag coeff with waves'
- long_title='drag coeff with waves'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.001' specification='p43'/>
- <param code='234' mars=''
- short_title='sig hgt wind waves'
- long_title='sig height wind waves'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit='m'
- vector1='0' vector2='0'
- contour_interval='1.0' specification='p43'/>
- <param code='235' mars=''
- short_title='mean dir wind waves'
- long_title='mean dir wind waves'
- scaling='1.0' offset='-0.0'
- original_unit='degrees' derived_unit='deg'
- vector1='0' vector2='0'
- contour_interval='10.0' specification='p43'/>
- <param code='236' mars=''
- short_title='mean per wind waves'
- long_title='mean period wind waves'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit='sec'
- vector1='0' vector2='0'
- contour_interval='2.0' specification='p43'/>
- <param code='237' mars=''
- short_title='sig hgt prim swell'
- long_title='sig height prim swell'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit='m'
- vector1='0' vector2='0'
- contour_interval='1.0' specification='p43'/>
- <param code='238' mars=''
- short_title='mean dir prim swell'
- long_title='mean dir prim swell'
- scaling='1.0' offset='-0.0'
- original_unit='degrees' derived_unit='deg'
- vector1='0' vector2='0'
- contour_interval='10.0' specification='p43'/>
- <param code='239' mars=''
- short_title='mean per prim swell'
- long_title='mean period prim swell'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit='sec'
- vector1='0' vector2='0'
- contour_interval='2.0' specification='p43'/>
- <param code='240' mars=''
- short_title='st dev wave hgt'
- long_title='st dev wave height'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit='m'
- vector1='0' vector2='0'
- contour_interval='0.5' specification='p43'/>
- <param code='241' mars=''
- short_title='mean windspd'
- long_title='mean windspeed'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p43'/>
- <param code='242' mars=''
- short_title='mean wind dir'
- long_title='mean wind direction'
- scaling='1.0' offset='-0.0'
- original_unit='degrees' derived_unit='deg'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='243' mars=''
- short_title='st dev 10m windspd'
- long_title='st dev 10m windspeed'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.5' specification='p43'/>
- <param code='244' mars=''
- short_title='mean sq slope'
- long_title='mean square slope'
- scaling='1.0' offset='-0.0'
- original_unit='dimensionless' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.01' specification='p43'/>
- <param code='245' mars=''
- short_title='windspd mod by wave mod'
- long_title='wind speed modified by wave model'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='2.0' specification='p43'/>
- <param code='246' mars=''
- short_title='gridded alt wave hgt'
- long_title='gridded altimeter wave height'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit='m'
- vector1='0' vector2='0'
- contour_interval='1.0' specification='p43'/>
- <param code='247' mars=''
- short_title='gridded corr alt wave hgt'
- long_title='gridded corrected altimeter wave height'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit='m'
- vector1='0' vector2='0'
- contour_interval='1.0' specification='p43'/>
- <param code='248' mars=''
- short_title='gridded alt range rel corr'
- long_title='gridded altimeter range relative correction'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit='m'
- vector1='0' vector2='0'
- contour_interval='1.0' specification='p43'/>
- <param code='249' mars=''
- short_title='10m wind dir by wave mod'
- long_title='10m wind direction by wave model'
- scaling='1.0' offset='-0.0'
- original_unit='degrees' derived_unit='deg'
- vector1='0' vector2='0'
- contour_interval='20.0' specification='p43'/>
- <param code='250' mars=''
- short_title='2-d wave spectrum'
- long_title='2-d wave spectrum'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s radian**-1' derived_unit='m**2s/radiance'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='251' mars=''
- short_title='log10 2-d wave spec per freq/dir'
- long_title='log10 of 2-d wave spectrum per freq/dir'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s radian**-1' derived_unit='m**2s/radiance'
- vector1='0' vector2='0'
- contour_interval='0.5' specification='p43'/>
- <param code='252' mars=''
- short_title='WSK'
- long_title='Wave spectral kurtosis'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='253' mars=''
- short_title='BFI'
- long_title='Benjamin-Feir index'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='254' mars=''
- short_title='WSP'
- long_title='Wave spectral peakedness'
- scaling='1.0' offset='-0.0'
- original_unit='s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- </table>
-</center>
+ </table>
+<centre/>
diff --git a/share/magics/table_150.xml b/share/magics/table_150.xml
index 4b0d01d..c7cf7f9 100644
--- a/share/magics/table_150.xml
+++ b/share/magics/table_150.xml
@@ -2,230 +2,13 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='150'>
- <param code='129' mars=''
- short_title='NONE'
- long_title='Ocean potential temperature'
- scaling='1.0' offset='-0.0'
- original_unit='deg C' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='130' mars=''
- short_title='NONE'
- long_title='Ocean salinity'
- scaling='1.0' offset='-0.0'
- original_unit='psu' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='131' mars=''
- short_title='NONE'
- long_title='Ocean potential density'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-3 -1000' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='133' mars=''
- short_title='NONE'
- long_title='Ocean U velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='134' mars=''
- short_title='NONE'
- long_title='Ocean V velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='135' mars=''
- short_title='NONE'
- long_title='Ocean W velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='137' mars=''
- short_title='NONE'
- long_title='Richardson number'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='139' mars=''
- short_title='NONE'
- long_title='U*V product'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='140' mars=''
- short_title='NONE'
- long_title='U*T product'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1 deg C' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='141' mars=''
- short_title='NONE'
- long_title='V*T product'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1 deg C' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='142' mars=''
- short_title='NONE'
- long_title='U*U product'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='143' mars=''
- short_title='NONE'
- long_title='V*V product'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='144' mars=''
- short_title='NONE'
- long_title='UV - U~V~'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='145' mars=''
- short_title='NONE'
- long_title='UT - U~T~'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1 deg C' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='146' mars=''
- short_title='NONE'
- long_title='VT - V~T~'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1 deg C' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='147' mars=''
- short_title='NONE'
- long_title='UU - U~U~'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='148' mars=''
- short_title='NONE'
- long_title='VV - V~V~'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='152' mars=''
- short_title='NONE'
- long_title='Sea level'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='153' mars=''
- short_title='NONE'
- long_title='Barotropic stream function'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='154' mars=''
- short_title='NONE'
- long_title='Mixed layer depth'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='155' mars=''
- short_title='NONE'
- long_title='Depth'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='168' mars=''
- short_title='NONE'
- long_title='U stress'
- scaling='1.0' offset='-0.0'
- original_unit='Pa' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='169' mars=''
- short_title='NONE'
- long_title='V stress'
- scaling='1.0' offset='-0.0'
- original_unit='Pa' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='170' mars=''
- short_title='NONE'
- long_title='Turbulent kinetic energy input'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='171' mars=''
- short_title='NONE'
- long_title='Net surface heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='172' mars=''
- short_title='NONE'
- long_title='Surface solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='173' mars=''
- short_title='NONE'
- long_title='P-E'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='180' mars=''
- short_title='NONE'
- long_title='Diagnosed sea surface temperature error'
- scaling='1.0' offset='-0.0'
- original_unit='deg C' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='181' mars=''
- short_title='NONE'
- long_title='Heat flux correction'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='182' mars=''
- short_title='NONE'
- long_title='Observed sea surface temperature'
- scaling='1.0' offset='-0.0'
- original_unit='deg C' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='183' mars=''
- short_title='NONE'
- long_title='Observed heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- </table>
-</center>
+ </table>
+<centre/>
diff --git a/share/magics/table_151.xml b/share/magics/table_151.xml
index 79e25aa..2ea10fd 100644
--- a/share/magics/table_151.xml
+++ b/share/magics/table_151.xml
@@ -2,321 +2,16 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='151'>
- <param code='129' mars=''
- short_title='pot temp'
- long_title='potential temperature'
- scaling='1.0' offset='-0.0'
- original_unit='deg C' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='130' mars=''
- short_title='salin'
- long_title='salinity'
- scaling='1.0' offset='-0.0'
- original_unit='psu' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='131' mars=''
- short_title='u-vel'
- long_title='u-velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='132' mars=''
- short_title='v-vel'
- long_title='v-velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='133' mars=''
- short_title='w-vel'
- long_title='w-velocity'
- scaling='1.15740740740741e-05.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/day'
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='134' mars=''
- short_title='mod str rate ten'
- long_title='mod strain rate tensor'
- scaling='1.0' offset='-0.0'
- original_unit='s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='135' mars=''
- short_title='vert vis'
- long_title='vertical viscosity'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='136' mars=''
- short_title='vert diff'
- long_title='vertical diffusivity'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='137' mars=''
- short_title='depth'
- long_title='depth'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='138' mars=''
- short_title='sigma-theta'
- long_title='sigma-theta'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='139' mars=''
- short_title='rich num'
- long_title='richarson number'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='145' mars=''
- short_title='sea level'
- long_title='sea level (tides removed)'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='146' mars=''
- short_title='sea fl top'
- long_title='sea floor topography'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='147' mars=''
- short_title='baro strm fn'
- long_title='barotropic streamfunction'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 s**-1' derived_unit='sv'
- vector1='0' vector2='0'
- contour_interval='1e+10.0' specification=''/>
- <param code='148' mars=''
- short_title='mix lay dep'
- long_title='mixed layer depth'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='153' mars=''
- short_title='u-stress'
- long_title='u-stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='154' mars=''
- short_title='v-stress'
- long_title='v-stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='155' mars=''
- short_title='tur kin eng inp'
- long_title='turbulent kinet ener inp'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='156' mars=''
- short_title='netsur ht flux'
- long_title='net surface heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='157' mars=''
- short_title='abs sol rad'
- long_title='absorbed solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='158' mars=''
- short_title='prec_evap'
- long_title='precip _ evaporation'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='mm/day'
- vector1='0' vector2='0'
- contour_interval='8.64e+07.0' specification=''/>
- <param code='159' mars=''
- short_title='spec sst'
- long_title='specified sst'
- scaling='1.0' offset='-0.0'
- original_unit='deg C' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='160' mars=''
- short_title='spec sur ht fluf'
- long_title='specified surf heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='161' mars=''
- short_title='diag ssterr'
- long_title='diagnose sst error'
- scaling='1.0' offset='-0.0'
- original_unit='deg C' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='162' mars=''
- short_title='ht flux cor'
- long_title='heat flux correction'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='163' mars=''
- short_title='20D'
- long_title='20 degrees isotherm depth'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='164' mars=''
- short_title='TAV300'
- long_title='Average potential temperature in the upper 300m'
- scaling='1.0' offset='-0.0'
- original_unit='degrees C' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='167' mars=''
- short_title='ZTR'
- long_title='Vertically integrated zonal volume transport'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='168' mars=''
- short_title='MTR'
- long_title='Vertically integrated meridional volume transport'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='169' mars=''
- short_title='ZHT'
- long_title='Vertically integrated zonal heat transport'
- scaling='1.0' offset='-0.0'
- original_unit='J m**-1 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='170' mars=''
- short_title='MHT'
- long_title='Vertically integrated meridional heat transport'
- scaling='1.0' offset='-0.0'
- original_unit='J m**-1 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='171' mars=''
- short_title='UMAX'
- long_title='U velocity maximum'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='172' mars=''
- short_title='DUMAX'
- long_title='Depth of the velocity maximum'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='173' mars=''
- short_title='SMAX'
- long_title='Salinity maximum'
- scaling='1.0' offset='-0.0'
- original_unit='psu' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='174' mars=''
- short_title='DSMAX'
- long_title='Depth of salinity maximum'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='175' mars=''
- short_title='SAV300'
- long_title='Average salinity in the upper 300m'
- scaling='1.0' offset='-0.0'
- original_unit='psu' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='178' mars=''
- short_title='PTI'
- long_title='Potential temperature increment'
- scaling='1.0' offset='-0.0'
- original_unit='deg C' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='179' mars=''
- short_title='PTAE'
- long_title='Potential temperature analysis error'
- scaling='1.0' offset='-0.0'
- original_unit='deg C' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='180' mars=''
- short_title='BPT'
- long_title='Background potential temperature'
- scaling='1.0' offset='-0.0'
- original_unit='deg C' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='181' mars=''
- short_title='APT'
- long_title='Analysed potential temperature'
- scaling='1.0' offset='-0.0'
- original_unit='deg C' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='182' mars=''
- short_title='PTBE'
- long_title='Potential temperature background error'
- scaling='1.0' offset='-0.0'
- original_unit='deg C' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='183' mars=''
- short_title='AS'
- long_title='Analysed salinity'
- scaling='1.0' offset='-0.0'
- original_unit='psu' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='184' mars=''
- short_title='SALI'
- long_title='Salinity increment'
- scaling='1.0' offset='-0.0'
- original_unit='psu' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='255' mars=''
- short_title='NONE'
- long_title=''
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- </table>
-</center>
+ <param code='133'
+ original_unit='m s**-1' derived_unit='m/day'
+ scaling='1.15740740740741e-05' offset='-0.0'/>
+ </table>
+<centre/>
diff --git a/share/magics/table_160.xml b/share/magics/table_160.xml
index acfaba5..23a71f6 100644
--- a/share/magics/table_160.xml
+++ b/share/magics/table_160.xml
@@ -2,762 +2,121 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='160'>
- <param code='127' mars=''
- short_title='atmos tide'
- long_title='atmospheric tide'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='128' mars=''
- short_title='budg val'
- long_title='budget values'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='129' mars=''
- short_title='geop'
- long_title='geopotential'
- scaling='0.0101971621297793' offset='-0.0'
- original_unit='m**2 s**-2' derived_unit='dam'
- vector1='0' vector2='0'
- contour_interval='8.0' specification='p1'/>
- <param code='130' mars=''
- short_title='temp'
- long_title='temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p2'/>
- <param code='131' mars=''
- short_title='u-vel'
- long_title='u-velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p3'/>
- <param code='132' mars=''
- short_title='v-vel'
- long_title='v-velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p4'/>
- <param code='133' mars=''
- short_title='spec hum'
- long_title='specific humidity'
- scaling='1000.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit='g/kg'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p5'/>
- <param code='134' mars=''
- short_title='surf pres'
- long_title='surface pressure'
- scaling='0.01' offset='-0.0'
- original_unit='Pa' derived_unit='hpa'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p6'/>
- <param code='135' mars=''
- short_title='vert vel'
- long_title='vertical velocity'
- scaling='1.0' offset='-0.0'
- original_unit='Pa s**-1' derived_unit='pa/s'
- vector1='0' vector2='0'
- contour_interval='4.0' specification='p7'/>
- <param code='136' mars=''
- short_title='tot col wat'
- long_title='total column water'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-2' derived_unit='kg/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p9'/>
- <param code='137' mars=''
- short_title='tot col wat vap'
- long_title='total column water vapour'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-2' derived_unit='kg/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p9'/>
- <param code='138' mars=''
- short_title='vort'
- long_title='vorticity'
- scaling='100000.0' offset='-0.0'
- original_unit='s**-1' derived_unit='10**5/sec'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p10'/>
- <param code='139' mars=''
- short_title='soil temp lyr1'
- long_title='soil temperature layer1'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='4.0' specification='p11'/>
- <param code='140' mars=''
- short_title='soil wet lyr 1'
- long_title='soil wetness layer 1'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p12'/>
- <param code='141' mars=''
- short_title='snow depth'
- long_title='snow depth'
- scaling='100.0' offset='-0.0'
- original_unit='m of water' derived_unit='cm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p13'/>
- <param code='142' mars=''
- short_title='lge scl prec'
- long_title='large scale precip'
- scaling='1000.0' offset='-0.0'
- original_unit='kg m**-2 s**-1' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p14'/>
- <param code='143' mars=''
- short_title='conv prec'
- long_title='convective precip'
- scaling='1000.0' offset='-0.0'
- original_unit='kg m**-2 s**-1' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p15'/>
- <param code='144' mars=''
- short_title='snowf'
- long_title='snowfall'
- scaling='1000.0' offset='-0.0'
- original_unit='kg m**-2 s**-1' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p16'/>
- <param code='145' mars=''
- short_title='bound lyr diss'
- long_title='boundary layer dissip'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p17'/>
- <param code='146' mars=''
- short_title='surf sens ht flux'
- long_title='surf sensible heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p18'/>
- <param code='147' mars=''
- short_title='surf lat ht flux'
- long_title='surf latent heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p19'/>
- <param code='151' mars=''
- short_title='msl'
- long_title='mean sea level pressure'
- scaling='0.01' offset='-0.0'
- original_unit='Pa' derived_unit='hpa'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p23'/>
- <param code='152' mars=''
- short_title='log surf pres'
- long_title='log surface pressure'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p24'/>
- <param code='155' mars=''
- short_title='diverg'
- long_title='divergence'
- scaling='100000.0' offset='-0.0'
- original_unit='s**-1' derived_unit='10**5/sec'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p27'/>
- <param code='156' mars=''
- short_title='hgt (geop)'
- long_title='height (geopotential)'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit='m'
- vector1='0' vector2='0'
- contour_interval='40.0' specification='p28'/>
- <param code='157' mars=''
- short_title='rel hum'
- long_title='relative humidity'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='%'
- vector1='0' vector2='0'
- contour_interval='20.0' specification='p29'/>
- <param code='158' mars=''
- short_title='surf press tend'
- long_title='tendency of surf press'
- scaling='1.0' offset='-0.0'
- original_unit='Pa s**-1' derived_unit='pa/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p30'/>
- <param code='164' mars=''
- short_title='tot cldcov'
- long_title='total cloudcover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.1' specification='p36'/>
- <param code='165' mars=''
- short_title='10m u'
- long_title='10 mtr u'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p37'/>
- <param code='166' mars=''
- short_title='10m v'
- long_title='10 mtr v'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p38'/>
- <param code='167' mars=''
- short_title='2m temp'
- long_title='2 metre temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p39'/>
- <param code='168' mars=''
- short_title='2m dewp'
- long_title='2 metre dewpoint temp'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p40'/>
- <param code='170' mars=''
- short_title='soil temp lyr2'
- long_title='soil temperature layer2'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p42'/>
- <param code='171' mars=''
- short_title='soil wet lyr2'
- long_title='soil wetness layer2'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='1.0' specification='p43'/>
- <param code='172' mars=''
- short_title='l/sea mask'
- long_title='land/ sea mask'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='0/1'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='173' mars=''
- short_title='surf rough'
- long_title='surface roughness'
- scaling='100.0' offset='-0.0'
- original_unit='m' derived_unit='cm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='174' mars=''
- short_title='albedo'
- long_title='albedo'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='176' mars=''
- short_title='surf solrad'
- long_title='surf solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='177' mars=''
- short_title='surf ther rad'
- long_title='surf thermal radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='178' mars=''
- short_title='topsolrad'
- long_title='top solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='179' mars=''
- short_title='top ther rad'
- long_title='top thermal radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='180' mars=''
- short_title='u-stress'
- long_title='u-stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s**-1' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='181' mars=''
- short_title='v-stress'
- long_title='v-stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s**-1' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='182' mars=''
- short_title='evap'
- long_title='evaporation'
- scaling='1000.0' offset='-0.0'
- original_unit='kg m**-2 s**-1' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='183' mars=''
- short_title='soil temp lyr3'
- long_title='soil temperature layer3'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='184' mars=''
- short_title='soil wet lyr3'
- long_title='soil wetness layer3'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='185' mars=''
- short_title='conv cld cov'
- long_title='convective cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='186' mars=''
- short_title='low cld cov'
- long_title='low cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='187' mars=''
- short_title='med cld cov'
- long_title='medium cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='188' mars=''
- short_title='hi cld cov'
- long_title='high cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='190' mars=''
- short_title='ew comp subgrid orog var'
- long_title='ew comp subgrid orog var'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit='sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='191' mars=''
- short_title='ns comp subgrid orog var'
- long_title='ns comp subgrid orog var'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit='sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='192' mars=''
- short_title='nwse com subgrd orog var'
- long_title='nwse com subgrd orog var'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit='sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='193' mars=''
- short_title='nswe com subgrd orog var'
- long_title='nswe com subgrd orog var'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit='sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='195' mars=''
- short_title='lat comp grav wav stress'
- long_title='lat comp grav wav stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='196' mars=''
- short_title='mer comp grav wav stress'
- long_title='mer comp grav wav stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='197' mars=''
- short_title='grav wav diss'
- long_title='gravity wav dissipation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='198' mars=''
- short_title='skin res cont'
- long_title='skin reservoir content'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='199' mars=''
- short_title='percent of veg'
- long_title='percent of vegetation'
- scaling='1.0' offset='-0.0'
- original_unit='%' derived_unit='%'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='200' mars=''
- short_title='var subgrid-scale orog'
- long_title='var subgrid-scale orog'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit='sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='201' mars=''
- short_title='max 2m tem'
- long_title='maximum temp at 2m'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='202' mars=''
- short_title='min 2m tem'
- long_title='minimum temp at 2 m'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='204' mars=''
- short_title='prec anal weights'
- long_title='precip. analys weights'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='205' mars=''
- short_title='runoff'
- long_title='runoff'
- scaling='1000.0' offset='-0.0'
- original_unit='kg m**-2 s**-1' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='206' mars=''
- short_title='stdev geop'
- long_title='stdi dev of geopotential'
- scaling='0.0101971621297793' offset='-0.0'
- original_unit='m**2 s**-2' derived_unit='dam'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p1'/>
- <param code='207' mars=''
- short_title='covar tem/geop'
- long_title='covariance temp/geopot'
- scaling='1.0' offset='-0.0'
- original_unit='K m**2 s**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='208' mars=''
- short_title='stdev temp'
- long_title='std dev of temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='209' mars=''
- short_title='covar sphum/geop'
- long_title='covariance spec hum/geop'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='210' mars=''
- short_title='covar sphum/temp'
- long_title='covariance spec hum/temp'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='211' mars=''
- short_title='stdev spec hum'
- long_title='std dev spec humidity'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='212' mars=''
- short_title='covar u-comp/geop'
- long_title='covariance u-comp/geop'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 s**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='213' mars=''
- short_title='covar u-comp/temp'
- long_title='covariance u-comp/temp'
- scaling='1.0' offset='-0.0'
- original_unit='K m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='214' mars=''
- short_title='covar u-comp/sphum'
- long_title='covariance u-comp/sp hum'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='215' mars=''
- short_title='stdev u-vel'
- long_title='std dev u velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='216' mars=''
- short_title='covar v-comp/geop'
- long_title='covariance v-comp/geop'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 s**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='217' mars=''
- short_title='covar v-comp/temp'
- long_title='covariance v-comp/temp'
- scaling='1.0' offset='-0.0'
- original_unit='K m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='218' mars=''
- short_title='covar v-comp/sphum'
- long_title='covariance v-comp/sp hum'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='219' mars=''
- short_title='covar v-comp/u-comp'
- long_title='covariance v-comp/u-comp'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='220' mars=''
- short_title='stdev v-vel'
- long_title='std dev v velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='221' mars=''
- short_title='covar w-comp/geop'
- long_title='covariance w-comp/geop'
- scaling='1.0' offset='-0.0'
- original_unit='Pa m**2 s**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='222' mars=''
- short_title='covar w-comp/temp'
- long_title='covariance w-comp/temp'
- scaling='1.0' offset='-0.0'
- original_unit='K Pa s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='223' mars=''
- short_title='covar w-comp/sphum'
- long_title='covariance w-comp/sp hum'
- scaling='1.0' offset='-0.0'
- original_unit='Pa s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='224' mars=''
- short_title='covar w-comp/u-comp'
- long_title='covariance w-comp/u-comp'
- scaling='1.0' offset='-0.0'
- original_unit='Pa m s**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='225' mars=''
- short_title='covar w-comp/v-comp'
- long_title='covariance w-comp/v-comp'
- scaling='1.0' offset='-0.0'
- original_unit='Pa m s**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='226' mars=''
- short_title='stdev vert-vel'
- long_title='std dev vert velocity'
- scaling='1.0' offset='-0.0'
- original_unit='Pa s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='228' mars=''
- short_title='tot prec'
- long_title='roral precipitation'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='229' mars=''
- short_title='instant e/w surf str'
- long_title='instant e/w surf stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='230' mars=''
- short_title='inst n/s surf str'
- long_title='instant n/s surf stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='231' mars=''
- short_title='inst surf sens heat flux'
- long_title='inst surf sens heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit='w/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='232' mars=''
- short_title='inst evap'
- long_title='instant evaporation'
- scaling='1000.0' offset='-0.0'
- original_unit='kg m**-2 s**-1' derived_unit='g/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='233' mars=''
- short_title='appar surf hum'
- long_title='apparent surf humidity'
- scaling='1000.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit='g/kg'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='234' mars=''
- short_title='log surf rough for heat'
- long_title='log surf rough for heat'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='235' mars=''
- short_title='skin temp'
- long_title='skin temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p43'/>
- <param code='236' mars=''
- short_title='soil temp lyr4'
- long_title='soil temperature layer4'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p43'/>
- <param code='237' mars=''
- short_title='soil wet lyr 4'
- long_title='soil wetness layer 4'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p43'/>
- <param code='238' mars=''
- short_title='snow temp'
- long_title='snow temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p43'/>
- <param code='239' mars=''
- short_title='conv snow'
- long_title='convective snowfall'
- scaling='1000.0' offset='-0.0'
- original_unit='kg m**-2 s**-1' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='240' mars=''
- short_title='lge scal snow'
- long_title='large scale snowfall'
- scaling='1000.0' offset='-0.0'
- original_unit='kg m**-2 s**-1' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='241' mars=''
- short_title='cl liq wat'
- long_title='cloud liquid water cont'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit='kg/kg'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='242' mars=''
- short_title='cl cov'
- long_title='cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='243' mars=''
- short_title='fc albedo'
- long_title='forecast albedo'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='244' mars=''
- short_title='fc surf rough'
- long_title='forecast surface rough'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit='m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='245' mars=''
- short_title='fc lg surf rough/heat'
- long_title='fcast log srf rough/heat'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='246' mars=''
- short_title='10m wind/spd'
- long_title='10 metre wind speed'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='247' mars=''
- short_title='mom flux'
- long_title='momentum flux'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='249' mars=''
- short_title='grav wv diss fux'
- long_title='gravity wave dissip flus'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit='w/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='254' mars=''
- short_title='Heav beta func'
- long_title='Heaviside (beta) function'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- </table>
-</center>
+ <param code='129'
+ original_unit='m**2 s**-2' derived_unit='dam'
+ scaling='0.0101971621297793' offset='-0.0'/>
+ <param code='130'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='133'
+ original_unit='kg kg**-1' derived_unit='g/kg'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='134'
+ original_unit='Pa' derived_unit='hpa'
+ scaling='0.01' offset='-0.0'/>
+ <param code='138'
+ original_unit='s**-1' derived_unit='10**5/sec'
+ scaling='100000.0' offset='-0.0'/>
+ <param code='139'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='140'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='141'
+ original_unit='m of water' derived_unit='cm'
+ scaling='100.0' offset='-0.0'/>
+ <param code='142'
+ original_unit='kg m**-2 s**-1' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='143'
+ original_unit='kg m**-2 s**-1' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='144'
+ original_unit='kg m**-2 s**-1' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='151'
+ original_unit='Pa' derived_unit='hpa'
+ scaling='0.01' offset='-0.0'/>
+ <param code='155'
+ original_unit='s**-1' derived_unit='10**5/sec'
+ scaling='100000.0' offset='-0.0'/>
+ <param code='167'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='168'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='170'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='171'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='173'
+ original_unit='m' derived_unit='cm'
+ scaling='100.0' offset='-0.0'/>
+ <param code='182'
+ original_unit='kg m**-2 s**-1' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='183'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='184'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='198'
+ original_unit='m of water' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='201'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='202'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='205'
+ original_unit='kg m**-2 s**-1' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='206'
+ original_unit='m**2 s**-2' derived_unit='dam'
+ scaling='0.0101971621297793' offset='-0.0'/>
+ <param code='208'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='228'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='232'
+ original_unit='kg m**-2 s**-1' derived_unit='g/sq m'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='233'
+ original_unit='kg kg**-1' derived_unit='g/kg'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='235'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='236'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='237'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='238'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='239'
+ original_unit='kg m**-2 s**-1' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='240'
+ original_unit='kg m**-2 s**-1' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ </table>
+<centre/>
diff --git a/share/magics/table_162.xml b/share/magics/table_162.xml
index c0f5278..ca2ca5b 100644
--- a/share/magics/table_162.xml
+++ b/share/magics/table_162.xml
@@ -2,13 +2,13 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='162'>
- </table>
-</center>
+ </table>
+<centre/>
diff --git a/share/magics/table_170.xml b/share/magics/table_170.xml
index 280c53c..eef6c24 100644
--- a/share/magics/table_170.xml
+++ b/share/magics/table_170.xml
@@ -2,125 +2,52 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='170'>
- <param code='129' mars=''
- short_title='geop'
- long_title='geopotential height'
- scaling='0.0101971621297793' offset='-0.0'
- original_unit='m**2 s**-2' derived_unit='dam'
- vector1='0' vector2='0'
- contour_interval='8.0' specification='p1'/>
- <param code='130' mars=''
- short_title='temp'
- long_title='temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p2'/>
- <param code='131' mars=''
- short_title='u-vel'
- long_title='u-velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p3'/>
- <param code='132' mars=''
- short_title='v-vel'
- long_title='v-velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p4'/>
- <param code='138' mars=''
- short_title='vort'
- long_title='vorticity'
- scaling='100000.0' offset='-0.0'
- original_unit='s**-1' derived_unit='10**5/sec'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p10'/>
- <param code='140' mars=''
- short_title='soil wet lyr 1'
- long_title='soil wetness layer 1'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p12'/>
- <param code='141' mars=''
- short_title='snow depth'
- long_title='snow depth'
- scaling='100.0' offset='-0.0'
- original_unit='m of water equivalent' derived_unit='cm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p13'/>
- <param code='149' mars=''
- short_title='tot soil moist'
- long_title='total soil moisture'
- scaling='100.0' offset='-0.0'
- original_unit='m' derived_unit='cm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='151' mars=''
- short_title='msl'
- long_title='mean sea level pressure'
- scaling='0.01' offset='-0.0'
- original_unit='Pa' derived_unit='hpa'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p23'/>
- <param code='155' mars=''
- short_title='diverg'
- long_title='divergence'
- scaling='100000.0' offset='-0.0'
- original_unit='s**-1' derived_unit='10**5/sec'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p27'/>
- <param code='171' mars=''
- short_title='soil wet lyr2'
- long_title='soil wetness layer2'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='1.0' specification='p43'/>
- <param code='179' mars=''
- short_title='top ther rad'
- long_title='top thermal radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m-2' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='184' mars=''
- short_title='soil wet lyr3'
- long_title='soil wetness layer3'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='201' mars=''
- short_title='max 2m tem'
- long_title='maximum temp at 2m'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='202' mars=''
- short_title='min 2m tem'
- long_title='minimum temp at 2 m'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='228' mars=''
- short_title='tot prec'
- long_title='total precipitation'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- </table>
-</center>
+ <param code='129'
+ original_unit='m**2 s**-2' derived_unit='dam'
+ scaling='0.0101971621297793' offset='-0.0'/>
+ <param code='130'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='138'
+ original_unit='s**-1' derived_unit='10**5/sec'
+ scaling='100000.0' offset='-0.0'/>
+ <param code='140'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='141'
+ original_unit='m of water equivalent' derived_unit='cm'
+ scaling='100.0' offset='-0.0'/>
+ <param code='149'
+ original_unit='m' derived_unit='cm'
+ scaling='100.0' offset='-0.0'/>
+ <param code='151'
+ original_unit='Pa' derived_unit='hpa'
+ scaling='0.01' offset='-0.0'/>
+ <param code='155'
+ original_unit='s**-1' derived_unit='10**5/sec'
+ scaling='100000.0' offset='-0.0'/>
+ <param code='171'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='184'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='201'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='202'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='228'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ </table>
+<centre/>
diff --git a/share/magics/table_171.xml b/share/magics/table_171.xml
index cbfbd4a..b636563 100644
--- a/share/magics/table_171.xml
+++ b/share/magics/table_171.xml
@@ -2,1301 +2,13 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='171'>
- <param code='1' mars=''
- short_title='-'
- long_title='Stream function'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='2' mars=''
- short_title='-'
- long_title='Velocity potential'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='3' mars=''
- short_title='-'
- long_title='Potential temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='4' mars=''
- short_title='-'
- long_title='Equivalent potential temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='5' mars=''
- short_title='-'
- long_title='Saturated equivalent potential temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='11' mars=''
- short_title='-'
- long_title='U component of divergent wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='12' mars=''
- short_title='-'
- long_title='V component of divergent wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='13' mars=''
- short_title='-'
- long_title='U component of rotational wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='14' mars=''
- short_title='-'
- long_title='V component of rotational wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='21' mars=''
- short_title='-'
- long_title='Unbalanced component of temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='22' mars=''
- short_title='-'
- long_title='Unbalanced component of logarithm of surface pressure'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='23' mars=''
- short_title='-'
- long_title='Unbalanced component of divergence'
- scaling='1.0' offset='-0.0'
- original_unit='s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='26' mars=''
- short_title='-'
- long_title='Lake cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='27' mars=''
- short_title='-'
- long_title='Low vegetation cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='28' mars=''
- short_title='-'
- long_title='High vegetation cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='29' mars=''
- short_title='-'
- long_title='Type of low vegetation'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='30' mars=''
- short_title='-'
- long_title='Type of high vegetation'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='31' mars=''
- short_title='-'
- long_title='Sea-ice cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='32' mars=''
- short_title='-'
- long_title='Snow albedo'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='33' mars=''
- short_title='-'
- long_title='Snow density'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='34' mars=''
- short_title='-'
- long_title='Sea surface temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='35' mars=''
- short_title='-'
- long_title='Ice surface temperature layer 1'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='36' mars=''
- short_title='-'
- long_title='Ice surface temperature layer 2'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='37' mars=''
- short_title='-'
- long_title='Ice surface temperature layer 3'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='38' mars=''
- short_title='-'
- long_title='Ice surface temperature layer 4'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='39' mars=''
- short_title='-'
- long_title='Volumetric soil water layer 1'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='40' mars=''
- short_title='-'
- long_title='Volumetric soil water layer 2'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='41' mars=''
- short_title='-'
- long_title='Volumetric soil water layer 3'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='42' mars=''
- short_title='-'
- long_title='Volumetric soil water layer 4'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='43' mars=''
- short_title='-'
- long_title='Soil type'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='44' mars=''
- short_title='-'
- long_title='Snow evaporation'
- scaling='1.0' offset='-0.0'
- original_unit='m of water' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='45' mars=''
- short_title='-'
- long_title='Snowmelt'
- scaling='1.0' offset='-0.0'
- original_unit='m of water' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='46' mars=''
- short_title='-'
- long_title='Solar duration'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='47' mars=''
- short_title='-'
- long_title='Direct solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='w m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='48' mars=''
- short_title='-'
- long_title='Magnitude of surface stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='49' mars=''
- short_title='-'
- long_title='10 metre wind gust'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='50' mars=''
- short_title='-'
- long_title='Large-scale precipitation fraction'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='51' mars=''
- short_title='-'
- long_title='Maximum 2 metre temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='52' mars=''
- short_title='-'
- long_title='Minimum 2 metre temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='53' mars=''
- short_title='-'
- long_title='Montgomery potential'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='54' mars=''
- short_title='-'
- long_title='Pressure'
- scaling='1.0' offset='-0.0'
- original_unit='Pa' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='55' mars=''
- short_title='-'
- long_title='Mean 2 metre temperature in past 24 hours'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='56' mars=''
- short_title='-'
- long_title='Mean 2 metre dewpoint temperature in past 24 hours'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='57' mars=''
- short_title='-'
- long_title='Downward UV radiation at the surface'
- scaling='1.0' offset='-0.0'
- original_unit='w m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='58' mars=''
- short_title='-'
- long_title='Photosynthetically active radiation at the surface'
- scaling='1.0' offset='-0.0'
- original_unit='w m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='59' mars=''
- short_title='-'
- long_title='Convective available potential energy'
- scaling='1.0' offset='-0.0'
- original_unit='J kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='60' mars=''
- short_title='-'
- long_title='Potential vorticity'
- scaling='1.0' offset='-0.0'
- original_unit='K m**2 kg**-1 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='61' mars=''
- short_title='-'
- long_title='Total precipitation from observations'
- scaling='1.0' offset='-0.0'
- original_unit='Millimetres*100 + number of stations' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='62' mars=''
- short_title='-'
- long_title='Observation count'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='63' mars=''
- short_title='-'
- long_title='Start time for skin temperature difference'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='64' mars=''
- short_title='-'
- long_title='Finish time for skin temperature difference'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='65' mars=''
- short_title='-'
- long_title='Skin temperature difference'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='78' mars=''
- short_title='-'
- long_title='Total column liquid water'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='79' mars=''
- short_title='-'
- long_title='Total column ice water'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='125' mars=''
- short_title='-'
- long_title='Vertically integrated total energy'
- scaling='1.0' offset='-0.0'
- original_unit='J m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='126' mars=''
- short_title='-'
- long_title='Generic parameter for sensitive area prediction'
- scaling='1.0' offset='-0.0'
- original_unit='Various' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='127' mars=''
- short_title='-'
- long_title='Atmospheric tide'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='128' mars=''
- short_title='-'
- long_title='Budget values'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='129' mars=''
- short_title='-'
- long_title='Geopotential'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='130' mars=''
- short_title='-'
- long_title='Temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='131' mars=''
- short_title='-'
- long_title='U velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='132' mars=''
- short_title='-'
- long_title='V velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='133' mars=''
- short_title='-'
- long_title='Specific humidity'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='134' mars=''
- short_title='-'
- long_title='Surface pressure'
- scaling='1.0' offset='-0.0'
- original_unit='Pa' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='135' mars=''
- short_title='-'
- long_title='Vertical velocity'
- scaling='1.0' offset='-0.0'
- original_unit='Pa s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='136' mars=''
- short_title='-'
- long_title='Total column water'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='137' mars=''
- short_title='-'
- long_title='Total column water vapour'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='138' mars=''
- short_title='-'
- long_title='Vorticity (relative)'
- scaling='1.0' offset='-0.0'
- original_unit='s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='139' mars=''
- short_title='-'
- long_title='Soil temperature level 1'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='140' mars=''
- short_title='-'
- long_title='Soil wetness level 1'
- scaling='1.0' offset='-0.0'
- original_unit='m of water' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='141' mars=''
- short_title='-'
- long_title='Snow depth'
- scaling='1.0' offset='-0.0'
- original_unit='m of water equivalent' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='142' mars=''
- short_title='-'
- long_title='Stratiform precipitation (Large-scale precipitation)'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='143' mars=''
- short_title='-'
- long_title='Convective precipitation'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='144' mars=''
- short_title='-'
- long_title='Snowfall (convective + stratiform)'
- scaling='1.0' offset='-0.0'
- original_unit='m of water equivalent' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='145' mars=''
- short_title='-'
- long_title='Boundary layer dissipation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='146' mars=''
- short_title='-'
- long_title='Surface sensible heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='147' mars=''
- short_title='-'
- long_title='Surface latent heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='148' mars=''
- short_title='-'
- long_title='Charnock'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='149' mars=''
- short_title='-'
- long_title='Surface net radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='150' mars=''
- short_title='-'
- long_title='Top net radiation'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='151' mars=''
- short_title='-'
- long_title='Mean sea level pressure'
- scaling='1.0' offset='-0.0'
- original_unit='Pa' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='152' mars=''
- short_title='-'
- long_title='Logarithm of surface pressure'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='153' mars=''
- short_title='-'
- long_title='Short-wave heating rate'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='154' mars=''
- short_title='-'
- long_title='Long-wave heating rate'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='155' mars=''
- short_title='-'
- long_title='Divergence'
- scaling='1.0' offset='-0.0'
- original_unit='s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='156' mars=''
- short_title='-'
- long_title='Height'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='157' mars=''
- short_title='-'
- long_title='Relative humidity'
- scaling='1.0' offset='-0.0'
- original_unit='%' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='158' mars=''
- short_title='-'
- long_title='Tendency of surface pressure'
- scaling='1.0' offset='-0.0'
- original_unit='Pa s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='159' mars=''
- short_title='-'
- long_title='Boundary layer height'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='160' mars=''
- short_title='-'
- long_title='Standard deviation of orography'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='161' mars=''
- short_title='-'
- long_title='Anisotropy of sub-gridscale orography'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='162' mars=''
- short_title='-'
- long_title='Angle of sub-gridscale orography'
- scaling='1.0' offset='-0.0'
- original_unit='rad' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='163' mars=''
- short_title='-'
- long_title='Slope of sub-gridscale orography'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='164' mars=''
- short_title='-'
- long_title='Total cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='165' mars=''
- short_title='-'
- long_title='10 metre U wind component'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='166' mars=''
- short_title='-'
- long_title='10 metre V wind component'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='167' mars=''
- short_title='-'
- long_title='2 metre temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='168' mars=''
- short_title='-'
- long_title='2 metre dewpoint temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='169' mars=''
- short_title='-'
- long_title='Surface solar radiation downwards'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='170' mars=''
- short_title='-'
- long_title='Soil temperature level 2'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='171' mars=''
- short_title='-'
- long_title='Soil wetness level 2'
- scaling='1.0' offset='-0.0'
- original_unit='m of water' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='172' mars=''
- short_title='-'
- long_title='Land-sea mask'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='173' mars=''
- short_title='-'
- long_title='Surface roughness'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='174' mars=''
- short_title='-'
- long_title='Albedo'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='175' mars=''
- short_title='-'
- long_title='Surface thermal radiation downwards'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='176' mars=''
- short_title='-'
- long_title='Surface solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='177' mars=''
- short_title='-'
- long_title='Surface thermal radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='178' mars=''
- short_title='-'
- long_title='Top solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='179' mars=''
- short_title='-'
- long_title='Top thermal radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='180' mars=''
- short_title='-'
- long_title='East-West surface stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='181' mars=''
- short_title='-'
- long_title='North-South surface stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='182' mars=''
- short_title='-'
- long_title='Evaporation'
- scaling='1.0' offset='-0.0'
- original_unit='m of water' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='183' mars=''
- short_title='-'
- long_title='Soil temperature level 3'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='184' mars=''
- short_title='-'
- long_title='Soil wetness level 3'
- scaling='1.0' offset='-0.0'
- original_unit='m of water' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='185' mars=''
- short_title='-'
- long_title='Convective cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='186' mars=''
- short_title='-'
- long_title='Low cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='187' mars=''
- short_title='-'
- long_title='Medium cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='188' mars=''
- short_title='-'
- long_title='High cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='189' mars=''
- short_title='-'
- long_title='Sunshine duration'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='190' mars=''
- short_title='-'
- long_title='East-West component of sub-gridscale orographic variance'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='191' mars=''
- short_title='-'
- long_title='North-South component of sub-gridscale orographic variance'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='192' mars=''
- short_title='-'
- long_title='North-West/South-East component of sub-gridscale orographic variance'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='193' mars=''
- short_title='-'
- long_title='North-East/South-West component of sub-gridscale orographic variance'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='194' mars=''
- short_title='-'
- long_title='Brightness temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='195' mars=''
- short_title='-'
- long_title='Latitudinal component of gravity wave stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='196' mars=''
- short_title='-'
- long_title='Meridional component of gravity wave stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='197' mars=''
- short_title='-'
- long_title='Gravity wave dissipation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='198' mars=''
- short_title='-'
- long_title='Skin reservoir content'
- scaling='1.0' offset='-0.0'
- original_unit='m of water' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='199' mars=''
- short_title='-'
- long_title='Vegetation fraction'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='200' mars=''
- short_title='-'
- long_title='Variance of sub-gridscale orography'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='201' mars=''
- short_title='-'
- long_title='Maximum temperature at 2 metres since previous post-processing'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='202' mars=''
- short_title='-'
- long_title='Minimum temperature at 2 metres since previous post-processing'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='203' mars=''
- short_title='-'
- long_title='Ozone mass mixing ratio'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='204' mars=''
- short_title='-'
- long_title='Precipitation analysis weights'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='205' mars=''
- short_title='-'
- long_title='Runoff'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='206' mars=''
- short_title='-'
- long_title='Total column ozone'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='207' mars=''
- short_title='-'
- long_title='10 metre wind speed'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='208' mars=''
- short_title='-'
- long_title='Top net solar radiation, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='209' mars=''
- short_title='-'
- long_title='Top net thermal radiation, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='210' mars=''
- short_title='-'
- long_title='Surface net solar radiation, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='211' mars=''
- short_title='-'
- long_title='Surface net thermal radiation, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='212' mars=''
- short_title='-'
- long_title='Solar insolation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='214' mars=''
- short_title='-'
- long_title='Diabatic heating by radiation'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='215' mars=''
- short_title='-'
- long_title='Diabatic heating by vertical diffusion'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='216' mars=''
- short_title='-'
- long_title='Diabatic heating by cumulus convection'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='217' mars=''
- short_title='-'
- long_title='Diabatic heating by large-scale condensation'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='218' mars=''
- short_title='-'
- long_title='Vertical diffusion of zonal wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='219' mars=''
- short_title='-'
- long_title='Vertical diffusion of meridional wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='220' mars=''
- short_title='-'
- long_title='East-West gravity wave drag tendency'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='221' mars=''
- short_title='-'
- long_title='North-South gravity wave drag tendency'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='222' mars=''
- short_title='-'
- long_title='Convective tendency of zonal wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='223' mars=''
- short_title='-'
- long_title='Convective tendency of meridional wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='224' mars=''
- short_title='-'
- long_title='Vertical diffusion of humidity'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='225' mars=''
- short_title='-'
- long_title='Humidity tendency by cumulus convection'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='226' mars=''
- short_title='-'
- long_title='Humidity tendency by large-scale condensation'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='227' mars=''
- short_title='-'
- long_title='Change from removal of negative humidity'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='228' mars=''
- short_title='-'
- long_title='Total precipitation'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='229' mars=''
- short_title='-'
- long_title='Instantaneous X surface stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='230' mars=''
- short_title='-'
- long_title='Instantaneous Y surface stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='231' mars=''
- short_title='-'
- long_title='Instantaneous surface heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='232' mars=''
- short_title='-'
- long_title='Instantaneous moisture flux'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='233' mars=''
- short_title='-'
- long_title='Apparent surface humidity'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='234' mars=''
- short_title='-'
- long_title='Logarithm of surface roughness length for heat'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='235' mars=''
- short_title='-'
- long_title='Skin temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='236' mars=''
- short_title='-'
- long_title='Soil temperature level 4'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='237' mars=''
- short_title='-'
- long_title='Soil wetness level 4'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='238' mars=''
- short_title='-'
- long_title='Temperature of snow layer'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='239' mars=''
- short_title='-'
- long_title='Convective snowfall'
- scaling='1.0' offset='-0.0'
- original_unit='m of water equivalent' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='240' mars=''
- short_title='-'
- long_title='Large-scale snowfall'
- scaling='1.0' offset='-0.0'
- original_unit='m of water equivalent' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='241' mars=''
- short_title='-'
- long_title='Accumulated cloud fraction tendency'
- scaling='1.0' offset='-0.0'
- original_unit='(-1 to 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='242' mars=''
- short_title='-'
- long_title='Accumulated liquid water tendency'
- scaling='1.0' offset='-0.0'
- original_unit='(-1 to 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='243' mars=''
- short_title='-'
- long_title='Forecast albedo'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='244' mars=''
- short_title='-'
- long_title='Forecast surface roughness'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='245' mars=''
- short_title='-'
- long_title='Forecast logarithm of surface roughness for heat'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='246' mars=''
- short_title='-'
- long_title='Cloud liquid water content'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='247' mars=''
- short_title='-'
- long_title='Cloud ice water content'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='248' mars=''
- short_title='-'
- long_title='Cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='249' mars=''
- short_title='-'
- long_title='Accumulated ice water tendency'
- scaling='1.0' offset='-0.0'
- original_unit='(-1 to 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='250' mars=''
- short_title='-'
- long_title='Ice age'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='251' mars=''
- short_title='-'
- long_title='Adiabatic tendency of temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='252' mars=''
- short_title='-'
- long_title='Adiabatic tendency of humidity'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='253' mars=''
- short_title='-'
- long_title='Adiabatic tendency of zonal wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='254' mars=''
- short_title='-'
- long_title='Adiabatic tendency of meridional wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='255' mars=''
- short_title='-'
- long_title='Indicates a missing value'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- </table>
-</center>
+ </table>
+<centre/>
diff --git a/share/magics/table_172.xml b/share/magics/table_172.xml
index 4658b3d..59c9d5b 100644
--- a/share/magics/table_172.xml
+++ b/share/magics/table_172.xml
@@ -2,265 +2,13 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='172'>
- <param code='44' mars=''
- short_title='-'
- long_title='Snow evaporation'
- scaling='1.0' offset='-0.0'
- original_unit='m of water s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='45' mars=''
- short_title='-'
- long_title='Snowmelt'
- scaling='1.0' offset='-0.0'
- original_unit='m of water s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='48' mars=''
- short_title='-'
- long_title='Magnitude of surface stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='50' mars=''
- short_title='-'
- long_title='Large-scale precipitation fraction'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='142' mars=''
- short_title='-'
- long_title='Stratiform precipitation (Large-scale precipitation)'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='143' mars=''
- short_title='-'
- long_title='Convective precipitation'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='144' mars=''
- short_title='-'
- long_title='Snowfall (convective + stratiform)'
- scaling='1.0' offset='-0.0'
- original_unit='m of water equivalent s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='145' mars=''
- short_title='-'
- long_title='Boundary layer dissipation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='146' mars=''
- short_title='-'
- long_title='Surface sensible heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='147' mars=''
- short_title='-'
- long_title='Surface latent heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='149' mars=''
- short_title='-'
- long_title='Surface net radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='153' mars=''
- short_title='-'
- long_title='Short-wave heating rate'
- scaling='1.0' offset='-0.0'
- original_unit='K s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='154' mars=''
- short_title='-'
- long_title='Long-wave heating rate'
- scaling='1.0' offset='-0.0'
- original_unit='K s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='169' mars=''
- short_title='-'
- long_title='Surface solar radiation downwards'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='175' mars=''
- short_title='-'
- long_title='Surface thermal radiation downwards'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='176' mars=''
- short_title='-'
- long_title='Surface solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='177' mars=''
- short_title='-'
- long_title='Surface thermal radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='178' mars=''
- short_title='-'
- long_title='Top solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='179' mars=''
- short_title='-'
- long_title='Top thermal radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='180' mars=''
- short_title='-'
- long_title='East-West surface stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='181' mars=''
- short_title='-'
- long_title='North-South surface stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='182' mars=''
- short_title='-'
- long_title='Evaporation'
- scaling='1.0' offset='-0.0'
- original_unit='m of water s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='189' mars=''
- short_title='-'
- long_title='Sunshine duration'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='195' mars=''
- short_title='-'
- long_title='Latitudinal component of gravity wave stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='196' mars=''
- short_title='-'
- long_title='Meridional component of gravity wave stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='197' mars=''
- short_title='-'
- long_title='Gravity wave dissipation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='205' mars=''
- short_title='-'
- long_title='Runoff'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='208' mars=''
- short_title='-'
- long_title='Top net solar radiation, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='209' mars=''
- short_title='-'
- long_title='Top net thermal radiation, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='210' mars=''
- short_title='-'
- long_title='Surface net solar radiation, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='211' mars=''
- short_title='-'
- long_title='Surface net thermal radiation, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='212' mars=''
- short_title='-'
- long_title='Solar insolation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='228' mars=''
- short_title='-'
- long_title='Total precipitation'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='239' mars=''
- short_title='-'
- long_title='Convective snowfall'
- scaling='1.0' offset='-0.0'
- original_unit='m of water equivalent s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='240' mars=''
- short_title='-'
- long_title='Large-scale snowfall'
- scaling='1.0' offset='-0.0'
- original_unit='m of water equivalent s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='255' mars=''
- short_title='-'
- long_title='Indicates a missing value'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- </table>
-</center>
+ </table>
+<centre/>
diff --git a/share/magics/table_173.xml b/share/magics/table_173.xml
index 49cae92..6dd8e14 100644
--- a/share/magics/table_173.xml
+++ b/share/magics/table_173.xml
@@ -2,13 +2,13 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='173'>
- </table>
-</center>
+ </table>
+<centre/>
diff --git a/share/magics/table_174.xml b/share/magics/table_174.xml
index 93170fa..21db17c 100644
--- a/share/magics/table_174.xml
+++ b/share/magics/table_174.xml
@@ -2,188 +2,13 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='174'>
- <param code='31' mars=''
- short_title='-'
- long_title='Fraction of sea-ice in sea'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='34' mars=''
- short_title='-'
- long_title='Open-sea surface temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='39' mars=''
- short_title='-'
- long_title='Volumetric soil water layer 1'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='40' mars=''
- short_title='-'
- long_title='Volumetric soil water layer 2'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='41' mars=''
- short_title='-'
- long_title='Volumetric soil water layer 3'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='42' mars=''
- short_title='-'
- long_title='Volumetric soil water layer 4'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='55' mars=''
- short_title='-'
- long_title='1.5m temperature - mean over last 24 hours'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='83' mars=''
- short_title='-'
- long_title='Net primary productivity'
- scaling='1.0' offset='-0.0'
- original_unit='kg C m**-2 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='85' mars=''
- short_title='-'
- long_title='10m U wind over land'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='86' mars=''
- short_title='-'
- long_title='10m V wind over land'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='87' mars=''
- short_title='-'
- long_title='1.5m temperature over land'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='88' mars=''
- short_title='-'
- long_title='1.5m dewpoint temperature over land'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='110' mars=''
- short_title='-'
- long_title='Ocean ice concentration'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='111' mars=''
- short_title='-'
- long_title='Ocean mean ice depth'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='139' mars=''
- short_title='-'
- long_title='Soil temperature layer 1'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='164' mars=''
- short_title='-'
- long_title='Average potential temperature in upper 293.4m'
- scaling='1.0' offset='-0.0'
- original_unit='degrees C' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='167' mars=''
- short_title='-'
- long_title='1.5m temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='168' mars=''
- short_title='-'
- long_title='1.5m dewpoint temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='170' mars=''
- short_title='-'
- long_title='Soil temperature layer 2'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='172' mars=''
- short_title='-'
- long_title='Fractional land mask'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='175' mars=''
- short_title='-'
- long_title='Average salinity in upper 293.4m'
- scaling='1.0' offset='-0.0'
- original_unit='psu' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='183' mars=''
- short_title='-'
- long_title='Soil temperature layer 3'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='201' mars=''
- short_title='-'
- long_title='1.5m temperature - maximum over last 24 hours'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='202' mars=''
- short_title='-'
- long_title='1.5m temperature - minimum over last 24 hours'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='236' mars=''
- short_title='-'
- long_title='Soil temperature layer 4'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- </table>
-</center>
+ </table>
+<centre/>
diff --git a/share/magics/table_175.xml b/share/magics/table_175.xml
index 3ff77c3..e3c7bd8 100644
--- a/share/magics/table_175.xml
+++ b/share/magics/table_175.xml
@@ -2,188 +2,13 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='175'>
- <param code='31' mars=''
- short_title='-'
- long_title='Fraction of sea-ice in sea'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='34' mars=''
- short_title='-'
- long_title='Open-sea surface temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='39' mars=''
- short_title='-'
- long_title='Volumetric soil water layer 1'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='40' mars=''
- short_title='-'
- long_title='Volumetric soil water layer 2'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='41' mars=''
- short_title='-'
- long_title='Volumetric soil water layer 3'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='42' mars=''
- short_title='-'
- long_title='Volumetric soil water layer 4'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='55' mars=''
- short_title='-'
- long_title='1.5m temperature - mean over last 24 hours'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='83' mars=''
- short_title='-'
- long_title='Net primary productivity'
- scaling='1.0' offset='-0.0'
- original_unit='kg C m**-2 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='85' mars=''
- short_title='-'
- long_title='10m U wind over land'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='86' mars=''
- short_title='-'
- long_title='10m V wind over land'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='87' mars=''
- short_title='-'
- long_title='1.5m temperature over land'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='88' mars=''
- short_title='-'
- long_title='1.5m dewpoint temperature over land'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='110' mars=''
- short_title='-'
- long_title='Ocean ice concentration'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='111' mars=''
- short_title='-'
- long_title='Ocean mean ice depth'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='139' mars=''
- short_title='-'
- long_title='Soil temperature layer 1'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='164' mars=''
- short_title='-'
- long_title='Average potential temperature in upper 293.4m'
- scaling='1.0' offset='-0.0'
- original_unit='degrees C' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='167' mars=''
- short_title='-'
- long_title='1.5m temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='168' mars=''
- short_title='-'
- long_title='1.5m dewpoint temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='170' mars=''
- short_title='-'
- long_title='Soil temperature layer 2'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='172' mars=''
- short_title='-'
- long_title='Fractional land mask'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='175' mars=''
- short_title='-'
- long_title='Average salinity in upper 293.4m'
- scaling='1.0' offset='-0.0'
- original_unit='psu' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='183' mars=''
- short_title='-'
- long_title='Soil temperature layer 3'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='201' mars=''
- short_title='-'
- long_title='1.5m temperature - maximum over last 24 hours'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='202' mars=''
- short_title='-'
- long_title='1.5m temperature - minimum over last 24 hours'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='236' mars=''
- short_title='-'
- long_title='Soil temperature layer 4'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- </table>
-</center>
+ </table>
+<centre/>
diff --git a/share/magics/table_180.xml b/share/magics/table_180.xml
index 6eae232..a4be6a0 100644
--- a/share/magics/table_180.xml
+++ b/share/magics/table_180.xml
@@ -2,230 +2,13 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='180'>
- <param code='129' mars=''
- short_title='Z'
- long_title='Geopotential'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='130' mars=''
- short_title='T'
- long_title='Temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='131' mars=''
- short_title='U'
- long_title='U velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='132' mars=''
- short_title='V'
- long_title='V velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='133' mars=''
- short_title='Q'
- long_title='Specific humidity'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='134' mars=''
- short_title='SP'
- long_title='Surface pressure'
- scaling='1.0' offset='-0.0'
- original_unit='Pa' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='137' mars=''
- short_title='TCWV'
- long_title='Total column water vapour'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='138' mars=''
- short_title='VO'
- long_title='Vorticity (relative)'
- scaling='1.0' offset='-0.0'
- original_unit='s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='141' mars=''
- short_title='SD'
- long_title='Snow depth'
- scaling='1.0' offset='-0.0'
- original_unit='m of water equivalent' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='142' mars=''
- short_title='LSP'
- long_title='Large-scale precipitation'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='143' mars=''
- short_title='CP'
- long_title='Convective precipitation'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='144' mars=''
- short_title='SF'
- long_title='Snowfall'
- scaling='1.0' offset='-0.0'
- original_unit='m of water equivalent' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='146' mars=''
- short_title='SSHF'
- long_title='Surface sensible heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='147' mars=''
- short_title='SLHF'
- long_title='Surface latent heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='149' mars=''
- short_title='TSW'
- long_title='Total soil wetness'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='151' mars=''
- short_title='MSL'
- long_title='Mean sea level pressure'
- scaling='1.0' offset='-0.0'
- original_unit='Pa' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='155' mars=''
- short_title='D'
- long_title='Divergence'
- scaling='1.0' offset='-0.0'
- original_unit='s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='164' mars=''
- short_title='TCC'
- long_title='Total cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='165' mars=''
- short_title='10U'
- long_title='10 metre U wind component'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='166' mars=''
- short_title='10V'
- long_title='10 metre V wind component'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='167' mars=''
- short_title='2T'
- long_title='2 metre temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='168' mars=''
- short_title='2D'
- long_title='2 metre dewpoint temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='172' mars=''
- short_title='LSM'
- long_title='Land-sea mask'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='176' mars=''
- short_title='SSR'
- long_title='Surface solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='J m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='177' mars=''
- short_title='STR'
- long_title='Surface thermal radiation'
- scaling='1.0' offset='-0.0'
- original_unit='J m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='178' mars=''
- short_title='TSR'
- long_title='Top solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='J m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='179' mars=''
- short_title='TTR'
- long_title='Top thermal radiation'
- scaling='1.0' offset='-0.0'
- original_unit='J m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='180' mars=''
- short_title='EWSS'
- long_title='East-West surface stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='181' mars=''
- short_title='NSSS'
- long_title='North-South surface stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='182' mars=''
- short_title='E'
- long_title='Evaporation'
- scaling='1.0' offset='-0.0'
- original_unit='m of water' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='205' mars=''
- short_title='RO'
- long_title='Runoff'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- </table>
-</center>
+ </table>
+<centre/>
diff --git a/share/magics/table_190.xml b/share/magics/table_190.xml
index 84a550d..2b74c26 100644
--- a/share/magics/table_190.xml
+++ b/share/magics/table_190.xml
@@ -2,230 +2,34 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='190'>
- <param code='129' mars=''
- short_title='Z'
- long_title='Geopotential'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='130' mars=''
- short_title='T'
- long_title='Temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='C'
- vector1='0' vector2='0'
- contour_interval='5.0' specification=''/>
- <param code='131' mars=''
- short_title='U'
- long_title='U-velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='132' mars=''
- short_title='V'
- long_title='V-velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='133' mars=''
- short_title='Q'
- long_title='Specific humidity'
- scaling='1000.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit='g/kg'
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='139' mars=''
- short_title='ST/STL1'
- long_title='Surface temperature/soil temperature level 1'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='C'
- vector1='0' vector2='0'
- contour_interval='4.0' specification='p0'/>
- <param code='141' mars=''
- short_title='D SNOW'
- long_title='Snow depth'
- scaling='100.0' offset='-0.0'
- original_unit='m of water' derived_unit='cm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='146' mars=''
- short_title='surf sens ht flux'
- long_title='surf sensible heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p18'/>
- <param code='147' mars=''
- short_title='surf lat ht flux'
- long_title='surf latent heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p19'/>
- <param code='151' mars=''
- short_title='D MSL'
- long_title='Mean sea-level pressure'
- scaling='0.01' offset='-0.0'
- original_unit='Pa' derived_unit='hPa'
- vector1='0' vector2='0'
- contour_interval='5.0' specification=''/>
- <param code='164' mars=''
- short_title='D CLOUD'
- long_title='Total cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.1' specification=''/>
- <param code='165' mars=''
- short_title='D 10M U'
- long_title='10 metre u wind component'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='166' mars=''
- short_title='D 10M V'
- long_title='10 metre v wind component'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='167' mars=''
- short_title='D 2M T'
- long_title='2 metre temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='C'
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='168' mars=''
- short_title='D 2M TD'
- long_title='2 metre dewpoint temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='C'
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='169' mars=''
- short_title='D DSSR'
- long_title='Downward surface solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s (W m**-2 for monthly means)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='170' mars=''
- short_title='D CAP'
- long_title='Field capacity'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='171' mars=''
- short_title='D WILT'
- long_title='Wilting points'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='172' mars=''
- short_title='D LSM'
- long_title='Land-sea mask'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='173' mars=''
- short_title='D RL'
- long_title='Roughness length'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='174' mars=''
- short_title='D AL'
- long_title='Albedo'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='175' mars=''
- short_title='D DSLR'
- long_title='Downward surface longwave radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s (W m**-2 for monthly means)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='176' mars=''
- short_title='D SNSR'
- long_title='Surface net solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s (W m**-2 for monthly means)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='177' mars=''
- short_title='D SNLR'
- long_title='Surface net longwave radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s (W m**-2 for monthly means)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='178' mars=''
- short_title='D TNSR'
- long_title='Top net solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s (W m**-2 for monthly means)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='179' mars=''
- short_title='D TNLR'
- long_title='Top net longwave radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s (W m**-2 for monthly means)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='201' mars=''
- short_title='TMAX'
- long_title='Maximum 2 metre temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='202' mars=''
- short_title='TMIN'
- long_title='Minimum 2 metre temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='228' mars=''
- short_title='D TP'
- long_title='Total precipitation'
- scaling='1.0' offset='-0.0'
- original_unit='m (m s**-1 for monthly means)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='229' mars=''
- short_title='D TSM'
- long_title='Total soil moisture'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='255' mars=''
- short_title='Missing'
- long_title=''
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- </table>
-</center>
+ <param code='130'
+ original_unit='K' derived_unit='C'
+ scaling='1.0' offset='-273.16'/>
+ <param code='133'
+ original_unit='kg kg**-1' derived_unit='g/kg'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='139'
+ original_unit='K' derived_unit='C'
+ scaling='1.0' offset='-273.16'/>
+ <param code='141'
+ original_unit='m of water' derived_unit='cm'
+ scaling='100.0' offset='-0.0'/>
+ <param code='151'
+ original_unit='Pa' derived_unit='hPa'
+ scaling='0.01' offset='-0.0'/>
+ <param code='167'
+ original_unit='K' derived_unit='C'
+ scaling='1.0' offset='-273.16'/>
+ <param code='168'
+ original_unit='K' derived_unit='C'
+ scaling='1.0' offset='-273.16'/>
+ </table>
+<centre/>
diff --git a/share/magics/table_2.xml b/share/magics/table_2.xml
index 1ba5851..5b06027 100644
--- a/share/magics/table_2.xml
+++ b/share/magics/table_2.xml
@@ -2,19 +2,16 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='7'>
+<centre code='7'>
<table code='2'>
- <param code='11' mars=''
- short_title='temp'
- long_title='temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- />
+ <param code='11'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
</table>
-</center>
+<centre/>
diff --git a/share/magics/table_200.xml b/share/magics/table_200.xml
index 59ee3f6..c6e99b9 100644
--- a/share/magics/table_200.xml
+++ b/share/magics/table_200.xml
@@ -2,1308 +2,163 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='200'>
- <param code='1' mars=''
- short_title='strm fun'
- long_title='stream function'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='2' mars=''
- short_title='vel pot'
- long_title='velocity potential'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='3' mars=''
- short_title='pot temp'
- long_title='potential temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit='deg k'
- vector1='0' vector2='0'
- contour_interval='5.0' specification=''/>
- <param code='4' mars=''
- short_title='eq pot temp'
- long_title='equiv potential temp'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit='deg k'
- vector1='0' vector2='0'
- contour_interval='5.0' specification=''/>
- <param code='5' mars=''
- short_title='sat eq pot temp'
- long_title='sat equiv pot temp'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit='deg k'
- vector1='0' vector2='0'
- contour_interval='5.0' specification=''/>
- <param code='11' mars=''
- short_title='u-com div wind'
- long_title='u-comp divergent wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='12' mars=''
- short_title='v-com div wind'
- long_title='v-comp divergent wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='13' mars=''
- short_title='u-com rot wind'
- long_title='u-comp rotational wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='14' mars=''
- short_title='v-com rot wind'
- long_title='v-comp rotational wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='21' mars=''
- short_title='UCTP'
- long_title='Unbalanced component of temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='22' mars=''
- short_title='UCLN'
- long_title='Unbalanced component of logarithm of surface pressure'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='23' mars=''
- short_title='UCDV'
- long_title='Unbalanced component of divergence'
- scaling='1.0' offset='-0.0'
- original_unit='s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='24' mars=''
- short_title='None'
- long_title='Reserved for future unbalanced components'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='25' mars=''
- short_title='None'
- long_title='Reserved for future unbalanced components'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='26' mars=''
- short_title='CL'
- long_title='Lake cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='27' mars=''
- short_title='low veg cover'
- long_title='low vegetation cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='28' mars=''
- short_title='high veg cover'
- long_title='high vegetation cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='29' mars=''
- short_title='type low veg'
- long_title='type of low vegetation'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='30' mars=''
- short_title='type high veg'
- long_title='type of high vegetation'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='31' mars=''
- short_title='sea ice cover'
- long_title='sea ice cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='32' mars=''
- short_title='snow albedo'
- long_title='snow albedo'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='33' mars=''
- short_title='snow density'
- long_title='snow density'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-3' derived_unit='kg**3'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='34' mars=''
- short_title='sea surf temp'
- long_title='sea surface temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='35' mars=''
- short_title='ice surf temp layer1'
- long_title='ice surface temperature layer 1'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='36' mars=''
- short_title='ice surf temp layer2'
- long_title='ice surface temperature layer 2'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='37' mars=''
- short_title='ice surf temp layer3'
- long_title='ice surface temperature layer 3'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='38' mars=''
- short_title='ice surf temp layer4'
- long_title='ice surface temperature layer 4'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='39' mars=''
- short_title='vol soil water layer1'
- long_title='volumetric soil water layer 1'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit='m3m-3'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='40' mars=''
- short_title='vol soil water layer2'
- long_title='volumetric soil water layer 2'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit='m3m-3'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='41' mars=''
- short_title='vol soil water layer3'
- long_title='volumetric soil water layer 3'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit='m3m-3'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='42' mars=''
- short_title='vol soil water layer4'
- long_title='volumetric soil water layer 4'
- scaling='1.0' offset='-0.0'
- original_unit='m**3 m**-3' derived_unit='m3m-3'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='43' mars=''
- short_title='SLT'
- long_title='Soil type'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='44' mars=''
- short_title='evap snow'
- long_title='evaporation of snow'
- scaling='100.0' offset='-0.0'
- original_unit='m of water' derived_unit='cm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p13'/>
- <param code='45' mars=''
- short_title='snow melt'
- long_title='snow melt'
- scaling='100.0' offset='-0.0'
- original_unit='m of water' derived_unit='cm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p13'/>
- <param code='46' mars=''
- short_title='SDUR'
- long_title='Solar duration'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='47' mars=''
- short_title='DSRP'
- long_title='Direct solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='w m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='48' mars=''
- short_title='MAGSS'
- long_title='Magnitude of surface stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='49' mars=''
- short_title='gust 10m'
- long_title='wind gust at 10m'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='50' mars=''
- short_title='LSPF'
- long_title='Large-scale precipitation fraction'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='51' mars=''
- short_title='MX2T24'
- long_title='Maximum 2 metre temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='52' mars=''
- short_title='MN2T24'
- long_title='Minimum 2 metre temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='53' mars=''
- short_title='mont pot'
- long_title='montgomery potential'
- scaling='1.0' offset='-0.0'
- original_unit='m**2 s**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='54' mars=''
- short_title='pres'
- long_title='pressure'
- scaling='0.01' offset='-0.0'
- original_unit='Pa' derived_unit='hPa'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p43'/>
- <param code='55' mars=''
- short_title='MN2T24'
- long_title='Mean 2 metre temperature in past 24 hours'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='56' mars=''
- short_title='MN2D24'
- long_title='Mean 2 metre dewpoint temperature in past 24 hours'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='57' mars=''
- short_title='UVB'
- long_title='Downward UV radiation at the surface'
- scaling='1.0' offset='-0.0'
- original_unit='w m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='58' mars=''
- short_title='PAR'
- long_title='Photosynthetically active radiation at the surface'
- scaling='1.0' offset='-0.0'
- original_unit='w m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='59' mars=''
- short_title='CAPE'
- long_title='Convective available potential energy'
- scaling='1.0' offset='-0.0'
- original_unit='J kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='60' mars=''
- short_title='pv'
- long_title='potential vorticity'
- scaling='1000000.0' offset='-0.0'
- original_unit='K m**2 kg**-1 s**-1' derived_unit='pv units'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='61' mars=''
- short_title='TPO'
- long_title='Total precipitation from observations'
- scaling='1.0' offset='-0.0'
- original_unit='Millimetres*100 + number of stations' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='62' mars=''
- short_title='OBCT'
- long_title='Observation count'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='63' mars=''
- short_title='-'
- long_title='Start time for skin temperature difference'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='64' mars=''
- short_title='-'
- long_title='Finish time for skin temperature difference'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='65' mars=''
- short_title='-'
- long_title='Skin temperature difference'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='78' mars=''
- short_title='TCLW'
- long_title='Total Column Liquid Water'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='79' mars=''
- short_title='TCIW'
- long_title='Total Column Ice Water'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='125' mars=''
- short_title='-'
- long_title='Vertically integrated total energy'
- scaling='1.0' offset='-0.0'
- original_unit='J m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='126' mars=''
- short_title='-'
- long_title='Generic parameter for sensitive area prediction'
- scaling='1.0' offset='-0.0'
- original_unit='Various' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='127' mars=''
- short_title='atmos tide'
- long_title='atmospheric tide'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='128' mars=''
- short_title='budg val'
- long_title='budget values'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='129' mars=''
- short_title='geop'
- long_title='geopotential height'
- scaling='0.0101971621297793' offset='-0.0'
- original_unit='m**2 s**-2' derived_unit='dam'
- vector1='0' vector2='0'
- contour_interval='8.0' specification='p1'/>
- <param code='130' mars=''
- short_title='temp'
- long_title='temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p2'/>
- <param code='131' mars=''
- short_title='u-vel'
- long_title='u-velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p3'/>
- <param code='132' mars=''
- short_title='v-vel'
- long_title='v-velocity'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p4'/>
- <param code='133' mars=''
- short_title='spec hum'
- long_title='specific humidity'
- scaling='1000.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit='g/kg'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p5'/>
- <param code='134' mars=''
- short_title='surf pres'
- long_title='surface pressure'
- scaling='0.01' offset='-0.0'
- original_unit='Pa' derived_unit='hpa'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p6'/>
- <param code='135' mars=''
- short_title='vert vel'
- long_title='vertical velocity'
- scaling='1.0' offset='-0.0'
- original_unit='Pa s**-1' derived_unit='pa/s'
- vector1='0' vector2='0'
- contour_interval='4.0' specification='p7'/>
- <param code='136' mars=''
- short_title='tot col wat'
- long_title='total column water'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-2' derived_unit='kg/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='137' mars=''
- short_title='tot col wat vap'
- long_title='total column water vapour'
- scaling='1.0' offset='-0.0'
- original_unit='kg m**-2' derived_unit='kg/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='138' mars=''
- short_title='vort'
- long_title='vorticity'
- scaling='100000.0' offset='-0.0'
- original_unit='s**-1' derived_unit='10**5/sec'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p10'/>
- <param code='139' mars=''
- short_title='soil temp lyr1'
- long_title='soil temperature layer1'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='4.0' specification='p11'/>
- <param code='140' mars=''
- short_title='soil wet lyr 1'
- long_title='soil wetness layer 1'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p12'/>
- <param code='141' mars=''
- short_title='snow depth'
- long_title='snow depth'
- scaling='100.0' offset='-0.0'
- original_unit='m of water equivalent' derived_unit='cm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p13'/>
- <param code='142' mars=''
- short_title='lge scl prec'
- long_title='large scale precip'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p14'/>
- <param code='143' mars=''
- short_title='conv prec'
- long_title='convective precip'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p15'/>
- <param code='144' mars=''
- short_title='snowf'
- long_title='snowfall'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water equivalent' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p16'/>
- <param code='145' mars=''
- short_title='bound lyr diss'
- long_title='boundary layer dissip'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p17'/>
- <param code='146' mars=''
- short_title='surf sens ht flux'
- long_title='surf sensible heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p18'/>
- <param code='147' mars=''
- short_title='surf lat ht flux'
- long_title='surf latent heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p19'/>
- <param code='148' mars=''
- short_title='CHNK'
- long_title='Charnock'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='149' mars=''
- short_title='SNR'
- long_title='Surface net radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='150' mars=''
- short_title='TNR'
- long_title='Top net radiation'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='151' mars=''
- short_title='msl'
- long_title='mean sea level pressure'
- scaling='0.01' offset='-0.0'
- original_unit='Pa' derived_unit='hpa'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p23'/>
- <param code='152' mars=''
- short_title='log surf pres'
- long_title='log surface pressure'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p24'/>
- <param code='153' mars=''
- short_title='SWHR'
- long_title='Short-wave heating rate'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='154' mars=''
- short_title='LWHR'
- long_title='Long-wave heating rate'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='155' mars=''
- short_title='diverg'
- long_title='divergence'
- scaling='100000.0' offset='-0.0'
- original_unit='s**-1' derived_unit='10**5/sec'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p27'/>
- <param code='156' mars=''
- short_title='hgt (geop)'
- long_title='height (geopotential)'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit='m'
- vector1='0' vector2='0'
- contour_interval='40.0' specification='p28'/>
- <param code='157' mars=''
- short_title='rel hum'
- long_title='relative humidity'
- scaling='1.0' offset='-0.0'
- original_unit='%' derived_unit='%'
- vector1='0' vector2='0'
- contour_interval='20.0' specification='p29'/>
- <param code='158' mars=''
- short_title='surf press tend'
- long_title='tendency of surf press'
- scaling='1.0' offset='-0.0'
- original_unit='Pa s**-1' derived_unit='pa/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p30'/>
- <param code='159' mars=''
- short_title='bound layer hgt'
- long_title='boundary layer height'
- scaling='1.0' offset='-0.0'
- original_unit='m' derived_unit='m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='160' mars=''
- short_title='stdev orog'
- long_title='std dev of orography'
- scaling='100.0' offset='-0.0'
- original_unit='' derived_unit='cm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='161' mars=''
- short_title='anisot sub-grid orog'
- long_title='anistropy of sub-gridscale orography'
- scaling='0.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='162' mars=''
- short_title='angle sub-grid orog'
- long_title='angle of sub-gridscale orography'
- scaling='0.0' offset='-0.0'
- original_unit='rad' derived_unit='rad'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='163' mars=''
- short_title='slope sub-grid orog'
- long_title='slope of sub-gridscale orography'
- scaling='0.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='164' mars=''
- short_title='tot cldcov'
- long_title='total cloudcover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.1' specification='p36'/>
- <param code='165' mars=''
- short_title='10m u'
- long_title='10 mtr u'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p37'/>
- <param code='166' mars=''
- short_title='10m v'
- long_title='10 mtr v'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit='m/s'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p38'/>
- <param code='167' mars=''
- short_title='2m temp'
- long_title='2 metre temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p39'/>
- <param code='168' mars=''
- short_title='2m dewp'
- long_title='2 metre dewpoint temp'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p40'/>
- <param code='169' mars=''
- short_title='sur sol rad dwn'
- long_title='surf solar radiation downwards'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='170' mars=''
- short_title='soil temp lyr2'
- long_title='soil temperature layer2'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p42'/>
- <param code='171' mars=''
- short_title='soil wet lyr2'
- long_title='soil wetness layer2'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='1.0' specification='p43'/>
- <param code='172' mars=''
- short_title='l/sea mask'
- long_title='land/ sea mask'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='0/1'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='173' mars=''
- short_title='surf rough'
- long_title='surface roughness'
- scaling='100.0' offset='-0.0'
- original_unit='m' derived_unit='cm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='174' mars=''
- short_title='albedo'
- long_title='albedo'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='175' mars=''
- short_title='sur ther rad dwn'
- long_title='surf thermal radiation downwards'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='176' mars=''
- short_title='surf solrad'
- long_title='surf solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='177' mars=''
- short_title='surf ther rad'
- long_title='surf thermal radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='178' mars=''
- short_title='topsolrad'
- long_title='top solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='179' mars=''
- short_title='top ther rad'
- long_title='top thermal radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='180' mars=''
- short_title='u-stress'
- long_title='u-stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='181' mars=''
- short_title='v-stress'
- long_title='v-stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='182' mars=''
- short_title='evap'
- long_title='evaporation'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='183' mars=''
- short_title='soil temp lyr3'
- long_title='soil temperature layer3'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='184' mars=''
- short_title='soil wet lyr3'
- long_title='soil wetness layer3'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='185' mars=''
- short_title='conv cld cov'
- long_title='convective cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='186' mars=''
- short_title='low cld cov'
- long_title='low cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='187' mars=''
- short_title='med cld cov'
- long_title='medium cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='188' mars=''
- short_title='hi cld cov'
- long_title='high cloud cover'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='189' mars=''
- short_title='sun duration'
- long_title='sunshine duration'
- scaling='1.0' offset='-0.0'
- original_unit='s' derived_unit='sec'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='190' mars=''
- short_title='ew comp subgrid orog var'
- long_title='ew comp subgrid orog var'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit='sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='191' mars=''
- short_title='ns comp subgrid orog var'
- long_title='ns comp subgrid orog var'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit='sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='192' mars=''
- short_title='nwse com subgrd orog var'
- long_title='nwse com subgrd orog var'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit='sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='193' mars=''
- short_title='nswe com subgrd orog var'
- long_title='nswe com subgrd orog var'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit='sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='194' mars=''
- short_title='BTMP'
- long_title='Brightness temperature'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='195' mars=''
- short_title='lat comp grav wav stress'
- long_title='lat comp grav wav stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='196' mars=''
- short_title='mer comp grav wav stress'
- long_title='mer comp grav wav stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2 s' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='197' mars=''
- short_title='grav wav diss'
- long_title='gravity wav dissipation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit='j/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='198' mars=''
- short_title='skin res cont'
- long_title='skin reservoir content'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='199' mars=''
- short_title='percent of veg'
- long_title='percent of vegetation'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='%'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='200' mars=''
- short_title='var subgrid-scale orog'
- long_title='var subgrid-scale orog'
- scaling='1.0' offset='-0.0'
- original_unit='m**2' derived_unit='sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='201' mars=''
- short_title='max 2m tem'
- long_title='maximum temp at 2m'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='202' mars=''
- short_title='min 2m tem'
- long_title='minimum temp at 2 m'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='203' mars=''
- short_title='oz mass mix rat'
- long_title='ozone mass mixing ratio'
- scaling='1000.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit='g/kg'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='204' mars=''
- short_title='prec anal weights'
- long_title='precip. analys weights'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='205' mars=''
- short_title='runoff'
- long_title='runoff'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='206' mars=''
- short_title='tot col oz'
- long_title='total column ozone'
- scaling='46696.2409526033' offset='-0.0'
- original_unit='kg m**-2' derived_unit='Dob'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='207' mars=''
- short_title='10SI'
- long_title='10 metre wind speed'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='208' mars=''
- short_title='TSRC'
- long_title='Top net solar radiation, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='209' mars=''
- short_title='TTRC'
- long_title='Top net thermal radiation, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='210' mars=''
- short_title='SSRC'
- long_title='Surface net solar radiation, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='211' mars=''
- short_title='STRC'
- long_title='Surface net thermal radiation, clear sky'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='212' mars=''
- short_title='TISR'
- long_title='TOA incident solar radiation'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2 s' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='214' mars=''
- short_title='DHR'
- long_title='Diabatic heating by radiation'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='215' mars=''
- short_title='DHVD'
- long_title='Diabatic heating by vertical diffusion'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='216' mars=''
- short_title='DHCC'
- long_title='Diabatic heating by cumulus convection'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='217' mars=''
- short_title='DHLC'
- long_title='Diabatic heating by large-scale condensation'
- scaling='1.0' offset='-0.0'
- original_unit='K' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='218' mars=''
- short_title='VDZW'
- long_title='Vertical diffusion of zonal wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='219' mars=''
- short_title='VDMW'
- long_title='Vertical diffusion of meridional wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='220' mars=''
- short_title='EWGD'
- long_title='East-West gravity wave drag tendency'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='221' mars=''
- short_title='NSGD'
- long_title='North-South gravity wave drag tendency'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='222' mars=''
- short_title='CTZW'
- long_title='Convective tendency of zonal wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='223' mars=''
- short_title='CTMW'
- long_title='Convective tendency of meridional wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='224' mars=''
- short_title='VDH'
- long_title='Vertical diffusion of humidity'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='225' mars=''
- short_title='HTCC'
- long_title='Humidity tendency by cumulus convection'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='226' mars=''
- short_title='HTLC'
- long_title='Humidity tendency by large-scale condensation'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='227' mars=''
- short_title='CRNH'
- long_title='Change from removal of negative humidity'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='228' mars=''
- short_title='tot prec'
- long_title='total precipitation'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='229' mars=''
- short_title='instant e/w surf str'
- long_title='instant e/w surf stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='230' mars=''
- short_title='inst n/s surf str'
- long_title='instant n/s surf stress'
- scaling='1.0' offset='-0.0'
- original_unit='N m**-2' derived_unit='n/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='231' mars=''
- short_title='inst surf sens heat flux'
- long_title='inst surf sens heat flux'
- scaling='1.0' offset='-0.0'
- original_unit='W m**-2' derived_unit='w/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='232' mars=''
- short_title='inst evap'
- long_title='instant evaporation'
- scaling='1000.0' offset='-0.0'
- original_unit='kg m**-2 s' derived_unit='g/sq m'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='233' mars=''
- short_title='appar surf hum'
- long_title='apparent surf humidity'
- scaling='1000.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit='g/kg'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='234' mars=''
- short_title='log surf rough for heat'
- long_title='log surf rough for heat'
- scaling='1.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='235' mars=''
- short_title='skin temp'
- long_title='skin temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p43'/>
- <param code='236' mars=''
- short_title='soil temp lyr4'
- long_title='soil temperature layer4'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p43'/>
- <param code='237' mars=''
- short_title='soil wet lyr 4'
- long_title='soil wetness layer 4'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p43'/>
- <param code='238' mars=''
- short_title='snow temp'
- long_title='snow temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- vector1='0' vector2='0'
- contour_interval='5.0' specification='p43'/>
- <param code='239' mars=''
- short_title='conv snow'
- long_title='convective snowfall'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water equivalent' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='240' mars=''
- short_title='lge scal snow'
- long_title='large scale snowfall'
- scaling='1000.0' offset='-0.0'
- original_unit='m of water equivalent' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='241' mars=''
- short_title='ACF'
- long_title='Accumulated cloud fraction tendency'
- scaling='1.0' offset='-0.0'
- original_unit='(-1 to 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='242' mars=''
- short_title='ALW'
- long_title='Accumulated liquid water tendency'
- scaling='1.0' offset='-0.0'
- original_unit='(-1 to 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='243' mars=''
- short_title='fore albedo'
- long_title='forecast albedo'
- scaling='0.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='244' mars=''
- short_title='fore surf rough'
- long_title='forecast surface roughness'
- scaling='1000.0' offset='-0.0'
- original_unit='m' derived_unit='mm'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='245' mars=''
- short_title='fore log surf rough/heat'
- long_title='forecast log surface roughness for heat'
- scaling='0.0' offset='-0.0'
- original_unit='' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='246' mars=''
- short_title='cloud liq wat con'
- long_title='cloud liquid water content'
- scaling='1000.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit='gm/kg'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='247' mars=''
- short_title='cloud ice wat con'
- long_title='cloud ice water content'
- scaling='1000.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit='gm/kg'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='248' mars=''
- short_title='cloud cov'
- long_title='cloud cover'
- scaling='0.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='(0 - 1)'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='249' mars=''
- short_title='AIW'
- long_title='Accumulated ice water tendency'
- scaling='1.0' offset='-0.0'
- original_unit='(-1 to 1)' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- <param code='250' mars=''
- short_title='ice age'
- long_title='ice age'
- scaling='1.0' offset='-0.0'
- original_unit='(0 - 1)' derived_unit='%'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='251' mars=''
- short_title='unbal comp temp'
- long_title='unbalanced component of temperature'
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg C'
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='252' mars=''
- short_title='unbal comp LNSP'
- long_title='unbalanced component of LNSP'
- scaling='1.0' offset='-0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='253' mars=''
- short_title='unbal comp div'
- long_title='unbalanced component of divergence'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p43'/>
- <param code='254' mars=''
- short_title='ATMW'
- long_title='Adiabatic tendency of meridional wind'
- scaling='1.0' offset='-0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification=''/>
- </table>
-</center>
+ <param code='34'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='35'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='36'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='37'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='38'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='44'
+ original_unit='m of water' derived_unit='cm'
+ scaling='100.0' offset='-0.0'/>
+ <param code='45'
+ original_unit='m of water' derived_unit='cm'
+ scaling='100.0' offset='-0.0'/>
+ <param code='54'
+ original_unit='Pa' derived_unit='hPa'
+ scaling='0.01' offset='-0.0'/>
+ <param code='60'
+ original_unit='K m**2 kg**-1 s**-1' derived_unit='pv units'
+ scaling='1000000.0' offset='-0.0'/>
+ <param code='129'
+ original_unit='m**2 s**-2' derived_unit='dam'
+ scaling='0.0101971621297793' offset='-0.0'/>
+ <param code='130'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='133'
+ original_unit='kg kg**-1' derived_unit='g/kg'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='134'
+ original_unit='Pa' derived_unit='hpa'
+ scaling='0.01' offset='-0.0'/>
+ <param code='138'
+ original_unit='s**-1' derived_unit='10**5/sec'
+ scaling='100000.0' offset='-0.0'/>
+ <param code='139'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='140'
+ original_unit='m of water' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='141'
+ original_unit='m of water equivalent' derived_unit='cm'
+ scaling='100.0' offset='-0.0'/>
+ <param code='142'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='143'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='144'
+ original_unit='m of water equivalent' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='151'
+ original_unit='Pa' derived_unit='hpa'
+ scaling='0.01' offset='-0.0'/>
+ <param code='155'
+ original_unit='s**-1' derived_unit='10**5/sec'
+ scaling='100000.0' offset='-0.0'/>
+ <param code='160'
+ original_unit='' derived_unit='cm'
+ scaling='100.0' offset='-0.0'/>
+ <param code='167'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='168'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='170'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='171'
+ original_unit='m of water' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='173'
+ original_unit='m' derived_unit='cm'
+ scaling='100.0' offset='-0.0'/>
+ <param code='182'
+ original_unit='m of water' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='183'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='184'
+ original_unit='m of water' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='198'
+ original_unit='m of water' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='201'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='202'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='203'
+ original_unit='kg kg**-1' derived_unit='g/kg'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='205'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='206'
+ original_unit='kg m**-2' derived_unit='Dob'
+ scaling='46696.2409526033' offset='-0.0'/>
+ <param code='228'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='232'
+ original_unit='kg m**-2 s' derived_unit='g/sq m'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='233'
+ original_unit='kg kg**-1' derived_unit='g/kg'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='235'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='236'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='237'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='238'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
+ <param code='239'
+ original_unit='m of water equivalent' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='240'
+ original_unit='m of water equivalent' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='244'
+ original_unit='m' derived_unit='mm'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='246'
+ original_unit='kg kg**-1' derived_unit='gm/kg'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='247'
+ original_unit='kg kg**-1' derived_unit='gm/kg'
+ scaling='1000.0' offset='-0.0'/>
+ <param code='251'
+ original_unit='K' derived_unit='deg C'
+ scaling='1.0' offset='-273.16'/>
+ </table>
+<centre/>
diff --git a/share/magics/table_210.xml b/share/magics/table_210.xml
index e3c4579..8b9bf28 100644
--- a/share/magics/table_210.xml
+++ b/share/magics/table_210.xml
@@ -2,489 +2,13 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='210'>
- <param code='1' mars=''
- short_title='aermr01'
- long_title='Aerosol type 1 mixing ratio'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='2' mars=''
- short_title='aermr02'
- long_title='Aerosol type 2 mixing ratio'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='3' mars=''
- short_title='aermr03'
- long_title='Aerosol type 3 mixing ratio'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='4' mars=''
- short_title='aermr04'
- long_title='Aerosol type 4 mixing ratio'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='5' mars=''
- short_title='aermr05'
- long_title='Aerosol type 5 mixing ratio'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='6' mars=''
- short_title='aermr06'
- long_title='Aerosol type 6 mixing ratio'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='7' mars=''
- short_title='aermr07'
- long_title='Aerosol type 7 mixing ratio'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='8' mars=''
- short_title='aermr08'
- long_title='Aerosol type 8 mixing ratio'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='9' mars=''
- short_title='aermr09'
- long_title='Aerosol type 9 mixing ratio'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='10' mars=''
- short_title='aermr10'
- long_title='Aerosol type 10 mixing ratio'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='11' mars=''
- short_title='aermr11'
- long_title='Aerosol type 11 mixing ratio'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='12' mars=''
- short_title='aermr12'
- long_title='Aerosol type 12 mixing ratio'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='16' mars=''
- short_title='aergn01'
- long_title='Aerosol type 1 source/gain accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='17' mars=''
- short_title='aergn02'
- long_title='Aerosol type 2 source/gain accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='18' mars=''
- short_title='aergn03'
- long_title='Aerosol type 3 source/gain accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='19' mars=''
- short_title='aergn04'
- long_title='Aerosol type 4 source/gain accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='20' mars=''
- short_title='aergn05'
- long_title='Aerosol type 5 source/gain accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='21' mars=''
- short_title='aergn06'
- long_title='Aerosol type 6 source/gain accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='22' mars=''
- short_title='aergn07'
- long_title='Aerosol type 7 source/gain accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='23' mars=''
- short_title='aergn08'
- long_title='Aerosol type 8 source/gain accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='24' mars=''
- short_title='aergn09'
- long_title='Aerosol type 9 source/gain accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='25' mars=''
- short_title='aergn10'
- long_title='Aerosol type 10 source/gain accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='26' mars=''
- short_title='aergn11'
- long_title='Aerosol type 11 source/gain accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='27' mars=''
- short_title='aergn12'
- long_title='Aerosol type 12 source/gain accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='31' mars=''
- short_title='aerls01'
- long_title='Aerosol type 1 sink/loss accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='32' mars=''
- short_title='aerls02'
- long_title='Aerosol type 2 sink/loss accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='33' mars=''
- short_title='aerls03'
- long_title='Aerosol type 3 sink/loss accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='34' mars=''
- short_title='aerls04'
- long_title='Aerosol type 4 sink/loss accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='35' mars=''
- short_title='aerls05'
- long_title='Aerosol type 5 sink/loss accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='36' mars=''
- short_title='aerls06'
- long_title='Aerosol type 6 sink/loss accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='37' mars=''
- short_title='aerls07'
- long_title='Aerosol type 7 sink/loss accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='38' mars=''
- short_title='aerls08'
- long_title='Aerosol type 8 sink/loss accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='39' mars=''
- short_title='aerls09'
- long_title='Aerosol type 9 sink/loss accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='40' mars=''
- short_title='aerls10'
- long_title='Aerosol type 10 sink/loss accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='41' mars=''
- short_title='aerls11'
- long_title='Aerosol type 11 sink/loss accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='42' mars=''
- short_title='aerls12'
- long_title='Aerosol type 12 sink/loss accumulated'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='46' mars=''
- short_title='aerpr'
- long_title='Aerosol precursor mixing ratio'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='47' mars=''
- short_title='aersm'
- long_title='Aerosol small mode mixing ratio'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='48' mars=''
- short_title='aerlg'
- long_title='Aerosol large mode mixing ratio'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='49' mars=''
- short_title='aodpr'
- long_title='Aerosol precursor optical depth'
- scaling='1.0' offset='0.0'
- original_unit='dimensionless' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='50' mars=''
- short_title='aodsm'
- long_title='Aerosol small mode optical depth'
- scaling='1.0' offset='0.0'
- original_unit='dimensionless' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='51' mars=''
- short_title='aodlg'
- long_title='Aerosol large mode optical depth'
- scaling='1.0' offset='0.0'
- original_unit='dimensionless' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='52' mars=''
- short_title='aerdep'
- long_title='Dust emission potential'
- scaling='1.0' offset='0.0'
- original_unit='kg s**2 m**-5' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='53' mars=''
- short_title='aerlts'
- long_title='Lifting threshold speed'
- scaling='1.0' offset='0.0'
- original_unit='m s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='54' mars=''
- short_title='aerscc'
- long_title='Soil clay content'
- scaling='1.0' offset='0.0'
- original_unit='%' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='61' mars=''
- short_title='co2'
- long_title='Carbon Dioxide'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='62' mars=''
- short_title='ch4'
- long_title='Methane'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='63' mars=''
- short_title='n2o'
- long_title='Nitrous oxide'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='64' mars=''
- short_title='tcco2'
- long_title='Total column Carbon Dioxide'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='65' mars=''
- short_title='tcch4'
- long_title='Total column Methane'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='66' mars=''
- short_title='tcn2o'
- long_title='Total column Nitrous oxide'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='67' mars=''
- short_title='co2of'
- long_title='Ocean flux of Carbon Dioxide'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='68' mars=''
- short_title='co2nbf'
- long_title='Natural biosphere flux of Carbon Dioxide'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='69' mars=''
- short_title='co2apf'
- long_title='Anthoprogenic emissions of Carbon Dioxide'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2 s**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='121' mars=''
- short_title='no2'
- long_title='Nitrogen dioxide'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='122' mars=''
- short_title='so2'
- long_title='Sulphur dioxide'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='123' mars=''
- short_title='co'
- long_title='Carbon monoxide'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='124' mars=''
- short_title='hcho'
- long_title='Formaldehyde'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='125' mars=''
- short_title='tcno2'
- long_title='Total column Nitrogen dioxide'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='126' mars=''
- short_title='tcso2'
- long_title='Total column Sulphur dioxide'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='127' mars=''
- short_title='tcco'
- long_title='Total column Carbon monoxide'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='128' mars=''
- short_title='tchcho'
- long_title='Total column Formaldehyde'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='181' mars=''
- short_title='ra'
- long_title='Radon'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='182' mars=''
- short_title='sf6'
- long_title='Sulphur Hexafluoride'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='183' mars=''
- short_title='tcra'
- long_title='Total column Radon'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='184' mars=''
- short_title='tcsf6'
- long_title='Total column Sulphur Hexafluoride'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='203' mars=''
- short_title='go3'
- long_title='GEMS Ozone'
- scaling='1.0' offset='0.0'
- original_unit='kg kg**-1' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- <param code='206' mars=''
- short_title='gtco3'
- long_title='GEMS Total column ozone'
- scaling='1.0' offset='0.0'
- original_unit='kg m**-2' derived_unit=''
- vector1='0' vector2='0'
- contour_interval='0.0' specification='p0'/>
- </table>
-</center>
+ </table>
+<centre/>
diff --git a/share/magics/table_254.xml b/share/magics/table_254.xml
index 4e5db71..0eadd15 100644
--- a/share/magics/table_254.xml
+++ b/share/magics/table_254.xml
@@ -2,613 +2,58 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='46'>
- <table code='254'>
- <param code='128' mars=''
- short_title='TP2M'
- long_title='2 metre temperature'
- scaling='1.0' offset='273.16'
- original_unit='K' derived_unit='C'/>
- <param code='129' mars=''
- short_title='DP2M'
- long_title='2 metre dewpoint temperature'
- scaling='1.0' offset='273.16'
- original_unit='K' derived_unit='C'/>
- <param code='130' mars=''
- short_title='U10M'
- long_title='10 metre u-wind component'
- scaling='1.0' offset='0.0'
- original_unit='m/s' derived_unit='m/s'/>
- <param code='131' mars=''
- short_title='V10M'
- long_title='10 metre v-wind component'
- scaling='1.0' offset='0.0'
- original_unit='m/s' derived_unit='m/s'/>
- <param code='132' mars=''
- short_title='TOPO'
- long_title='Topography'
- scaling='1.0' offset='0.0'
- original_unit='m' derived_unit='m'/>
- <param code='133' mars=''
- short_title='GSFP'
- long_title='Geometric mean surface pressure'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='134' mars=''
- short_title='LNSP'
- long_title='Ln surface pressure'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='135' mars=''
- short_title='PSLC'
- long_title='Surface pressure'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='136' mars=''
- short_title='PMSL'
- long_title='M S L pressure (mesinger method)'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='137' mars=''
- short_title='MASK'
- long_title='Mask'
- scaling='1.0' offset='0.0'
- original_unit='NoDim' derived_unit='Nodim'/>
- <param code='138' mars=''
- short_title='MXWU'
- long_title='Maximum u-wind'
- scaling='1.0' offset='0.0'
- original_unit='m/s' derived_unit='m/s'/>
- <param code='139' mars=''
- short_title='MXWV'
- long_title='Maximum v-wind'
- scaling='1.0' offset='0.0'
- original_unit='m/s' derived_unit='m/s'/>
- <param code='140' mars=''
- short_title='CAPE'
- long_title='Convective avail. Pot.energy'
- scaling='1.0' offset='0.0'
- original_unit='J/Kg' derived_unit='J/Kg'/>
- <param code='141' mars=''
- short_title='CINE'
- long_title='Convective inhib. Energy'
- scaling='1.0' offset='0.0'
- original_unit='J/Kg' derived_unit='J/Kg'/>
- <param code='142' mars=''
- short_title='LHCV'
- long_title='Convective latent heating'
- scaling='1.0' offset='0.0'
- original_unit='K/s' derived_unit='K/s'/>
- <param code='143' mars=''
- short_title='MSCV'
- long_title='Convective moisture source'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='144' mars=''
- short_title='SCVM'
- long_title='Shallow conv. Moisture source'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='145' mars=''
- short_title='SCVH'
- long_title='Shallow convective heating'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='146' mars=''
- short_title='MXWP'
- long_title='Maximum wind press. Lvl'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='147' mars=''
- short_title='USTR'
- long_title='Storm motion u-component'
- scaling='1.0' offset='0.0'
- original_unit='m/s' derived_unit='m/s'/>
- <param code='148' mars=''
- short_title='VSTR'
- long_title='Storm motion v-component'
- scaling='1.0' offset='0.0'
- original_unit='m/s' derived_unit='m/s'/>
- <param code='149' mars=''
- short_title='CBNT'
- long_title='Mean cloud cover'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='150' mars=''
- short_title='PCBS'
- long_title='Pressure at cloud base'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='151' mars=''
- short_title='PCTB'
- long_title='Pressure at cloud top'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='152' mars=''
- short_title='FZHT'
- long_title='Freezing level height'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='153' mars=''
- short_title='FZRH'
- long_title='Freezing level relative humidity'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='154' mars=''
- short_title='FDLT'
- long_title='Flight levels temperature'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='155' mars=''
- short_title='FDLU'
- long_title='Flight levels u-wind'
- scaling='1.0' offset='0.0'
- original_unit='m/s' derived_unit='m/s'/>
- <param code='156' mars=''
- short_title='FDLV'
- long_title='Flight levels v-wind'
- scaling='1.0' offset='0.0'
- original_unit='m/s' derived_unit='m/s'/>
- <param code='157' mars=''
- short_title='TPPP'
- long_title='Tropopause pressure'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='158' mars=''
- short_title='TPPT'
- long_title='Tropopause temperature'
- scaling='1.0' offset='273.16'
- original_unit='K' derived_unit='C'/>
- <param code='159' mars=''
- short_title='TPPU'
- long_title='Tropopause u-wind component'
- scaling='1.0' offset='0.0'
- original_unit='m/s' derived_unit='m/s'/>
- <param code='160' mars=''
- short_title='TPPV'
- long_title='Tropopause v-wind component'
- scaling='1.0' offset='0.0'
- original_unit='m/s' derived_unit='m/s'/>
- <param code='162' mars=''
- short_title='GVDU'
- long_title='Gravity wave drag du/dt'
- scaling='1.0' offset='0.0'
- original_unit='m/s' derived_unit='m/s'/>
- <param code='163' mars=''
- short_title='GVDS'
- long_title='Gravity wave drag dv/dt'
- scaling='1.0' offset='0.0'
- original_unit='m/s' derived_unit='m/s'/>
- <param code='164' mars=''
- short_title='GVUS'
- long_title='Grav wave drag sfc zonal stress'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='165' mars=''
- short_title='GVVS'
- long_title='Grav wave drag sfc merid stress'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='167' mars=''
- short_title='DVSH'
- long_title='Divergence of specific humidity'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='168' mars=''
- short_title='HMFC'
- long_title='Horiz. Moisture flux conv.'
- scaling='1.0' offset='0.0'
- original_unit='s' derived_unit='s'/>
- <param code='169' mars=''
- short_title='VMFL'
- long_title='Vert. Integ moisture flux conv.'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='170' mars=''
- short_title='VADV'
- long_title='Vertical moisture advection'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='171' mars=''
- short_title='NHCM'
- long_title='Neg. Hum. Corr. Moisture source'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='172' mars=''
- short_title='LGLH'
- long_title='Large scale latent heating'
- scaling='1.0' offset='0.0'
- original_unit='K/s' derived_unit='K/s'/>
- <param code='173' mars=''
- short_title='LGMS'
- long_title='Large scale moisture source'
- scaling='1.0' offset='0.0'
- original_unit='s' derived_unit='s'/>
- <param code='174' mars=''
- short_title='SMAV'
- long_title='Soil moisture availability'
- scaling='1.0' offset='0.0'
- original_unit='NoDim' derived_unit='NoDim'/>
- <param code='175' mars=''
- short_title='TGRZ'
- long_title='Soil temperature of root zone'
- scaling='1.0' offset='273.16'
- original_unit='K' derived_unit='C'/>
- <param code='176' mars=''
- short_title='BSLH'
- long_title='Bare soil latent heat'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='177' mars=''
- short_title='EVPP'
- long_title='Potential sfc evaporation'
- scaling='1.0' offset='0.0'
- original_unit='m' derived_unit='m'/>
- <param code='178' mars=''
- short_title='RNOF'
- long_title='Runoff'
- scaling='1.0' offset='0.0'
- original_unit='NoDim' derived_unit='NoDim'/>
- <param code='179' mars=''
- short_title='PITP'
- long_title='Interception loss'
- scaling='1.0' offset='0.0'
- original_unit='W/m2' derived_unit='W/m2'/>
- <param code='180' mars=''
- short_title='VPCA'
- long_title='Vapor press of canopy air space'
- scaling='1.0' offset='0.0'
- original_unit='mb' derived_unit='mb'/>
- <param code='181' mars=''
- short_title='QSFC'
- long_title='Surface spec humidity'
- scaling='1.0' offset='0.0'
- original_unit='%' derived_unit='%'/>
- <param code='182' mars=''
- short_title='USSL'
- long_title='Soil wetness of surface'
- scaling='1.0' offset='0.0'
- original_unit='NoDim' derived_unit='NoDim'/>
- <param code='183' mars=''
- short_title='UZRS'
- long_title='Soil wetness of root zone'
- scaling='1.0' offset='0.0'
- original_unit='NoDim' derived_unit='NoDim'/>
- <param code='184' mars=''
- short_title='UZDS'
- long_title='Soil wetness of drainage zone'
- scaling='1.0' offset='0.0'
- original_unit='NoDim' derived_unit='NoDim'/>
- <param code='185' mars=''
- short_title='AMDL'
- long_title='Storage on canopy'
- scaling='1.0' offset='0.0'
- original_unit='m' derived_unit='m'/>
- <param code='186' mars=''
- short_title='AMSL'
- long_title='Storage on ground'
- scaling='1.0' offset='0.0'
- original_unit='m' derived_unit='m'/>
- <param code='187' mars=''
- short_title='TSFC'
- long_title='Surface temperature'
- scaling='1.0' offset='273.16'
- original_unit='K' derived_unit='C'/>
- <param code='188' mars=''
- short_title='TEMS'
- long_title='Surface absolute temperature'
- scaling='1.0' offset='273.16'
- original_unit='K' derived_unit='C'/>
- <param code='189' mars=''
- short_title='TCAS'
- long_title='Temperature of canopy air space'
- scaling='1.0' offset='273.16'
- original_unit='K' derived_unit='C'/>
- <param code='190' mars=''
- short_title='CTMP'
- long_title='Temperature at canopy'
- scaling='1.0' offset='273.16'
- original_unit='K' derived_unit='C'/>
- <param code='191' mars=''
- short_title='TGSC'
- long_title='Ground/surface cover temperature'
- scaling='1.0' offset='273.16'
- original_unit='K' derived_unit='C'/>
- <param code='192' mars=''
- short_title='UVES'
- long_title='Surface zonal wind (u)'
- scaling='1.0' offset='0.0'
- original_unit='m/s' derived_unit='m/s'/>
- <param code='193' mars=''
- short_title='USST'
- long_title='Surface zonal wind stress'
- scaling='1.0' offset='0.0'
- original_unit='Pa' derived_unit='Pa'/>
- <param code='194' mars=''
- short_title='VVES'
- long_title='Surface meridional wind (v)'
- scaling='1.0' offset='0.0'
- original_unit='m/s' derived_unit='m/s'/>
- <param code='195' mars=''
- short_title='VSST'
- long_title='Surface meridional wind stress'
- scaling='1.0' offset='0.0'
- original_unit='Pa' derived_unit='Pa'/>
- <param code='196' mars=''
- short_title='SUVF'
- long_title='Surface momentum flux'
- scaling='1.0' offset='0.0'
- original_unit='W/m2' derived_unit='W/m2'/>
- <param code='197' mars=''
- short_title='ISWF'
- long_title='Incident short wave flux'
- scaling='1.0' offset='0.0'
- original_unit='W/m2' derived_unit='W/m2'/>
- <param code='198' mars=''
- short_title='GHFL'
- long_title='Time ave ground ht flx'
- scaling='1.0' offset='0.0'
- original_unit='W/m2' derived_unit='W/m2'/>
- <param code='200' mars=''
- short_title='LWBC'
- long_title='Net long wave at bottom (clear)'
- scaling='1.0' offset='0.0'
- original_unit='W/m2' derived_unit='W/m2'/>
- <param code='201' mars=''
- short_title='LWTC'
- long_title='Outgoing long wave at top (clear)'
- scaling='1.0' offset='0.0'
- original_unit='W/m2' derived_unit='W/m2'/>
- <param code='202' mars=''
- short_title='SWEC'
- long_title='Short wv absrbd by earth/atm (cl)'
- scaling='1.0' offset='0.0'
- original_unit='W/m2' derived_unit='W/m2'/>
- <param code='203' mars=''
- short_title='OCAC'
- long_title='Short wave absrbd at ground (clr)'
- scaling='1.0' offset='0.0'
- original_unit='W/m2' derived_unit='W/m2'/>
- <param code='205' mars=''
- short_title='LWRH'
- long_title='Long wave radiative heating'
- scaling='1.0' offset='0.0'
- original_unit='K/s' derived_unit='K/s'/>
- <param code='206' mars=''
- short_title='SWRH'
- long_title='Short wave radiative heating'
- scaling='1.0' offset='0.0'
- original_unit='K/s' derived_unit='K/s'/>
- <param code='207' mars=''
- short_title='OLIS'
- long_title='Downward long wave at bottom'
- scaling='1.0' offset='0.0'
- original_unit='W/m2' derived_unit='W/m2'/>
- <param code='208' mars=''
- short_title='OLIC'
- long_title='Downward long wave at bottom (cl)'
- scaling='1.0' offset='0.0'
- original_unit='W/m2' derived_unit='W/m2'/>
- <param code='209' mars=''
- short_title='OCIS'
- long_title='Downward short wave at ground'
- scaling='1.0' offset='0.0'
- original_unit='W/m2' derived_unit='W/m2'/>
- <param code='210' mars=''
- short_title='OCIC'
- long_title='Downward short wave at grd (cl)'
- scaling='1.0' offset='0.0'
- original_unit='W/m2' derived_unit='W/m2'/>
- <param code='211' mars=''
- short_title='OLES'
- long_title='Upward long wave at bottom'
- scaling='1.0' offset='0.0'
- original_unit='W/m2' derived_unit='W/m2'/>
- <param code='212' mars=''
- short_title='OCES'
- long_title='Upward short wave at ground'
- scaling='1.0' offset='0.0'
- original_unit='W/m2' derived_unit='W/m2'/>
- <param code='213' mars=''
- short_title='SWGC'
- long_title='Upward short wave at ground (cl)'
- scaling='1.0' offset='0.0'
- original_unit='W/m2' derived_unit='W/m2'/>
- <param code='214' mars=''
- short_title='ROCE'
- long_title='Upward short wave at top'
- scaling='1.0' offset='0.0'
- original_unit='W/m2' derived_unit='W/m2'/>
- <param code='215' mars=''
- short_title='SWTC'
- long_title='Upward short wave at top (clear)'
- scaling='1.0' offset='0.0'
- original_unit='W/m2' derived_unit='W/m2'/>
- <param code='218' mars=''
- short_title='HHDF'
- long_title='Horizontal heating diffusion'
- scaling='1.0' offset='0.0'
- original_unit='K/s' derived_unit='K/s'/>
- <param code='219' mars=''
- short_title='HMDF'
- long_title='Horizontal moisture diffusion'
- scaling='1.0' offset='0.0'
- original_unit='s' derived_unit='s'/>
- <param code='220' mars=''
- short_title='HDDF'
- long_title='Horizontal divergence diffusion'
- scaling='1.0' offset='0.0'
- original_unit='s2' derived_unit='s2'/>
- <param code='221' mars=''
- short_title='HVDF'
- long_title='Horizontal vorticity diffusion'
- scaling='1.0' offset='0.0'
- original_unit='s2' derived_unit='s2'/>
- <param code='222' mars=''
- short_title='VDMS'
- long_title='Vertical diff. Moisture source'
- scaling='1.0' offset='0.0'
- original_unit='s' derived_unit='s'/>
- <param code='223' mars=''
- short_title='VDFU'
- long_title='Vertical diffusion du/dt'
- scaling='1.0' offset='0.0'
- original_unit='m/s' derived_unit='m/s'/>
- <param code='224' mars=''
- short_title='VDFV'
- long_title='Vertical diffusion dv/dt'
- scaling='1.0' offset='0.0'
- original_unit='m/s' derived_unit='m/s'/>
- <param code='225' mars=''
- short_title='VDFH'
- long_title='Vertical diffusion heating'
- scaling='1.0' offset='0.0'
- original_unit='K/s' derived_unit='K/s'/>
- <param code='226' mars=''
- short_title='UMRS'
- long_title='Surface relative humidity'
- scaling='1.0' offset='0.0'
- original_unit='%' derived_unit='%'/>
- <param code='227' mars=''
- short_title='VDCC'
- long_title='Vertical dist total cloud cover'
- scaling='1.0' offset='0.0'
- original_unit='%' derived_unit='%'/>
- <param code='230' mars=''
- short_title='USMT'
- long_title='Time mean surface zonal wind (u)'
- scaling='1.0' offset='0.0'
- original_unit='m/s' derived_unit='m/s'/>
- <param code='231' mars=''
- short_title='VSMT'
- long_title='Time mean surface merid wind (v)'
- scaling='1.0' offset='0.0'
- original_unit='m/s' derived_unit='m/s'/>
- <param code='232' mars=''
- short_title='TSMT'
- long_title='Time mean surface absolute temp'
- scaling='1.0' offset='273.16'
- original_unit='K' derived_unit='C'/>
- <param code='233' mars=''
- short_title='RSMT'
- long_title='Time mean sfc relative humidity'
- scaling='1.0' offset='0.0'
- original_unit='%' derived_unit='%'/>
- <param code='234' mars=''
- short_title='ATMT'
- long_title='Time mean absolute temperature'
- scaling='1.0' offset='273.16'
- original_unit='K' derived_unit='C'/>
- <param code='235' mars=''
- short_title='STMT'
- long_title='Time mean deep soil temperature'
- scaling='1.0' offset='273.16'
- original_unit='K' derived_unit='C'/>
- <param code='236' mars=''
- short_title='OMMT'
- long_title='Time mean derived omega'
- scaling='1.0' offset='0.0'
- original_unit='hPa/s' derived_unit='hPa/s'/>
- <param code='237' mars=''
- short_title='DVMT'
- long_title='Time mean divergence'
- scaling='1.0' offset='0.0'
- original_unit='s' derived_unit='s'/>
- <param code='238' mars=''
- short_title='ZHMT'
- long_title='Time mean geopotential height'
- scaling='1.0' offset='0.0'
- original_unit='m' derived_unit='m'/>
- <param code='239' mars=''
- short_title='LNMT'
- long_title='Time mean log surface pressure'
- scaling='1.0' offset='0.0'
- original_unit='ln/cb' derived_unit='ln/cb'/>
- <param code='240' mars=''
- short_title='MKMT'
- long_title='Time mean mask'
- scaling='1.0' offset='0.0'
- original_unit='NoDim' derived_unit='NoDim'/>
- <param code='241' mars=''
- short_title='VVMT'
- long_title='Time mean meridional wind (v)'
- scaling='1.0' offset='0.0'
- original_unit='m/s' derived_unit='m/s'/>
- <param code='242' mars=''
- short_title='OMTM'
- long_title='Time mean omega'
- scaling='1.0' offset='0.0'
- original_unit='hPa/s' derived_unit='hPa/s'/>
- <param code='243' mars=''
- short_title='PTMT'
- long_title='Time mean potential temperature'
- scaling='1.0' offset='273.16'
- original_unit='K' derived_unit='C'/>
- <param code='244' mars=''
- short_title='PCMT'
- long_title='Time mean precip. Water'
- scaling='1.0' offset='0.0'
- original_unit='mm' derived_unit='mm'/>
- <param code='245' mars=''
- short_title='RHMT'
- long_title='Time mean relative humidity'
- scaling='1.0' offset='0.0'
- original_unit='%' derived_unit='%'/>
- <param code='246' mars=''
- short_title='MPMT'
- long_title='Time mean sea level pressure'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='247' mars=''
- short_title='SIMT'
- long_title='Time mean sigmadot'
- scaling='1.0' offset='0.0'
- original_unit='s' derived_unit='s'/>
- <param code='248' mars=''
- short_title='UEMT'
- long_title='Time mean specific humidity'
- scaling='1.0' offset='0.0'
- original_unit='Kg/Kg' derived_unit='Kg/Kg'/>
- <param code='249' mars=''
- short_title='FCMT'
- long_title='Time mean stream function'
- scaling='1.0' offset='0.0'
- original_unit='m2/s' derived_unit='m2/s'/>
- <param code='250' mars=''
- short_title='PSMT'
- long_title='Time mean surface pressure'
- scaling='1.0' offset='0.0'
- original_unit='hPa' derived_unit='hPa'/>
- <param code='251' mars=''
- short_title='TMMT'
- long_title='Time mean surface temperature'
- scaling='1.0' offset='273.16'
- original_unit='K' derived_unit='C'/>
- <param code='252' mars=''
- short_title='PVMT'
- long_title='Time mean velocity potential'
- scaling='1.0' offset='0.0'
- original_unit='m2/s' derived_unit='m2/s'/>
- <param code='253' mars=''
- short_title='TVMT'
- long_title='Time mean virtual temperature'
- scaling='1.0' offset='273.16'
- original_unit='K' derived_unit='C'/>
- <param code='254' mars=''
- short_title='VTMT'
- long_title='Time mean vorticity'
- scaling='1.0' offset='0.0'
- original_unit='s' derived_unit='s'/>
- <param code='255' mars=''
- short_title='UVMT'
- long_title='Time mean zonal wind (u)'
- scaling='1.0' offset='0.0'
- original_unit='m/s' derived_unit='m/s'/>
- </table>
-</center>
+<centre code='46'>
+ <table code='254'>
+ <param code='128'
+ original_unit='K' derived_unit='C'
+ scaling='1.0' offset='273.16'/>
+ <param code='129'
+ original_unit='K' derived_unit='C'
+ scaling='1.0' offset='273.16'/>
+ <param code='158'
+ original_unit='K' derived_unit='C'
+ scaling='1.0' offset='273.16'/>
+ <param code='175'
+ original_unit='K' derived_unit='C'
+ scaling='1.0' offset='273.16'/>
+ <param code='187'
+ original_unit='K' derived_unit='C'
+ scaling='1.0' offset='273.16'/>
+ <param code='188'
+ original_unit='K' derived_unit='C'
+ scaling='1.0' offset='273.16'/>
+ <param code='189'
+ original_unit='K' derived_unit='C'
+ scaling='1.0' offset='273.16'/>
+ <param code='190'
+ original_unit='K' derived_unit='C'
+ scaling='1.0' offset='273.16'/>
+ <param code='191'
+ original_unit='K' derived_unit='C'
+ scaling='1.0' offset='273.16'/>
+ <param code='232'
+ original_unit='K' derived_unit='C'
+ scaling='1.0' offset='273.16'/>
+ <param code='234'
+ original_unit='K' derived_unit='C'
+ scaling='1.0' offset='273.16'/>
+ <param code='235'
+ original_unit='K' derived_unit='C'
+ scaling='1.0' offset='273.16'/>
+ <param code='243'
+ original_unit='K' derived_unit='C'
+ scaling='1.0' offset='273.16'/>
+ <param code='251'
+ original_unit='K' derived_unit='C'
+ scaling='1.0' offset='273.16'/>
+ <param code='253'
+ original_unit='K' derived_unit='C'
+ scaling='1.0' offset='273.16'/>
+ </table>
+<centre/>
diff --git a/share/magics/table_260.xml b/share/magics/table_260.xml
index 9638402..01d2297 100644
--- a/share/magics/table_260.xml
+++ b/share/magics/table_260.xml
@@ -2,19 +2,16 @@
(C) Copyright 1996-2016 ECMWF.
This software is licensed under the terms of the Apache Licence Version 2.0
-which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-In applying this licence, ECMWF does not waive the privileges and immunities
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
granted to it by virtue of its status as an intergovernmental organisation nor
does it submit to any jurisdiction.
-->
-<center code='98'>
+<centre code='98'>
<table code='260'>
- <param code='510' mars=''
- short_title=''
- long_title=''
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- />
+ <param code='510'
+ original_unit='K' derived_unit='deg c'
+ scaling='1.0' offset='-273.16'/>
</table>
-</center>
+<centre/>
diff --git a/src/basic/FortranMagics.cc b/src/basic/FortranMagics.cc
index adefe79..28e9b5e 100644
--- a/src/basic/FortranMagics.cc
+++ b/src/basic/FortranMagics.cc
@@ -945,6 +945,17 @@ void FortranMagics::epsgraph()
action_->visdef(epsgraph);
}
+void FortranMagics::epslight()
+{
+ actions();
+ if ( !action_ ) {
+ MagLog::error() << "epslight-> No data defined " << endl;
+ exit(1);
+ }
+ EpsLight* epslight = new EpsLight();
+ action_->visdef(epslight);
+}
+
void FortranMagics::epswave()
{
actions();
diff --git a/src/basic/FortranMagics.h b/src/basic/FortranMagics.h
index 20c6233..42fcad2 100644
--- a/src/basic/FortranMagics.h
+++ b/src/basic/FortranMagics.h
@@ -86,6 +86,7 @@ public:
void epswind();
void epsbar();
void epsshading();
+ void epslight();
void pgraph();
void pboxplot();
diff --git a/src/basic/LegendVisitor.cc b/src/basic/LegendVisitor.cc
index 608c7b3..74c19e9 100644
--- a/src/basic/LegendVisitor.cc
+++ b/src/basic/LegendVisitor.cc
@@ -225,6 +225,8 @@ void LegendVisitor::build()
back()->units(units_text_);
}
+
+
for(vector<LegendEntry*>::const_iterator entry = begin(); entry != end(); ++entry)
{
(*entry)->width(text_width_);
@@ -308,7 +310,16 @@ void LegendVisitor::horizontal()
}
// here we have a title, we need to adjust the coordinates used in the legend dependind on its position
-
+ if ( magCompare(entry_orientation_, "right_left") ) {
+ std::reverse(begin(), end());
+ for(vector<LegendEntry*>::const_iterator entry = begin(); entry != end(); ++entry)
+ std::swap((*entry)->from_, (*entry)->to_);
+ back()->last_ = true;
+ front()->last_ = false;
+ back()->first_ = false;
+ front()->first_ = true;
+ std::reverse(lines_.begin(), lines_.end());
+ }
@@ -344,6 +355,17 @@ void LegendVisitor::vertical()
(this->*titleBuilders_[title_position_])();
}
+ if ( magCompare(entry_orientation_, "top_bottom") ) {
+ std::reverse(begin(), end());
+ for(vector<LegendEntry*>::const_iterator entry = begin(); entry != end(); ++entry)
+ std::swap((*entry)->from_, (*entry)->to_);
+ back()->last_ = true;
+ front()->last_ = false;
+ back()->first_ = false;
+ front()->first_ = true;
+ std::reverse(lines_.begin(), lines_.end());
+ }
+
}
void LegendVisitor::topTitle()
{
diff --git a/src/common/Colour.h b/src/common/Colour.h
index 7e609cf..56d9726 100644
--- a/src/common/Colour.h
+++ b/src/common/Colour.h
@@ -33,7 +33,7 @@ using std::istream;
namespace magics {
-class Hsl;
+struct Hsl;
class XmlNode;
/*! \struct Rgb
diff --git a/src/common/Data.h b/src/common/Data.h
index dd34b23..0d665dc 100644
--- a/src/common/Data.h
+++ b/src/common/Data.h
@@ -64,7 +64,7 @@ public:
class Data: public MetviewIcon{
public:
- Data(): name_("no_name"), binning_(0), dimension_(1), valid_(true), thinningFactor_(1) {}
+ Data(): name_("no_name"), dimension_(1), valid_(true), binning_(0), thinningFactor_(1) {}
virtual ~Data() { if ( binning_ ) delete binning_; }
//! Method to access the data as a matrix Used by pcont action routine
virtual MatrixHandler& matrix() { throw MethodNotYetImplemented("Data::matrix"); }
diff --git a/src/common/LogoPlotting.cc b/src/common/LogoPlotting.cc
index f1ea695..dd31704 100644
--- a/src/common/LogoPlotting.cc
+++ b/src/common/LogoPlotting.cc
@@ -51,6 +51,21 @@ void LogoPlotting::print(ostream& out) const
void LogoPlotting::operator()(BasicGraphicsObjectContainer& tree) const
{
+ static map<string, string> logos;
+ if ( logos.empty() ) {
+ logos["ecmwf"] = "logo_ecmwf";
+ logos["c3s"] = "logo_c3s";
+ logos["cams"] = "logo_cams";
+ }
+
+ string logo = "logo_ecmwf";
+ map<string, string>::iterator l = logos.find(name_);
+ if ( l == logos.end() ) {
+ MagLog::warning() << "Unknow logo " << name_ << ": use default " << name_ << endl;
+ }
+ else
+ logo = l->second;
+
Symbol* symbol = new Symbol();
double x = (0.3 * 6.75 * 100) / tree.absoluteWidth();
@@ -58,7 +73,7 @@ void LogoPlotting::operator()(BasicGraphicsObjectContainer& tree) const
double y = (0.3/tree.absoluteHeight())*100; // 0.2
(*symbol).setColour(Colour("BLUE"));
- (*symbol).setSymbol("logo_ecmwf");
+ (*symbol).setSymbol(logo);
(*symbol).setHeight(0.6); // length = height * 6.75
(*symbol).push_back(PaperPoint(x,y));
diff --git a/src/common/LogoPlotting.h b/src/common/LogoPlotting.h
index 25ecf38..ef27f4f 100644
--- a/src/common/LogoPlotting.h
+++ b/src/common/LogoPlotting.h
@@ -63,7 +63,7 @@ private:
};
-class LogoPlotting : public NoLogoPlotting {
+class LogoPlotting : public NoLogoPlotting, public LogoPlottingAttributes {
public:
LogoPlotting();
diff --git a/src/common/MagicsCalls.cc b/src/common/MagicsCalls.cc
index 5f4b41a..e818d2a 100644
--- a/src/common/MagicsCalls.cc
+++ b/src/common/MagicsCalls.cc
@@ -1217,6 +1217,9 @@ void pepsplumes_()
void pepsgraph_() {
magics_->epsgraph();
}
+void pepslight_() {
+ magics_->epslight();
+}
void pepswave_() {
magics_->epswave();
@@ -1290,6 +1293,8 @@ void mag_epswind() { pepswind_(); }
void mag_epsbar() { pepsbar_(); }
void mag_epsshading() { pepsshading_(); }
void mag_epsplumes() { pepsplumes_(); }
+void mag_epslight() { pepslight_(); }
+
void mag_new(const char* page)
{
diff --git a/src/common/Symbol.cc b/src/common/Symbol.cc
index c9d7fac..d01be5c 100644
--- a/src/common/Symbol.cc
+++ b/src/common/Symbol.cc
@@ -83,6 +83,8 @@ Symbol* SymbolProperties::symbol(const string& type) const
const unsigned text_size = text_.size();
+
+
if ( magCompare(type, "marker") ) {
if ( image_ ) {
ImageSymbol* img = new ImageSymbol(image_path_, image_format_);
@@ -130,6 +132,12 @@ Symbol* SymbolProperties::symbol(const string& type) const
text->font(font_);
text->text(text_);
text->blanking(blanking_);
+
+ symbol->setColour(Colour("none"));
+ symbol->setSymbol(marker_);
+ symbol->setHeight(0.0);
+
+ return symbol;
}
}
if ( magCompare(type, "number") )
diff --git a/src/common/magics_api.h b/src/common/magics_api.h
index 17ba06f..f14ffa4 100644
--- a/src/common/magics_api.h
+++ b/src/common/magics_api.h
@@ -54,6 +54,8 @@ void mag_epsinput();
void mag_epscloud();
void mag_epsplumes();
void mag_epsgraph();
+void mag_epslight();
+
void mag_epsbar();
void mag_epsshading();
void mag_epswind();
diff --git a/src/decoders/EpsXmlInput.cc b/src/decoders/EpsXmlInput.cc
index 861a71e..2479d7a 100644
--- a/src/decoders/EpsXmlInput.cc
+++ b/src/decoders/EpsXmlInput.cc
@@ -191,12 +191,12 @@ void EpsXmlInput::visit(const XmlNode& node)
point->insert(make_pair("min", value("min")));
point->insert(make_pair("max", value("max")));
point->insert(make_pair("ten", value("ten")));
- point->insert(make_pair("twentyfive", value("twentyfive")));
+ point->insert(make_pair("twenty_five", value("twentyfive")));
point->insert(make_pair("median", value("median")));
- point->insert(make_pair("seventyfive", value("seventyfive")));
- point->insert(make_pair("ninty", value("ninety")));
+ point->insert(make_pair("seventy_five", value("seventyfive")));
+ point->insert(make_pair("ninety", value("ninety")));
if ( !node.getAttribute("forecast").empty() )
- point->insert(make_pair("forecast", value("forecast")));
+ point->insert(make_pair("hres", value("forecast")));
if ( !node.getAttribute("control").empty() )
point->insert(make_pair("control", value("control")));
diff --git a/src/decoders/GribDecoder.cc b/src/decoders/GribDecoder.cc
index a5c7f83..c1d635d 100644
--- a/src/decoders/GribDecoder.cc
+++ b/src/decoders/GribDecoder.cc
@@ -2052,9 +2052,12 @@ public:
ostringstream out;
- long date = grib.getLong("date");
+ long date = grib.getLong("dataDate");
long hour = grib.getLong("hour");
long mn = grib.getLong("minute");
+ string x = grib.getString("dataDate");
+ cout << x << endl;
+
MagDate part1 = MagDate(date);
MagTime part2 = MagTime(hour, mn, 0);
DateTime full(part1, part2);
@@ -2081,7 +2084,7 @@ public:
ostringstream out;
- long date = grib.getLong("date");
+ long date = grib.getLong("dataDate");
long hour = grib.getLong("hour");
long mn = grib.getLong("minute");
diff --git a/src/decoders/GribRegularInterpretor.cc b/src/decoders/GribRegularInterpretor.cc
index 40096f4..b4c5ea0 100644
--- a/src/decoders/GribRegularInterpretor.cc
+++ b/src/decoders/GribRegularInterpretor.cc
@@ -355,12 +355,19 @@ void GribInterpretor::scaling(const GribDecoder& grib, double& scaling,
offset = paramdef.offset();
originalUnits = paramdef.originalUnit();
derivedUnits = paramdef.derivedUnit();
- } catch (...) {
+ if ( paramdef.code() == -1 ) {
+ originalUnits = grib.getString("units");
+ derivedUnits = originalUnits;
+ }
+ }
+ catch (exception) {
+
MagLog::warning()
<< " Can not find information for the parameter [" << id
<< "." << table << "]\n";
}
}
+
} else {
scaling = grib.scaling_factor_;
offset = grib.scaling_offset_;
diff --git a/src/decoders/LocalTable.h b/src/decoders/LocalTable.h
index 230133a..cae5845 100644
--- a/src/decoders/LocalTable.h
+++ b/src/decoders/LocalTable.h
@@ -42,13 +42,13 @@ public :
scaling_(1),
offset_(0) {}
virtual ~ParamDef() {}
- int code() { return code_; }
+ int code() const { return code_; }
string longTitle() const { return longTitle_; }
string shortTitle() const { return shortTitle_; }
string originalUnit() const { return originalUnit_; }
string derivedUnit() const { return derivedUnit_; }
- double scaling() const { return scaling_; }
- double offset() const { return offset_; }
+ double scaling() const { return scaling_; }
+ double offset() const { return offset_; }
protected:
//! Method to print string about this class on to a stream of type ostream (virtual).
diff --git a/src/drivers/CairoDriver.cc b/src/drivers/CairoDriver.cc
index c5a3c64..0a3193f 100644
--- a/src/drivers/CairoDriver.cc
+++ b/src/drivers/CairoDriver.cc
@@ -159,9 +159,6 @@ void CairoDriver::setupNewSurface() const
{
#if CAIRO_HAS_PDF_SURFACE
filename_ = getFileName("pdf");
-// dimensionXglobal_ = static_cast<int>(getXDeviceLength()*72/2.54);
- // dimensionYglobal_ = static_cast<int>(getYDeviceLength()*72/2.54);
-
surface_ = cairo_pdf_surface_create(filename_.c_str(), dimensionXglobal_, dimensionYglobal_);
#else
MagLog::error() << "CairoDriver: PDF output NOT supported! Enable PDF support in your Cairo installation." << std::endl;
@@ -170,19 +167,10 @@ void CairoDriver::setupNewSurface() const
else if(magCompare(backend_,"ps"))
{
#if CAIRO_HAS_PS_SURFACE
- filename_ = getFileName("ps");
-
- const int dimensionXglobal = static_cast<int>(getXDeviceLength()*72/2.54);
- const int dimensionYglobal = static_cast<int>(getYDeviceLength()*72/2.54);
-
-// if(dimensionXglobal>dimensionYglobal) // landscape
-// {
-// surface_ = cairo_ps_surface_create(filename_.c_str(), dimensionYglobal,dimensionXglobal);
-// }
-// else
-// {
- surface_ = cairo_ps_surface_create(filename_.c_str(), dimensionXglobal,dimensionYglobal);
-// }
+ filename_ = getFileName("ps");
+ const int dimensionXglobal = static_cast<int>(getXDeviceLength()*72/2.54);
+ const int dimensionYglobal = static_cast<int>(getYDeviceLength()*72/2.54);
+ surface_ = cairo_ps_surface_create(filename_.c_str(), dimensionXglobal,dimensionYglobal);
#else
MagLog::error() << "CairoDriver: PS output NOT supported! Enable PS support in your Cairo installation." << std::endl;
#endif
@@ -211,35 +199,6 @@ void CairoDriver::setupNewSurface() const
MagLog::error() << "CairoDriver: SVG output NOT supported! Enable SVG support in your Cairo installation." << std::endl;
#endif
}
-/*
- else if(magCompare(backend_,"x"))
- {
-#if CAIRO_HAS_XLIB_SURFACE
- Window rootwin;
- Window win;
-
- if(!(dpy=XOpenDisplay(NULL)))
- {
- MagLog::error() << "CairoDriver: Could not open display for Xlib!"<< std::endl;
- terminate();
- }
-
- int scr=DefaultScreen(dpy);
- rootwin=RootWindow(dpy, scr);
-
- win=XCreateSimpleWindow(dpy, rootwin, 1, 1, dimensionXglobal_, dimensionYglobal_, 0,
- BlackPixel(dpy, scr), BlackPixel(dpy, scr));
-
- XStoreName(dpy, win, "Magics++");
- XSelectInput(dpy, win, ExposureMask|ButtonPressMask);
- XMapWindow(dpy, win);
-
- surface_ = cairo_xlib_surface_create(dpy, win, DefaultVisual(dpy, 0), dimensionXglobal_, dimensionYglobal_);
-#else
- MagLog::error() << "CairoDriver: Xlib output NOT supported! Enable Xlib support in your Cairo installation." << std::endl;
-#endif
- }
-*/
else
{
MagLog::error() << "CairoDriver: The backend "<< backend_ <<" is NOT supported!" << std::endl;
@@ -266,32 +225,15 @@ void CairoDriver::setupNewSurface() const
const string s3 = "%%For: " + info.getUserID() + "@" + info.getHostName() + " " + info.getUserName();
cairo_ps_surface_dsc_comment (surface_, s3.c_str());
-/* if(dimensionXglobal_>dimensionYglobal_) // landscape
- {
- dimensionYglobal_ = static_cast<int>(getXDeviceLength()*72/2.54);
- dimensionXglobal_ = static_cast<int>(getYDeviceLength()*72/2.54);
- cairo_translate (cr_, 0, dimensionYglobal_);
- cairo_matrix_t matrix;
- cairo_matrix_init (&matrix, 0, -1, 1, 0, 0, 0);
- cairo_transform (cr_, &matrix);
- cairo_ps_surface_dsc_comment (surface_, "%%PageOrientation: Landscape");
- }
- else
- {
-*/
- dimensionXglobal_ = static_cast<int>(getXDeviceLength()*72/2.54);
- dimensionYglobal_ = static_cast<int>(getYDeviceLength()*72/2.54);
- cairo_ps_surface_dsc_comment (surface_, "%%PageOrientation: Landscape");
-// }
+ dimensionXglobal_ = static_cast<int>(getXDeviceLength()*72/2.54);
+ dimensionYglobal_ = static_cast<int>(getYDeviceLength()*72/2.54);
+ cairo_ps_surface_dsc_comment (surface_, "%%PageOrientation: Landscape");
if(magCompare(MAGICS_SITE,"ecmwf"))
- cairo_ps_surface_dsc_comment (surface_, "%%Copyright: Copyright (C) ECMWF");
+ cairo_ps_surface_dsc_comment (surface_, "%%Copyright: ECMWF");
#endif
}
-//#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 2, 0)
-// cairo_surface_set_fallback_resolution (surface_, resolution_, resolution_);
-//#endif
if(magCompare(transparent_,"off") || !(magCompare(backend_,"png") || magCompare(backend_,"geotiff")) )
{
cairo_set_source_rgb (cr_, 1.0, 1.0, 1.0); /* white */
@@ -325,30 +267,13 @@ void CairoDriver::setupNewSurface() const
void CairoDriver::close()
{
currentPage_ = 0;
-
if(magCompare(backend_,"pdf") && !filename_.empty()) printOutputName("CAIRO pdf "+filename_);
if(magCompare(backend_,"ps") && !filename_.empty()) printOutputName("CAIRO ps "+filename_);
- if ( context_ == 0 ) {
+ if (!context_) {
cairo_surface_destroy (surface_);
cairo_destroy (cr_);
}
-/*
-#if CAIRO_HAS_XLIB_SURFACE
- if(magCompare(backend_,"x"))
- {
- XEvent event;
- while(1)
- {
- XNextEvent(dpy, &event);
- if(event.type==Expose && event.xexpose.count<1)
- {}
- else if(event.type==ButtonPress) break;
- }
- XCloseDisplay(dpy);
- }
-#endif
-*/
}
@@ -1596,31 +1521,38 @@ MAGICS_NO_EXPORT void CairoDriver::renderSymbols(const Symbol& symbol) const
{
debugOutput("Start CairoDriver Symbols");
- if(symbol.getSymbol()=="logo_ecmwf")
+ const string symbolName = symbol.getSymbol();
+ const string logo = "logo_";
+ if (symbolName.find(logo) == std::string::npos)
+ {
+ BaseDriver::renderSymbols(symbol);
+ }
+ else
{
- const string logofile = getEnvVariable("MAGPLUS_HOME") + MAGPLUS_PATH_TO_SHARE_ + "ecmwf_logo_2014.png";
+ string logofile = getEnvVariable("MAGPLUS_HOME") + MAGPLUS_PATH_TO_SHARE_;
+ if (symbolName == "logo_cams") logofile += "CAMS_combined.png";
+ else if(symbolName == "logo_c3s") logofile += "C3S_combined.png";
+ else logofile += "ecmwf_logo_2014.png";
+
cairo_surface_t *image = cairo_image_surface_create_from_png(logofile.c_str());
+ cairo_status_t ret = cairo_surface_status(image);
- if(image)
+ if(!ret)
{
cairo_save(cr_);
+ cairo_translate (cr_, projectX(symbol[0].x()), projectY(symbol[0].y()));
+ const MFloat sizeX = convertCM(symbol.getHeight()/2) * coordRatioX_;
+ const MFloat sizeY = -convertCM(symbol.getHeight()/2) * coordRatioY_;
const int w = cairo_image_surface_get_width(image);
const int h = cairo_image_surface_get_height(image);
-
- cairo_translate (cr_, projectX(symbol[0].x()), projectY(symbol[0].y()));
- const MFloat scaling = convertCM(symbol.getHeight()*.1) / coordRatioY_;
- cairo_scale (cr_, 0.1, 0.1);
- cairo_set_source_surface(cr_, image, w*scaling, h*scaling);
+//cout << ">>>>>>>>> "<<symbol.getHeight()<<" --- "<<sizeX<<"/"<< w <<endl;
+ cairo_scale (cr_, sizeX*.55/w, sizeY*.23/h);
+ cairo_set_source_surface(cr_, image, -sizeX, -sizeY*1.3);
cairo_paint(cr_);
-
cairo_surface_destroy (image);
cairo_restore(cr_);
}
- else MagLog::warning() << "CairoDriver-> Could NOT read the logo file "<< logofile << " !" << endl;
- }
- else
- {
- BaseDriver::renderSymbols(symbol);
+ else MagLog::warning() << "CairoDriver - Could NOT read logo "<< logofile << endl;
}
}
diff --git a/src/libMagWrapper/MagPlus.cc b/src/libMagWrapper/MagPlus.cc
index e1b9869..f001c98 100644
--- a/src/libMagWrapper/MagPlus.cc
+++ b/src/libMagWrapper/MagPlus.cc
@@ -1440,18 +1440,9 @@ bool MagPlus::obs(magics::MagRequest& in)
{
#ifdef HAVE_BUFR
ObsPlottingWrapper visdef;
- // here we have to set up manullay the parameters because the obs object is more complex!
- // This is not the right solution just a workaround before we find a clean solution...
-
- for (int i = 0; i < in.countParameters(); i++) {
- string param = in.getParameter(i);
- string val = in(param.c_str());
-
- ParameterManager::set(param, val);
-}
-
-
+
visdef.set(in);
+
MagLog::dev()<< "add obs" << *visdef.object() << endl;
top()->visdef(visdef.object());
pop();
diff --git a/src/params/Axis.xml b/src/params/Axis.xml
index 9936c41..1909f8a 100644
--- a/src/params/Axis.xml
+++ b/src/params/Axis.xml
@@ -58,9 +58,11 @@ does it submit to any jurisdiction.
<set name="axis_grid_reference_level" value="on"> </set>
<set name="axis_grid_reference_colour" value="on"> </set>
<set name="axis_grid_reference_line_style" value="on"> </set>
- <set name="axis_grid_reference_thickness" value="on"> </set>
+ <set name="axis_grid_reference_thickness" value="on"> </set>#
+ <set name="axis_minor_grid" value="on"> </set>
+
</parameter>
- <parameter member="grid_colour" to="Colour" default="yellow" from="string" name="axis_grid_colour">
+ <parameter member="grid_colour" to="Colour" default="black" from="string" name="axis_grid_colour">
<documentation>Colour of grid lines </documentation>
<migration>2.13.5 - Default changed fronm YELLOW to BLACK </migration>
</parameter>
@@ -71,6 +73,23 @@ does it submit to any jurisdiction.
<parameter member="grid_thickness" to="int" default="1" from="int" name="axis_grid_thickness">
<documentation> Thickness of grid lines </documentation>
</parameter>
+ <parameter member="minor_grid" to="bool" default="off" from="string" name="axis_minor_grid">
+ <set name="axis_minor_grid_colour" value="on"> </set>
+ <set name="axis_minor_grid_line_style" value="on"> </set>
+ <set name="axis_minor_grid_thickness" value="on"> </set>
+ </parameter>
+ <parameter member="minor_grid_colour" to="Colour" default="black" from="string" name="axis_minor_grid_colour">
+ <documentation>Colour of grid lines </documentation>
+ <migration>2.13.5 - Default changed fronm YELLOW to BLACK </migration>
+ </parameter>
+ <parameter member="minor_grid_style" to="LineStyle" default="solid" from="string" name="axis_minor_grid_line_style">
+ <documentation> Line style of grid </documentation>
+ </parameter>
+
+ <parameter member="minor_grid_thickness" to="int" default="1" from="int" name="axis_minor_grid_thickness">
+ <documentation> Thickness of grid lines </documentation>
+ </parameter>
+
<parameter member="grid_reference_level" to="float" default="INT_MAX" from="float" name="axis_grid_reference_level">
<documentation> value to be used as reference for the grid </documentation>
</parameter>
diff --git a/src/params/BinaryObject.xml b/src/params/BinaryObject.xml
index 0116d34..ea0d773 100644
--- a/src/params/BinaryObject.xml
+++ b/src/params/BinaryObject.xml
@@ -36,5 +36,9 @@ does it submit to any jurisdiction.
<parameter from="float" name="mgb_height" visible="no" default="100" member="mgb_height" to="float">
<documentation for_docs="no">Height in percentage </documentation>
</parameter>
+ <parameter from="float" name="mgb_blur_radius" visible="no" default="-1" member="mgb_blur_radius" to="float">
+ <documentation for_docs="no"> Blur radius, Only for png output, default: -1 no blurt effect </documentation>
+ </parameter>
+
</class></magics>
diff --git a/src/params/LogoPlotting.xml b/src/params/LogoPlotting.xml
index 85164f7..46410ad 100644
--- a/src/params/LogoPlotting.xml
+++ b/src/params/LogoPlotting.xml
@@ -1,5 +1,10 @@
<magics>
-<class inherits="NoLogoPlotting" include="LogoPlotting.h" directory="common" xmltag="logo" name="LogoPlotting"/></magics>
+<class inherits="NoLogoPlotting" include="LogoPlotting.h" directory="common" xmltag="logo" name="LogoPlotting">
+ <parameter from="string" name="page_id_line_logo_name" default="ecmwf" member="name" values="ecmwf/c3s/cams" to="string">
+ <documentation>Choose of the the 3 predefined logos: ecmwf, c3s or cams</documentation>
+ </parameter>
+</class>
+</magics>
<!--
(C) Copyright 1996-2016 ECMWF.
diff --git a/src/params/SymbolPlotting.xml b/src/params/SymbolPlotting.xml
index e2891b5..b21ab02 100644
--- a/src/params/SymbolPlotting.xml
+++ b/src/params/SymbolPlotting.xml
@@ -126,8 +126,7 @@ does it submit to any jurisdiction.
<documentation> Method to select a marker : by name, by index, by image : in that case, Magics will use an external image as marker.
</documentation>
<set name="symbol_marker_index" value="index"> </set>
- <set name="symbol_advanced_table_marker_name_list" value="name"> </set>
- <noset name="symbol_marker_name" value="name"> </noset>
+ <!--set name="symbol_advanced_table_marker_name_list" value="name"> </set-->
<set name="symbol_image_path" value="image"> </set>
<set name="symbol_image_format" value="image"> </set>
<set name="symbol_image_width" value="image"> </set>
diff --git a/src/visualisers/Axis.cc b/src/visualisers/Axis.cc
index 9514be0..9cd3629 100644
--- a/src/visualisers/Axis.cc
+++ b/src/visualisers/Axis.cc
@@ -536,8 +536,24 @@ void HorizontalAxis::grid(DrawingVisitor& out) const
const Transformation& transformation = out.transformation();
for (AxisItems::const_iterator x = items_.begin(); x != items_.end(); ++x)
{
- if ( !(*x)->isGrid() ) continue;
pos = (*x)->position();
+
+ if ( minor_tick_ && minor_grid_ && (*x)->isMinorTick() ) {
+
+ if ( !transformation.inX(pos) ) continue;
+
+ Polyline* grid = new Polyline();
+ grid->push_back(PaperPoint(transformation.x(pos), bottom));
+ grid->push_back(PaperPoint(transformation.x(pos), top));
+ grid->setColour(*minor_grid_colour_);
+ grid->setLineStyle(minor_grid_style_);
+ grid->setThickness(minor_grid_thickness_);
+ out.push_back(grid);
+
+ continue;
+ }
+ if ( !(*x)->isGrid() ) continue;
+
if ( !transformation.inX(pos) ) continue;
Polyline* grid = new Polyline();
grid->push_back(PaperPoint(transformation.x(pos), bottom));
@@ -568,8 +584,21 @@ void VerticalAxis::grid(DrawingVisitor& out) const
const Transformation& transformation = out.transformation();
for (AxisItems::const_iterator y = items_.begin(); y != items_.end(); ++y)
{
- if (!(*y)->isGrid() ) continue;
pos = (*y)->position();
+ if ( minor_tick_ && minor_grid_ && (*y)->isMinorTick() ) {
+ if ( !transformation.inY(pos) ) continue;
+
+ Polyline* grid = new Polyline();
+ grid->push_back(PaperPoint(left, transformation.y(pos)));
+ grid->push_back(PaperPoint(right, transformation.y(pos)));
+ grid->setColour(*minor_grid_colour_);
+ grid->setLineStyle(minor_grid_style_);
+ grid->setThickness(minor_grid_thickness_);
+ out.push_back(grid);
+ continue;
+ }
+ if (!(*y)->isGrid() ) continue;
+
if ( !transformation.inY(pos) ) continue;
Polyline* grid = new Polyline();
grid->push_back(PaperPoint(left, transformation.y(pos)));
@@ -586,7 +615,7 @@ void VerticalAxis::grid(DrawingVisitor& out) const
grid->setThickness(grid_thickness_);
}
out.push_back(grid);
- }
+ }
}
void VerticalAxis::minortick(VerticalAxisVisitor& axis)
diff --git a/src/visualisers/EpsGraph.cc b/src/visualisers/EpsGraph.cc
index 23e4610..bf597af 100644
--- a/src/visualisers/EpsGraph.cc
+++ b/src/visualisers/EpsGraph.cc
@@ -733,7 +733,7 @@ void EpsGraph::operator()(Data& data, BasicGraphicsObjectContainer& visitor)
CustomisedPoint::const_iterator ten = (*point)->find("ten");
- CustomisedPoint::const_iterator ninty = (*point)->find("ninty");
+ CustomisedPoint::const_iterator ninty = (*point)->find("ninety");
@@ -742,8 +742,8 @@ void EpsGraph::operator()(Data& data, BasicGraphicsObjectContainer& visitor)
if ( (*point)->find("control") != (*point)->end() && (**point)["control"]!= 9999. )
control->push_back(PaperPoint(x, (**point)["control"]));
- if ( (*point)->find("forecast") != (*point)->end() && (**point)["forecast"] != 9999.)
- forecast->push_back(PaperPoint(x, (**point)["forecast"]));
+ if ( (*point)->find("hres") != (*point)->end() && (**point)["hres"] != 9999.)
+ forecast->push_back(PaperPoint(x, (**point)["hres"]));
if ( (*point)->find("median") == (*point)->end() ) {
eps_ = false;
continue;
@@ -756,10 +756,10 @@ void EpsGraph::operator()(Data& data, BasicGraphicsObjectContainer& visitor)
vector<double> eps;
eps.push_back( (**point)["min"]);
eps.push_back( (**point)["ten"]);
- eps.push_back( (**point)["twentyfive"]);
+ eps.push_back( (**point)["twenty_five"]);
eps.push_back( (**point)["median"]);
- eps.push_back( (**point)["seventyfive"]);
- eps.push_back( (**point)["ninty"]);
+ eps.push_back( (**point)["seventy_five"]);
+ eps.push_back( (**point)["ninety"]);
eps.push_back( (**point)["max"]);
std::sort(eps.begin(), eps.end());
@@ -906,8 +906,8 @@ void EpsGraph::operator()(Data& data, BasicGraphicsObjectContainer& visitor)
ypos.push_back(min);
if ( (*point)->find("control") != (*point)->end() )
ypos.push_back((**point)["control"]);
- if ( (*point)->find("forecast") != (*point)->end() )
- ypos.push_back((**point)["forecast"]);
+ if ( (*point)->find("hres") != (*point)->end() )
+ ypos.push_back((**point)["hres"]);
}
@@ -955,6 +955,149 @@ void EpsGraph::operator()(Data& data, BasicGraphicsObjectContainer& visitor)
}
+void EpsLight::print(ostream& visitor) const
+{
+ visitor << "EpsLight[";
+ visitor << "]";
+}
+
+
+
+void EpsLight::operator()(Data& data, BasicGraphicsObjectContainer& visitor)
+{
+
+/*
+ #6AE9FF,#B0EBF5,#B4DAE0,#A3BBBF,#889B9E,#6AE9FF,#B0EBF5,#B4DAE0
+ Hsl hsl = colour.hsl();
+
+ float light = hsl.light_;
+
+ hsl.light_ += (0.99 - light)*((point["total"]- point[direction.first])/point["total"]);
+*/
+
+ vector<Colour> colours;
+
+ colours.push_back(Colour("#6AE9FF"));
+
+ colours.push_back(Colour("#B0EBF5"));
+
+ colours.push_back(Colour("#B4DAE0"));
+
+ colours.push_back(Colour("#A3BBBF"));
+
+ colours.push_back(Colour("#889B9E"));
+
+
+ CustomisedPointsList points;
+ std::set<string> request;
+
+ const Transformation& transformation = visitor.transformation();
+
+ data.customisedPoints(transformation, request, points, true); // we want all the points!
+
+
+ if (points.empty()) return;
+
+
+
+ if ( points.size() < 2 ) return;
+
+
+ for (CustomisedPointsList::const_iterator point = points.begin(); point != points.end(); ++point) {
+
+
+ double x = (**point)["step"];
+ double width = (3600*3);
+
+ double max = ((*point)->find("max") != (*point)->end()) ? (*point)->find("max")->second : (*point)->find("maximum")->second;
+ double min = ((*point)->find("min") != (*point)->end()) ? (*point)->find("min")->second : (*point)->find("minimum")->second;
+
+
+ CustomisedPoint::const_iterator ten = (*point)->find("ten");
+ CustomisedPoint::const_iterator ninty = (*point)->find("ninety");
+
+
+ vector<double> eps;
+ eps.push_back( (**point)["min"]);
+ eps.push_back( (**point)["ten"]);
+ eps.push_back( (**point)["twenty_five"]);
+ eps.push_back( (**point)["median"]);
+ eps.push_back( (**point)["seventy_five"]);
+ eps.push_back( (**point)["ninety"]);
+ eps.push_back( (**point)["max"]);
+
+ std::sort(eps.begin(), eps.end());
+
+ for (vector<double>::iterator e = eps.begin(); e != eps.end(); ++e) {
+ if ( same(*e, 0) )
+ *e = 0;
+ cout << *e << " ";
+ }
+ cout << endl;
+
+ double epsmin, eps10, eps25, eps50, eps75, eps90, epsmax;
+ if ( ninty != (*point)->end() ) {
+ epsmin = eps[0];
+ eps10 = eps[1];
+ eps25 = eps[2];
+ eps50 = eps[3];
+ eps75 = eps[4];
+ eps90 = eps[5];
+ epsmax = eps[6];
+ }
+ else {
+ epsmin = eps[0];
+ eps25 = eps[1];
+ eps50 = eps[2];
+ eps75 = eps[3];
+ epsmax = eps[4];
+ }
+
+ if ( epsmax == 0 )
+ continue;
+
+ map<double, float> lights;
+
+ lights[epsmin] = 0;
+ lights[eps10] = 0.20;
+ lights[eps25] = 0.50;
+
+
+ float y = 1.;
+ float height = 1./(colours.size()*4);
+
+ for ( vector<Colour>::iterator colour = colours.begin(); colour != colours.end(); ++colour) {
+ cout << x << " " << x + width << endl;
+ for (int i = 0; i < 4; i++ ) {
+ Polyline* box = new Polyline();
+ box->setColour(*colour);
+ box->setFilled(true);
+ box->setFillColour(*colour);
+/*
+ Hsl hsl = colour->hsl();
+ float light = hsl.light_;
+ hsl.light_ += (0.99 - light)*((point["total"]- point[direction.first])/point["total"]);
+*/
+ box->setShading(new FillShadingProperties());
+ box->push_back(PaperPoint(x+width, y));
+ box->push_back(PaperPoint(x-width, y));
+
+ box->push_back(PaperPoint(x-width, y-height));
+ box->push_back(PaperPoint(x+width, y-height));
+ box->push_back(PaperPoint(x+width, y));
+ y -= height;
+ transformation(*box, visitor);
+ }
+ }
+ }
+
+}
+
+void EpsLight::visit(LegendVisitor& legend)
+{
+
+}
+
void EpsGraph::visit(LegendVisitor& legend)
{
@@ -1698,14 +1841,14 @@ void EpsWave::operator()(Data& data, BasicGraphicsObjectContainer& visitor)
}
// Draw the Forecast
- if ( (*point)->find("forecast") != (*point)->end() ) {
+ if ( (*point)->find("hres") != (*point)->end() ) {
Polyline* hres = new Polyline();
hres->setColour(Colour("blue"));
hres->setThickness(2);
hres->setLineStyle(M_SOLID);
- double angle = (**point)["forecast"]-180;
+ double angle = (**point)["hres"]-180;
hres->push_back(PaperPoint(x , 0));
hres->push_back(PaperPoint(x +(l100 * sin(angle*(3.14/180.))), l100 * cos(angle*(3.14/180.))));
visitor.push_back(hres);
@@ -2038,13 +2181,13 @@ void EpsShade::operator()(Data& data, BasicGraphicsObjectContainer& visitor)
- CustomisedPoint::const_iterator y1 = (*point)->find("1");
- CustomisedPoint::const_iterator y10 = (*point)->find("10");
- CustomisedPoint::const_iterator y90 = (*point)->find("90");
- CustomisedPoint::const_iterator y99 = (*point)->find("99");
- CustomisedPoint::const_iterator y50 = (*point)->find("50");
- CustomisedPoint::const_iterator y25 = (*point)->find("25");
- CustomisedPoint::const_iterator y75 = (*point)->find("75");
+ CustomisedPoint::const_iterator y1 = (*point)->find("one");
+ CustomisedPoint::const_iterator y10 = (*point)->find("ten");
+ CustomisedPoint::const_iterator y90 = (*point)->find("ninety");
+ CustomisedPoint::const_iterator y99 = (*point)->find("ninety_nine");
+ CustomisedPoint::const_iterator y50 = (*point)->find("fifty");
+ CustomisedPoint::const_iterator y25 = (*point)->find("twenty_five");
+ CustomisedPoint::const_iterator y75 = (*point)->find("seventy_five");
if ( (**point)["tmin"] ) {
tenmin.push_back(PaperPoint(x, y10->second));
@@ -2562,7 +2705,7 @@ void EpsPlume::timeserie(Data& data, BasicGraphicsObjectContainer& visitor)
}
if ( forecast_ ) {
- if ( value->first == "forecast" && value->second != missing )
+ if ( value->first == "hres" && value->second != missing )
forecast->push_back(PaperPoint(x, value->second));
}
if ( control_ ) {
@@ -2672,7 +2815,7 @@ void EpsPlume::verticalprofile(Data& data, BasicGraphicsObjectContainer& visitor
(iline->second)->push_back(transformation(UserPoint(value->second, y)));
}
- if ( value->first == "forecast" )
+ if ( value->first == "hres" )
forecast->push_back(transformation(UserPoint(value->second, y)));
if ( value->first == "control" )
control->push_back(transformation(UserPoint(value->second, y)));
diff --git a/src/visualisers/EpsGraph.h b/src/visualisers/EpsGraph.h
index 5860774..4f8e2bd 100644
--- a/src/visualisers/EpsGraph.h
+++ b/src/visualisers/EpsGraph.h
@@ -86,6 +86,42 @@ private:
};
+
+class EpsLight: public Visdef {
+
+
+
+public:
+ EpsLight() {}
+ virtual ~EpsLight() {}
+ // Implements the set method ...
+ void set(const map<string, string>& map ) { }
+ void set(const XmlNode&) { }
+
+
+ void operator()(Data&, BasicGraphicsObjectContainer&);
+ void visit(LegendVisitor&);
+
+
+protected:
+ //! Method to print string about this class on to a stream of type ostream (virtual).
+ virtual void print(ostream&) const;
+
+
+private:
+ //! Copy constructor - No copy allowed
+ EpsLight(const EpsLight&);
+ //! Overloaded << operator to copy - No copy allowed
+ EpsLight& operator=(const EpsLight&);
+
+// -- Friends
+ //! Overloaded << operator to call print().
+ friend ostream& operator<<(ostream& s,const EpsLight& p)
+ { p.print(s); return s; }
+
+};
+
+
class EpsWind: public Visdef, public EpsWindAttributes {
diff --git a/src/visualisers/GridPlotting.cc b/src/visualisers/GridPlotting.cc
index 8c9d8c7..3b326ae 100644
--- a/src/visualisers/GridPlotting.cc
+++ b/src/visualisers/GridPlotting.cc
@@ -68,7 +68,10 @@ void NoGridPlotting::latitudes(vector<double>& lats, int freq) const
for(double lat = latReference_; lat > min; lat -= latIncrement_)
{
if ( i % freq == 0) {
- lats.push_back(lat);
+ if ( lat < -90 )
+ lats.push_back(180. + lat);
+ else
+ lats.push_back(lat);
}
i++;
@@ -119,7 +122,10 @@ const vector<double>& NoGridPlotting::latitudes(const Transformation& transforma
{
for(double lat = latReference_; lat > min; lat -=latIncrement_)
{
- latitudes_.push_back(lat);
+ if ( lat < -90 )
+ latitudes_.push_back(180. - lat);
+ else
+ latitudes_.push_back(lat);
}
for(double lat = latReference_ + latIncrement_; lat < max; lat += latIncrement_)
{
diff --git a/src/web/WrepJSon.cc b/src/web/WrepJSon.cc
index ff70012..8ae816d 100644
--- a/src/web/WrepJSon.cc
+++ b/src/web/WrepJSon.cc
@@ -27,23 +27,28 @@ static map<char, string> specials;
WrepJSon::WrepJSon() : missing_(-9999),
height_(-9999),
mask_(9999),
- latitude_(0), station_longitude_(9999), longitude_(0)
+ latitude_(0), station_longitude_(9999), longitude_(0), api_("v0")
{
methods_["date"] = &WrepJSon::date;
methods_["time"] = &WrepJSon::time;
methods_["expver"] = &WrepJSon::expver;
methods_["eps_height"] = &WrepJSon::epsz;
+ methods_["ens_height"] = &WrepJSon::epsz;
methods_["height"] = &WrepJSon::height;
methods_["deterministic_height"] = &WrepJSon::detz;
+ methods_["hres_height"] = &WrepJSon::detz;
methods_["tracker"] = &WrepJSon::ignore;
methods_["missing"] = &WrepJSon::missing;
methods_["location"] = &WrepJSon::location;
+ methods_["ens_location"] = &WrepJSon::location;
methods_["station_name"] = &WrepJSon::station_name;
methods_["requested_location"] = &WrepJSon::station;
+ methods_["user_location"] = &WrepJSon::station;
methods_["land_sea_mask"] = &WrepJSon::mask;
methods_["metadata"] = &WrepJSon::metadata;
methods_["points_along_meridian"] = &WrepJSon::points_along_meridian;
methods_["valid_time"] = &WrepJSon::valid_time;
+ methods_["api_version"] = &WrepJSon::api;
methods_["x_values"] = &WrepJSon::x_values;
methods_["x_date_values"] = &WrepJSon::x_date_values;
@@ -52,17 +57,21 @@ WrepJSon::WrepJSon() : missing_(-9999),
methods_["values"] = &WrepJSon::values;
decoders_["eps"] = &WrepJSon::eps;
+ decoders_["clim"] = &WrepJSon::eps;
decoders_["profile"] = &WrepJSon::profile;
decoders_["efi"] = &WrepJSon::efi;
decoders_["cdf"] = &WrepJSon::cdf;
decoders_["basic"] = &WrepJSon::basic;
decoders_["data"] = &WrepJSon::data;
+
+
transformationHandlers_["eps"] = &WrepJSon::eps;
transformationHandlers_["cdf"] = &WrepJSon::cdf;
transformationHandlers_["efi"] = &WrepJSon::efi;
transformationHandlers_["profile"] = &WrepJSon::profile;
+ heightCorrections_["hres"] = &WrepJSon::correctDetz;
heightCorrections_["forecast"] = &WrepJSon::correctDetz;
metaMethods_["temperature_correction"] = &WrepJSon::temperature_correction;
@@ -72,6 +81,7 @@ WrepJSon::WrepJSon() : missing_(-9999),
metaMethods_["station_name"] = &WrepJSon::station_name;
metaMethods_["height"] = &WrepJSon::height;
+
minx_ = std::numeric_limits<double>::max();
maxx_ = -std::numeric_limits<double>::max();
miny_ = std::numeric_limits<double>::max();
@@ -230,28 +240,65 @@ void WrepJSon::profile(Transformation& transformation)
{
transformation.setDataMinMaxX(minx_, maxx_);
+ transformation.setDataMinMaxY(miny_, maxy_);
+}
- transformation.setDataMinMaxY(miny_, maxy_);
+string binding(const string& version, const string& key) {
+ static map<string, map<string, string> > bindings;
+ if ( bindings.empty() ) {
+ bindings["v0"] = map<string, string>();
+ bindings["v0"].insert(make_pair("ninty", "ninety"));
+ bindings["v0"].insert(make_pair("twentyfive", "twenty_five"));
+ bindings["v0"].insert(make_pair("seventyfive", "seventy_five"));
+ bindings["v0"].insert(make_pair("forecast", "hres"));
+ bindings["v0"].insert(make_pair("lat", "latitude"));
+ bindings["v0"].insert(make_pair("lon", "longitude"));
+ bindings["v0"].insert(make_pair("longitude", "lon"));
+ bindings["v0"].insert(make_pair("latitude", "lat"));
+ bindings["v0"].insert(make_pair("1", "one"));
+ bindings["v0"].insert(make_pair("10", "ten"));
+ bindings["v0"].insert(make_pair("99", "ninety_nine"));
+ bindings["v0"].insert(make_pair("90", "ninety"));
+ bindings["v0"].insert(make_pair("25", "twenty_five"));
+ bindings["v0"].insert(make_pair("75", "seventy_five"));
+ bindings["v0"].insert(make_pair("50", "fifty"));
+
+ }
+ map<string, map<string, string> >::iterator bind = bindings.find(version);
+ if ( bind == bindings.end() )
+ return key;
+
+ map<string, string>::iterator value = bind->second.find(key);
+ if ( value == bind->second.end() )
+ return key;
+
+ return value->second;
+
}
+
void WrepJSon::eps(Transformation& transformation)
{
- if ( keyword_ != "clim" ) {
+
+ cout << "API--->" << api_ << endl;
+ if ( keyword_ != "clim" ) {
transformation.setDataMinMaxX(minx_ * 3600, maxx_ * 3600, base_);
}
vector<double> maxs;
vector<double> allvalues;
+
+
for (vector<CustomisedPoint*>::iterator point = points_.begin(); point != points_.end(); ++point) {
maxs.push_back((**point)["max"]);
- allvalues.push_back((**point)["seventyfive"]);
- allvalues.push_back((**point)["ninty"]);
+ allvalues.push_back((**point)["seventy_five"]);
+ allvalues.push_back((**point)["ninety"]);
if ( (*point)->find("forecast") != (*point)->end() ) {
- allvalues.push_back((**point)["forecast"]);
- maxs.push_back((**point)["forecast"]);
+ allvalues.push_back((**point)["hres"]);
+ maxs.push_back((**point)["hres"]);
}
if ( (*point)->find("control") != (*point)->end() ) {
allvalues.push_back((**point)["control"]);
@@ -318,11 +365,19 @@ void WrepJSon::decode()
}
void WrepJSon::eps()
{
+ map<string, string> more;
+ more["eps"] = "ens";
+ more["clim"] = "climate";
+
if ( !points_.empty()) return;
shift_ = 12;
methods_[param_] = &WrepJSon::parameter;
methods_[keyword_] = &WrepJSon::dig;
+ methods_[more[keyword_]] = &WrepJSon::dig;
+
+
+
scaling_factor_ = param_scaling_factor_;
offset_factor_ = param_offset_factor_;
@@ -396,10 +451,11 @@ void WrepJSon::eps()
map<string, vector<double> >& values = values_.values_;
for ( map<string, vector<double> >::iterator val = values.begin(); val != values.end(); ++val ) {
- if ( val->first=="forecast" )
- (*point)[val->first] = correctDetz((val->second)[i]);
+ string key = binding(api_, val->first);
+ if ( key == "hres" )
+ (*point)[key] = correctDetz((val->second)[i]);
else
- (*point)[val->first] = correctEpsz((val->second)[i]);
+ (*point)[key] = correctEpsz((val->second)[i]);
}
points_.push_back(point);
@@ -548,14 +604,16 @@ void WrepJSon::basic()
map<string, Method >::iterator method = methods_.find(entry->name_);
if ( method != methods_.end() ) {
( (this->*method->second)(entry->value_) );
- }
+ }
+ else
+ cout << entry->name_ << endl;
}
}
catch (std::exception e)
{
MagLog::error() << "Could not processed the file: " << file_ << ": " << e.what() << endl;
- abort();
+ //abort();
}
}
void WrepJSon::print(ostream& out) const
@@ -574,8 +632,8 @@ void WrepJSon::station(const json_spirit::Value& value )
{
ASSERT( value.type() == obj_type );
Object location = value.get_value<Object>();
- const json_spirit::Value lat = find_value(location, "lat");
- const json_spirit::Value lon = find_value(location, "lon");
+ const json_spirit::Value lat = find_value(location, binding(api_, "latitude"));
+ const json_spirit::Value lon = find_value(location, binding(api_, "longitude"));
station_latitude_=lat.get_value<double>();
station_longitude_=lon.get_value<double>();
@@ -589,8 +647,8 @@ void WrepJSon::location(const json_spirit::Value& value )
ASSERT( value.type() == obj_type );
Object location = value.get_value<Object>();
- const json_spirit::Value lat = find_value(location, "lat");
- const json_spirit::Value lon = find_value(location, "lon");
+ const json_spirit::Value lat = find_value(location, binding(api_, "latitude"));
+ const json_spirit::Value lon = find_value(location, binding(api_, "longitude"));
latitude_=lat.get_value<double>();
longitude_=lon.get_value<double>();
MagLog::dev() << "found -> lat= " << latitude_ << endl;
@@ -664,6 +722,15 @@ void WrepJSon::expver(const json_spirit::Value& value)
expver_ = value.get_value<string>();
}
+void WrepJSon::api(const json_spirit::Value& value)
+{
+
+ ASSERT( value.type() == str_type);
+ MagLog::dev() << "found -> api= " << value.get_value<string>() << endl;
+ api_ = value.get_value<string>();
+
+}
+
void WrepJSon::time(const json_spirit::Value& value)
{
@@ -1100,7 +1167,7 @@ void WrepJSon::points_along_meridian(const json_spirit::Value& value)
{
ASSERT( value.type() == int_type);
points_along_meridian_ = value.get_value< int>();
- MagLog::dev() << "found -> points_along_meridian_mask= " << mask_ << endl;
+ MagLog::dev() << "found -> points_along_meridian " << points_along_meridian_ << endl;
}
void WrepJSon::x_values(const json_spirit::Value& value)
diff --git a/src/web/WrepJSon.h b/src/web/WrepJSon.h
index 293158e..b8454f3 100644
--- a/src/web/WrepJSon.h
+++ b/src/web/WrepJSon.h
@@ -114,6 +114,7 @@ public:
void expver(const json_spirit::Value&);
void height(const json_spirit::Value&);
void time(const json_spirit::Value&);
+ void api(const json_spirit::Value&);
virtual void parameter(const json_spirit::Value&);
virtual void eps(const json_spirit::Value&);
@@ -127,6 +128,7 @@ public:
void metadata(const json_spirit::Value&);
void temperature_correction(const json_spirit::Value&);
void points_along_meridian(const json_spirit::Value&);
+
json_spirit::Value temperature_correction();
json_spirit::Value temperature_adjustment();
@@ -188,7 +190,8 @@ protected:
string time_;
string file_;
string valid_time_;
- string expver_;
+ string expver_;
+ string api_;
json_spirit::Value metadata_;
InputWrep values_;
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 28682b1..6723b87 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,3 +1,9 @@
+
+
+set( grib_environment
+ GRIB_DEFINITION_PATH=${grib_api_BASE_DIR}/share/${grib_handling_pkg}/definitions
+ GRIB_SAMPLES_PATH=${grib_api_BASE_DIR}/share/${grib_handling_pkg}/samples )
+
# Basic test
ecbuild_add_test( TARGET basic_c
SOURCES coast.c
@@ -60,7 +66,8 @@ ecbuild_add_test( TARGET grib_python
RESOURCES grib.py data.grib
ENVIRONMENT PYTHONPATH=${MAG_PYTHON_PATH}
LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib
- MAGPLUS_HOME=${CMAKE_CURRENT_SOURCE_DIR}/.. )
+ MAGPLUS_HOME=${CMAKE_CURRENT_SOURCE_DIR}/..
+ ${grib_environment} )
ecbuild_add_test( TARGET grib_fortran
SOURCES grib.f90
@@ -68,7 +75,9 @@ ecbuild_add_test( TARGET grib_fortran
RESOURCES data.grib
CONDITION HAVE_GRIB AND HAVE_FORTRAN
ENVIRONMENT MAGPLUS_HOME=${CMAKE_CURRENT_SOURCE_DIR}/..
- LINKER_LANGUAGE Fortran )
+ ${grib_environment}
+ LINKER_LANGUAGE Fortran
+ )
ecbuild_add_test( TARGET cairo_python
TYPE PYTHON
diff --git a/tools/axis2doc.py b/tools/axis2doc.py
index 31f393f..2ca4b0d 100644
--- a/tools/axis2doc.py
+++ b/tools/axis2doc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# (C) Copyright 1996-2016 ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
diff --git a/tools/newbase.pl b/tools/newbase.pl
index 77fcd1f..cd9f3c2 100755
--- a/tools/newbase.pl
+++ b/tools/newbase.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# (C) Copyright 1996-2016 ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
diff --git a/tools/newclass.pl b/tools/newclass.pl
index 75b3b58..0a86174 100755
--- a/tools/newclass.pl
+++ b/tools/newclass.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# (C) Copyright 1996-2016 ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
diff --git a/tools/newdriver.pl b/tools/newdriver.pl
index 3975b4e..e8a6450 100755
--- a/tools/newdriver.pl
+++ b/tools/newdriver.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# (C) Copyright 1996-2016 ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
diff --git a/tools/newfactory.pl b/tools/newfactory.pl
index 6b26169..fad77ad 100755
--- a/tools/newfactory.pl
+++ b/tools/newfactory.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# (C) Copyright 1996-2016 ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
diff --git a/tools/newprojection.pl b/tools/newprojection.pl
index b9b67d4..8ddec79 100755
--- a/tools/newprojection.pl
+++ b/tools/newprojection.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# (C) Copyright 1996-2016 ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
diff --git a/tools/newtemplate.pl b/tools/newtemplate.pl
index 1f2fb31..33176bd 100755
--- a/tools/newtemplate.pl
+++ b/tools/newtemplate.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# (C) Copyright 1996-2016 ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
diff --git a/tools/xml2cc.pl b/tools/xml2cc.pl
index 59bc00d..6b918dc 100755
--- a/tools/xml2cc.pl
+++ b/tools/xml2cc.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# (C) Copyright 1996-2016 ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
diff --git a/tools/xml2cc.pl.workshop b/tools/xml2cc.pl.workshop
index 1039af4..f7fd5ab 100644
--- a/tools/xml2cc.pl.workshop
+++ b/tools/xml2cc.pl.workshop
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
use XML::Parser;
diff --git a/tools/xml2cc_list.pl b/tools/xml2cc_list.pl
index 8536ab1..ff1e75f 100755
--- a/tools/xml2cc_list.pl
+++ b/tools/xml2cc_list.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# (C) Copyright 1996-2016 ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
diff --git a/tools/xml2doc.pl b/tools/xml2doc.pl
index 15aae3b..5924fc8 100755
--- a/tools/xml2doc.pl
+++ b/tools/xml2doc.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# (C) Copyright 1996-2016 ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
diff --git a/tools/xml2dtd.pl b/tools/xml2dtd.pl
index 8be0915..3db015f 100755
--- a/tools/xml2dtd.pl
+++ b/tools/xml2dtd.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# (C) Copyright 1996-2016 ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
diff --git a/tools/xml2html.py b/tools/xml2html.py
index 462f575..ff8f97b 100644
--- a/tools/xml2html.py
+++ b/tools/xml2html.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# (C) Copyright 1996-2016 ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
diff --git a/tools/xml2icon.pl b/tools/xml2icon.pl
index 2fc648a..6fadc88 100755
--- a/tools/xml2icon.pl
+++ b/tools/xml2icon.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# (C) Copyright 1996-2016 ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
diff --git a/tools/xml2mv.pl b/tools/xml2mv.pl
index f16dc58..474981a 100755
--- a/tools/xml2mv.pl
+++ b/tools/xml2mv.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# (C) Copyright 1996-2016 ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
diff --git a/tools/xml2mv.py b/tools/xml2mv.py
index 863faf3..c8ced45 100755
--- a/tools/xml2mv.py
+++ b/tools/xml2mv.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# (C) Copyright 1996-2016 ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
diff --git a/tools/xml2odt.py b/tools/xml2odt.py
index d4dd609..740ed62 100644
--- a/tools/xml2odt.py
+++ b/tools/xml2odt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# (C) Copyright 1996-2016 ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git
More information about the debian-science-commits
mailing list