Commit ac34ad17 authored by Oliver Heidmann's avatar Oliver Heidmann
Browse files

Merge branch 'develop' of git.mpimet.mpg.de:cdo into develop

parents 04cb6434 98b03ef0
...@@ -104,33 +104,33 @@ CONFIG_CLEAN_VPATH_FILES = ...@@ -104,33 +104,33 @@ CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES) LTLIBRARIES = $(noinst_LTLIBRARIES)
libcdo_la_LIBADD = libcdo_la_LIBADD =
am__dirstamp = $(am__leading_dot)dirstamp am__dirstamp = $(am__leading_dot)dirstamp
am_libcdo_la_OBJECTS = libcdo_la-array.lo libcdo_la-cdo_pthread.lo \ am_libcdo_la_OBJECTS = libcdo_la-argument.lo libcdo_la-array.lo \
libcdo_la-cdo_vlist.lo libcdo_la-cdo_getopt.lo \ libcdo_la-cdo_pthread.lo libcdo_la-cdo_vlist.lo \
libcdo_la-cdo_task.lo libcdo_la-cdo_history.lo \ libcdo_la-cdo_getopt.lo libcdo_la-cdo_task.lo \
libcdo_la-cdo_read.lo libcdo_la-cmortable_parser.lo \ libcdo_la-cdo_history.lo libcdo_la-cdo_read.lo \
libcdo_la-after_sptrans.lo libcdo_la-after_fctrans.lo \ libcdo_la-cmortable_parser.lo libcdo_la-after_sptrans.lo \
libcdo_la-after_dvtrans.lo libcdo_la-after_vertint.lo \ libcdo_la-after_fctrans.lo libcdo_la-after_dvtrans.lo \
libcdo_la-after_namelist.lo libcdo_la-afterburnerlib.lo \ libcdo_la-after_vertint.lo libcdo_la-after_namelist.lo \
libcdo_la-constants.lo libcdo_la-color.lo \ libcdo_la-afterburnerlib.lo libcdo_la-constants.lo \
libcdo_la-commandline.lo libcdo_la-convert_units.lo \ libcdo_la-color.lo libcdo_la-commandline.lo \
libcdo_la-datetime.lo libcdo_la-ecacore.lo \ libcdo_la-convert_units.lo libcdo_la-datetime.lo \
libcdo_la-ecautil.lo libcdo_la-exception.lo libcdo_la-expr.lo \ libcdo_la-ecacore.lo libcdo_la-ecautil.lo \
libcdo_la-expr_fun.lo libcdo_la-expr_lex.lo \ libcdo_la-exception.lo libcdo_la-expr.lo libcdo_la-expr_fun.lo \
libcdo_la-expr_yacc.lo libcdo_la-features.lo \ libcdo_la-expr_lex.lo libcdo_la-expr_yacc.lo \
libcdo_la-field.lo libcdo_la-field2.lo libcdo_la-fieldc.lo \ libcdo_la-features.lo libcdo_la-field.lo libcdo_la-field2.lo \
libcdo_la-fieldmem.lo libcdo_la-fieldmer.lo \ libcdo_la-fieldc.lo libcdo_la-fieldmem.lo \
libcdo_la-fieldzon.lo libcdo_la-gradsdeslib.lo \ libcdo_la-fieldmer.lo libcdo_la-fieldzon.lo \
libcdo_la-grid.lo libcdo_la-grid_proj.lo \ libcdo_la-gradsdeslib.lo libcdo_la-grid.lo \
libcdo_la-grid_area.lo libcdo_la-grid_define.lo \ libcdo_la-grid_proj.lo libcdo_la-grid_area.lo \
libcdo_la-grid_gme.lo libcdo_la-grid_rot.lo \ libcdo_la-grid_define.lo libcdo_la-grid_gme.lo \
libcdo_la-grid_from_name.lo libcdo_la-grid_read.lo \ libcdo_la-grid_rot.lo libcdo_la-grid_from_name.lo \
libcdo_la-grid_read_pingo.lo libcdo_la-grid_print.lo \ libcdo_la-grid_read.lo libcdo_la-grid_read_pingo.lo \
libcdo_la-gridreference.lo libcdo_la-griddes.lo \ libcdo_la-grid_print.lo libcdo_la-gridreference.lo \
libcdo_la-griddes_h5.lo libcdo_la-griddes_nc.lo \ libcdo_la-griddes.lo libcdo_la-griddes_h5.lo \
libcdo_la-hetaeta.lo libcdo_la-institution.lo \ libcdo_la-griddes_nc.lo libcdo_la-hetaeta.lo \
libcdo_la-interpol.lo libcdo_la-job.lo libcdo_la-juldate.lo \ libcdo_la-institution.lo libcdo_la-interpol.lo \
libcdo_la-grid_search.lo libcdo_la-listarray.lo \ libcdo_la-job.lo libcdo_la-juldate.lo libcdo_la-grid_search.lo \
libcdo_la-list.lo libcdo_la-listbuf.lo \ libcdo_la-listarray.lo libcdo_la-list.lo libcdo_la-listbuf.lo \
libcdo_la-merge_sort2.lo libcdo_la-modules.lo \ libcdo_la-merge_sort2.lo libcdo_la-modules.lo \
libcdo_la-namelist.lo libcdo_la-namelist_parser.lo \ libcdo_la-namelist.lo libcdo_la-namelist_parser.lo \
libcdo_la-normal.lo libcdo_la-nth_element.lo \ libcdo_la-normal.lo libcdo_la-nth_element.lo \
...@@ -532,21 +532,21 @@ top_build_prefix = @top_build_prefix@ ...@@ -532,21 +532,21 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libcdo.la noinst_LTLIBRARIES = libcdo.la
libcdo_la_SOURCES = array.h array.cc cdo_int.h compare.h \ libcdo_la_SOURCES = argument.h argument.cc array.h array.cc cdo_int.h \
cdo_pthread.cc cdo_vlist.cc cdo_getopt.cc cdo_getopt.h \ compare.h cdo_pthread.cc cdo_vlist.cc cdo_getopt.cc \
cdo_task.cc cdo_task.h cdo_history.cc cdo_read.cc cdi_uuid.h \ cdo_getopt.h cdo_task.cc cdo_task.h cdo_history.cc cdo_read.cc \
cmortable_parser.cc after_sptrans.cc after_fctrans.cc \ cdi_uuid.h cmortable_parser.cc after_sptrans.cc \
after_dvtrans.cc after_vertint.cc after_vertint.h \ after_fctrans.cc after_dvtrans.cc after_vertint.cc \
after_namelist.cc afterburnerlib.cc afterburner.h vct_l191.h \ after_vertint.h after_namelist.cc afterburnerlib.cc \
calendar.h constants.h constants.cc color.cc color.h \ afterburner.h vct_l191.h calendar.h constants.h constants.cc \
commandline.cc const.h convert_units.cc convert_units.h \ color.cc color.h commandline.cc const.h convert_units.cc \
counter.h datetime.cc datetime.h dmemory.h ecacore.cc \ convert_units.h counter.h datetime.cc datetime.h dmemory.h \
ecacore.h ecautil.cc ecautil.h error.h etopo.h temp.h mask.h \ ecacore.cc ecacore.h ecautil.cc ecautil.h error.h etopo.h \
exception.cc expr.cc expr.h expr_fun.cc expr_fun.h expr_lex.cc \ temp.h mask.h exception.cc expr.cc expr.h expr_fun.cc \
expr_yacc.cc expr_yacc.h features.cc field.cc field.h \ expr_fun.h expr_lex.cc expr_yacc.cc expr_yacc.h features.cc \
field2.cc fieldc.cc fieldmem.cc fieldmer.cc fieldzon.cc \ field.cc field.h field2.cc fieldc.cc fieldmem.cc fieldmer.cc \
functs.h gradsdeslib.cc gradsdeslib.h grid.cc grid.h \ fieldzon.cc functs.h gradsdeslib.cc gradsdeslib.h grid.cc \
grid_proj.cc grid_proj.h grid_area.cc grid_define.cc \ grid.h grid_proj.cc grid_proj.h grid_area.cc grid_define.cc \
grid_gme.cc grid_rot.cc grid_from_name.cc grid_read.cc \ grid_gme.cc grid_rot.cc grid_from_name.cc grid_read.cc \
grid_read_pingo.cc grid_print.cc gridreference.cc griddes.cc \ grid_read_pingo.cc grid_print.cc gridreference.cc griddes.cc \
griddes.h griddes_h5.cc griddes_nc.cc hetaeta.cc hetaeta.h \ griddes.h griddes_h5.cc griddes_nc.cc hetaeta.cc hetaeta.h \
...@@ -1048,6 +1048,7 @@ distclean-compile: ...@@ -1048,6 +1048,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdo_la-after_sptrans.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdo_la-after_sptrans.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdo_la-after_vertint.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdo_la-after_vertint.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdo_la-afterburnerlib.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdo_la-afterburnerlib.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdo_la-argument.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdo_la-array.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdo_la-array.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdo_la-cdo_getopt.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdo_la-cdo_getopt.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdo_la-cdo_history.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdo_la-cdo_history.Plo@am__quote@
...@@ -1250,6 +1251,13 @@ clipping/libcdo_la-utils.lo: clipping/utils.c ...@@ -1250,6 +1251,13 @@ clipping/libcdo_la-utils.lo: clipping/utils.c
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
   
libcdo_la-argument.lo: argument.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcdo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libcdo_la-argument.lo -MD -MP -MF $(DEPDIR)/libcdo_la-argument.Tpo -c -o libcdo_la-argument.lo `test -f 'argument.cc' || echo '$(srcdir)/'`argument.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcdo_la-argument.Tpo $(DEPDIR)/libcdo_la-argument.Plo
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='argument.cc' object='libcdo_la-argument.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcdo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libcdo_la-argument.lo `test -f 'argument.cc' || echo '$(srcdir)/'`argument.cc
libcdo_la-array.lo: array.cc libcdo_la-array.lo: array.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcdo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libcdo_la-array.lo -MD -MP -MF $(DEPDIR)/libcdo_la-array.Tpo -c -o libcdo_la-array.lo `test -f 'array.cc' || echo '$(srcdir)/'`array.cc @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcdo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libcdo_la-array.lo -MD -MP -MF $(DEPDIR)/libcdo_la-array.Tpo -c -o libcdo_la-array.lo `test -f 'array.cc' || echo '$(srcdir)/'`array.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcdo_la-array.Tpo $(DEPDIR)/libcdo_la-array.Plo @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcdo_la-array.Tpo $(DEPDIR)/libcdo_la-array.Plo
......
...@@ -251,16 +251,16 @@ void print_xyvals2D(int gridID, int dig) ...@@ -251,16 +251,16 @@ void print_xyvals2D(int gridID, int dig)
} }
} }
fprintf(stdout, "%33s : %.*g to %.*g", xname, dig, xfirst, dig, xlast); fprintf(stdout, "%33s : %.*g", xname, dig, xfirst);
if ( IS_NOT_EQUAL(xinc, 0) ) if ( gridsize > 1 ) fprintf(stdout, " to %.*g", dig, xlast);
fprintf(stdout, " by %.*g", dig, xinc); if ( IS_NOT_EQUAL(xinc, 0) ) fprintf(stdout, " by %.*g", dig, xinc);
fprintf(stdout, " %s", xunits); fprintf(stdout, " %s", xunits);
if ( gridIsCircular(gridID) ) fprintf(stdout, " circular"); if ( gridIsCircular(gridID) ) fprintf(stdout, " circular");
fprintf(stdout, "\n"); fprintf(stdout, "\n");
fprintf(stdout, "%33s : %.*g to %.*g", yname, dig, yfirst, dig, ylast); fprintf(stdout, "%33s : %.*g", yname, dig, yfirst);
if ( IS_NOT_EQUAL(yinc, 0) ) if ( gridsize > 1 ) fprintf(stdout, " to %.*g", dig, ylast);
fprintf(stdout, " by %.*g", dig, yinc); if ( IS_NOT_EQUAL(yinc, 0) ) fprintf(stdout, " by %.*g", dig, yinc);
fprintf(stdout, " %s", xunits); fprintf(stdout, " %s", yunits);
fprintf(stdout, "\n"); fprintf(stdout, "\n");
free(xvals2D); free(xvals2D);
......
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