Commit 247f3a60 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

merged changes from trunk

parents a56ea559 e1b4fdc2
CDI NEWS
--------
Version 1.6.8 (26 March 2015):
Fixed bugs:
* cdfCopyRecord: incorrect checksum for freed object [Bug #5461]
* scan netcdf time units attribute
* fixed rounding error for negativ timevalue
* time unit second rounding error
Version 1.6.7 (5 December 2014):
Fixed bugs:
......
......@@ -2,11 +2,15 @@
#define _GRIBAPI_H
#ifdef HAVE_LIBGRIB_API
# include "error.h"
# include <grib_api.h>
#include <grib_api.h>
#ifndef _ERROR_H
#include "error.h"
#endif
#endif
#ifndef _CDI_INT_H
#include "cdi_int.h"
#endif
#define GRIBAPI_MISSVAL -9.E33
......
......@@ -2,7 +2,9 @@
#define _GRID_H
#include "cdi.h"
#ifndef RESOURCE_HANDLE_H
#include "resource_handle.h"
#endif
typedef unsigned char mask_t;
......
......@@ -8,8 +8,12 @@
#include <string.h>
#include "cdi.h"
#ifndef CDI_CKSUM_H_
#include "cdi_cksum.h"
#endif
#ifndef _ERROR_H
#include "error.h"
#endif
/*
* Generic interfaces for (de-)marshalling
......
#ifndef STREAM_FCOMMON_H
#define STREAM_FCOMMON_H
#ifndef _CDI_INT_H
#include "cdi_int.h"
#endif
enum {
SINGLE_PRECISION = 4,
......
#ifndef _STREAM_GRIBAPI_H
#define _STREAM_GRIBAPI_H
#ifndef _CDI_INT_H
#include "cdi_int.h"
#endif
int gribapiScanTimestep1(stream_t * streamptr);
int gribapiScanTimestep2(stream_t * streamptr);
......
......@@ -5,12 +5,14 @@
#include "config.h"
#endif
#ifndef _ERROR_H
#include "error.h"
#endif
#include <stddef.h> /* size_t */
#ifndef _CDI_LIMITS_H
# include "cdi_limits.h"
#include "cdi_limits.h"
#endif
#define VALIDMISS 1.e+303
......
......@@ -147,7 +147,7 @@
191 | sclf0 | SW top cloud forcing (178-187) | W m-2
192 | tclf0 | LW top cloud forcing (179-188) | W m-2
193 | wl | skin reservoir content | m
194 | slf | sea land fraction
194 | slf | sea land fraction |
195 | ustrgw | u-gravity wave stress | Pa
196 | vstrgw | v-gravity wave stress | Pa
197 | vdisgw | gravity wave dissipation | W m-2
......
......@@ -10,7 +10,7 @@ TESTS = cksum_verify \
test_resource_copy pio_write_deco2d_run \
test_f2003 test_cdf_transformation
check_PROGRAMS = cksum_verify test_grib cksum_write cksum_read pio_write \
test_resource_copy cksum_write_chunk pio_write_deco2d testprog_input_file
test_resource_copy cksum_write_chunk pio_write_deco2d
if ENABLE_NETCDF
check_PROGRAMS += test_cdf_write test_cdf_read
......@@ -34,7 +34,6 @@ test_resource_copy_LDADD = $(UUID_C_LIB) ../src/libcdiresunpack.la $(LDADD)
test_resource_copy_mpi_SOURCES = test_resource_copy.c
test_cdf_write_SOURCES = test_cdf_write.c
test_cdf_read_SOURCES = test_cdf_read.c
testprog_input_file_SOURCES = testprog_input_file.c
#
AM_CFLAGS = $(PPM_CORE_CFLAGS) $(YAXT_CFLAGS) $(MPI_C_INCLUDE)
if USE_MPI
......
......@@ -87,8 +87,7 @@ TESTS = cksum_verify$(EXEEXT) test_cksum_grib test_cksum_nc \
check_PROGRAMS = cksum_verify$(EXEEXT) test_grib$(EXEEXT) \
cksum_write$(EXEEXT) cksum_read$(EXEEXT) pio_write$(EXEEXT) \
test_resource_copy$(EXEEXT) cksum_write_chunk$(EXEEXT) \
pio_write_deco2d$(EXEEXT) testprog_input_file$(EXEEXT) \
$(am__EXEEXT_1) $(am__EXEEXT_2)
pio_write_deco2d$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2)
@ENABLE_NETCDF_TRUE@am__append_1 = test_cdf_write test_cdf_read
@USE_MPI_TRUE@am__append_2 = test_resource_copy_mpi_run
@USE_MPI_TRUE@am__append_3 = test_resource_copy_mpi
......@@ -211,10 +210,6 @@ test_resource_copy_mpi_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(test_resource_copy_mpi_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
am_testprog_input_file_OBJECTS = testprog_input_file.$(OBJEXT)
testprog_input_file_OBJECTS = $(am_testprog_input_file_OBJECTS)
testprog_input_file_LDADD = $(LDADD)
testprog_input_file_DEPENDENCIES = ../src/libcdi.la
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
......@@ -254,15 +249,13 @@ SOURCES = $(cksum_read_SOURCES) $(cksum_verify_SOURCES) \
$(pio_write_SOURCES) $(pio_write_deco2d_SOURCES) \
$(test_cdf_read_SOURCES) $(test_cdf_write_SOURCES) \
$(test_grib_SOURCES) $(test_resource_copy_SOURCES) \
$(test_resource_copy_mpi_SOURCES) \
$(testprog_input_file_SOURCES)
$(test_resource_copy_mpi_SOURCES)
DIST_SOURCES = $(cksum_read_SOURCES) $(cksum_verify_SOURCES) \
$(cksum_write_SOURCES) $(cksum_write_chunk_SOURCES) \
$(pio_write_SOURCES) $(pio_write_deco2d_SOURCES) \
$(test_cdf_read_SOURCES) $(test_cdf_write_SOURCES) \
$(test_grib_SOURCES) $(test_resource_copy_SOURCES) \
$(test_resource_copy_mpi_SOURCES) \
$(testprog_input_file_SOURCES)
$(test_resource_copy_mpi_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
......@@ -525,7 +518,6 @@ test_resource_copy_LDADD = $(UUID_C_LIB) ../src/libcdiresunpack.la $(LDADD)
test_resource_copy_mpi_SOURCES = test_resource_copy.c
test_cdf_write_SOURCES = test_cdf_write.c
test_cdf_read_SOURCES = test_cdf_read.c
testprog_input_file_SOURCES = testprog_input_file.c
#
AM_CFLAGS = $(PPM_CORE_CFLAGS) $(YAXT_CFLAGS) $(MPI_C_INCLUDE)
@USE_MPI_FALSE@pio_write_LDADD = $(LDADD) $(UUID_C_LIB)
......@@ -669,10 +661,6 @@ test_resource_copy_mpi$(EXEEXT): $(test_resource_copy_mpi_OBJECTS) $(test_resour
@rm -f test_resource_copy_mpi$(EXEEXT)
$(AM_V_CCLD)$(test_resource_copy_mpi_LINK) $(test_resource_copy_mpi_OBJECTS) $(test_resource_copy_mpi_LDADD) $(LIBS)
testprog_input_file$(EXEEXT): $(testprog_input_file_OBJECTS) $(testprog_input_file_DEPENDENCIES) $(EXTRA_testprog_input_file_DEPENDENCIES)
@rm -f testprog_input_file$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(testprog_input_file_OBJECTS) $(testprog_input_file_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
......@@ -694,7 +682,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_grib.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_resource_copy.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_resource_copy_mpi-test_resource_copy.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testprog_input_file.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/var_cksum.Po@am__quote@
.c.o:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment