[pyferret] 107/110: Merge tag 'upstream/7.2' into debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jul 28 08:42:30 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository pyferret.
commit bad6783e342efcc6a4b6818c91b093c7084d80a1
Merge: d40b8d3 2d8f620
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat Jul 22 17:12:56 2017 +0100
Merge tag 'upstream/7.2' into debian/master
README.md | 4 +-
bench/Makefile | 26 +-
bench/RUN_TESTS.sh | 88 +-
bench/TEST_SCRIPTS | 7 +-
bench/TRASH_FILES | 1 +
bench/ansley_official.rhel5_32_err | 258 +-
bench/ansley_official.rhel5_32_log | 1672 +++--
bench/ansley_official.rhel6-64_err | 471 +-
bench/ansley_official.rhel6-64_log | 4356 ++++++++-----
bench/bn710_bug_fixes.jnl | 5 +-
bench/bn720_bug_fixes.jnl | 40 +-
bench/bn_DQ.jnl | 3 +
bench/bn_aggregate_tef.jnl | 3 +-
bench/bn_all.jnl | 7 +-
bench/bn_cache_management.jnl | 3 +-
bench/bn_cancel_axes.jnl | 11 +
bench/bn_color_wire.jnl | 13 +
bench/bn_contourcolor.jnl | 8 +
bench/bn_dot_product.jnl | 114 +
bench/bn_dynamic_gather.jnl | 3 +-
bench/bn_gif.jnl | 12 +
bench/bn_iin_regrid.jnl | 291 +
bench/bn_let_remote.jnl | 32 +-
bench/bn_strings.jnl | 2 +-
bench/bn_vtree_regrid.jnl | 1 +
bench/co_emac.nc | Bin 0 -> 1260 bytes
bench/err71_2d_ave_miss0.jnl | 16 +
bench/err71_colorlevs.jnl | 15 +
bench/err71_expr_w_const.jnl | 23 +
bench/err71_isready_unknown.jnl | 17 +
bench/err71_plotvs_mode_label.jnl | 6 +-
bench/err71_point_average.jnl | 54 +
bench/err71_ppl_sho_empty.jnl | 26 +
bench/err71_read_delim.jnl | 31 +
bench/err71_repeat_paren.jnl | 15 +
bench/err71_string_and_if.jnl | 47 +
bench/err71_vs_lon_over.jnl | 11 +
bench/shorttest.dat | 11 +
bench/test_results/axticlabel.pdf | Bin 7161 -> 7163 bytes
bench/test_results/bluewire.png | Bin 0 -> 117077 bytes
bench/test_results/bn_axis_vs.gif | Bin 4559 -> 6645 bytes
bench/test_results/bn_axis_vs.png | Bin 33774 -> 37810 bytes
bench/test_results/bn_contour_conset.gif | Bin 17361 -> 17361 bytes
bench/test_results/bn_hovmuller_overlays.gif | Bin 51920 -> 51920 bytes
bench/test_results/bn_inf2missing.pdf | Bin 7913 -> 7915 bytes
bench/test_results/bn_labels_on_taxis.gif | Bin 35123 -> 35123 bytes
bench/test_results/bn_labels_on_taxis.pdf | Bin 69653 -> 69655 bytes
bench/test_results/bn_ribbon_vlog.gif | Bin 12580 -> 12468 bytes
bench/test_results/bn_ribbon_vlog.png | Bin 86991 -> 85145 bytes
bench/test_results/bn_subspan_mod_strides.gif | Bin 24061 -> 24061 bytes
bench/test_results/bn_vs_const_value.gif | Bin 7729 -> 10917 bytes
bench/test_results/bn_vs_const_value.png | Bin 40943 -> 50114 bytes
bench/test_results/bnplot.pdf | Bin 171689 -> 171691 bytes
bench/test_results/bnplot_2.gif | Bin 56113 -> 56113 bytes
bench/test_results/bnplot_3.gif | Bin 27755 -> 27755 bytes
bench/test_results/bnplot_4.eps | 7 +-
bench/test_results/bnplot_4.pdf | Bin 327422 -> 327424 bytes
bench/test_results/bnplot_4.ps | 7 +-
bench/test_results/closed_lev.pdf | Bin 36861 -> 36863 bytes
bench/test_results/contourcolor_blue.pdf | Bin 22729 -> 22731 bytes
bench/test_results/contourcolor_depth.pdf | Bin 0 -> 14295 bytes
bench/test_results/contourcolor_green.pdf | Bin 22454 -> 22390 bytes
bench/test_results/contourcolor_puce.pdf | Bin 22508 -> 22432 bytes
bench/test_results/dashbug.pdf | Bin 10045 -> 10047 bytes
bench/test_results/degC_axlab.pdf | Bin 6863 -> 6865 bytes
bench/test_results/dots.pdf | Bin 5198 -> 5200 bytes
bench/test_results/err700_key.gif | Bin 32596 -> 32596 bytes
bench/test_results/ferret_run_tests_err | 481 +-
bench/test_results/ferret_run_tests_log | 5822 +++++++++++-------
bench/test_results/ferret_run_tests_ncdump | 195 +-
bench/test_results/flowlines.pdf | Bin 54090 -> 54092 bytes
bench/test_results/forecast_actual.gif | Bin 15839 -> 15839 bytes
bench/test_results/forecast_diagview.gif | Bin 14385 -> 14385 bytes
bench/test_results/forecast_leadview.gif | Bin 12293 -> 12293 bytes
bench/test_results/gif_dashbug.gif | Bin 1625 -> 1625 bytes
bench/test_results/graticules.pdf | Bin 18575 -> 18577 bytes
bench/test_results/legend_1d_plots.gif | Bin 10422 -> 10422 bytes
bench/test_results/levels_one_level.gif | Bin 17452 -> 17452 bytes
bench/test_results/linecolors.pdf | Bin 16518 -> 16520 bytes
bench/test_results/lon_lat_label_controls.gif | Bin 7538 -> 10898 bytes
bench/test_results/lon_lat_label_controls.png | Bin 57284 -> 72405 bytes
bench/test_results/multi_line_labels.pdf | Bin 31259 -> 31260 bytes
bench/test_results/outline_poly.pdf | Bin 8604 -> 8606 bytes
bench/test_results/polygon_plot.pdf | Bin 12269 -> 12271 bytes
bench/test_results/pyferret_run_tests_err | 501 +-
bench/test_results/pyferret_run_tests_log | 6451 ++++++++++++--------
bench/test_results/pyferret_run_tests_ncdump | 196 +-
bench/test_results/red10wire.png | Bin 0 -> 83457 bytes
bench/test_results/red25wire.png | Bin 0 -> 99457 bytes
bench/test_results/redwire.png | Bin 0 -> 28657 bytes
bench/test_results/startup_tests2.pdf | Bin 8938 -> 8940 bytes
bench/test_results/testbackground.gif | Bin 46738 -> 46738 bytes
bench/test_results/testfermethods_contour.pdf | Bin 23231 -> 18890 bytes
bench/test_results/testfermethods_fill.pdf | Bin 72362 -> 67996 bytes
bench/test_results/testfermethods_lineplot.pdf | Bin 14684 -> 14691 bytes
bench/test_results/testfermethods_pointplot.pdf | Bin 15019 -> 15026 bytes
bench/test_results/testfermethods_shade.pdf | Bin 16768 -> 16773 bytes
bench/test_results/testferpyvar.pdf | Bin 19342 -> 19324 bytes
bench/test_results/timetics.pdf | Bin 15037 -> 15039 bytes
bench/test_results/timetics2.pdf | Bin 27708 -> 27710 bytes
bench/test_results/vec_curv.pdf | Bin 14773 -> 14775 bytes
bench/test_results/vec_curv2.pdf | Bin 28929 -> 28931 bytes
bench/test_results/viewaxes.pdf | Bin 8098 -> 8100 bytes
bench/test_results/vs_lon_over.gif | Bin 0 -> 11380 bytes
bench/test_results/vs_lon_over.png | Bin 0 -> 22003 bytes
external_functions/ef_utility/site_specific.mk | 4 +-
external_functions/examples/dates.F | 10 +-
fer/ccr/EF_InternalUtil.c | 1025 ++--
fer/common/errmsg.parm | 13 +-
fer/common/ferret.parm | 5 +-
fer/common/grid_chg_fcns.parm | 7 +-
fer/common/slash.parm | 8 +
fer/common/xprog_state.cmn | 13 +-
fer/ctx/merge_grid.F | 14 +-
fer/dat/xalgebra_data.F | 16 +-
fer/dat/xcommand_data.F | 9 +-
fer/dat/xgfdl_error_text_data.F | 10 +
fer/dat/xgrid_chg_fcns_data.F | 85 +-
fer/dat/xprog_state_data.F | 6 +-
fer/dat/xrevision_data.F | 5 +-
fer/doo/SOURCE_FILES | 2 +
fer/doo/do_4d_trans.F | 27 +-
fer/doo/do_ave_int.F | 9 +-
ppl/plot/spwn.F => fer/doo/do_iin_regrid.F | 41 +-
fer/doo/finalize_ave_int.F | 8 +-
fer/doo/iin_regrid.F | 327 +
fer/efi/SOURCE_FILES | 27 +-
fer/efi/bcompressi.F | 283 -
fer/efi/bin_index_wt.F | 4 +-
fer/efi/bxcat.F | 326 -
fer/efi/bxsequence.F | 241 -
fer/efi/bxsequence_str.F | 245 -
fer/efi/dot_e.F | 204 +
fer/efi/dot_f.F | 205 +
fer/efi/dot_t.F | 204 +
fer/efi/dot_x.F | 170 +
fer/efi/dot_y.F | 203 +
fer/efi/dot_z.F | 204 +
fer/efi/expnd_by_len.F | 3 +
fer/efi/expndi_by_m_counts.F | 112 +-
...pndi_by_m_counts.F => expndi_by_m_counts_str.F} | 136 +-
fer/efi/gridding_subs.F | 277 +
fer/efi/is_element_of.F | 4 +-
fer/efi/is_element_of_str.F | 2 +-
fer/efi/sample_fast_i.F | 2 +-
fer/efi/sample_fast_i_str.F | 2 +-
fer/efi/samplem_multi.F | 255 +
fer/efi/samplen_multi.F | 250 +
fer/efi/samplexy_closest.F | 3 +-
fer/efi/{samplexy_closest.F => samplexy_nrst.F} | 10 +-
fer/efi/scat2grid_minmax_xyt.F | 502 ++
fer/efi/scat2grid_std_xyt.F | 570 ++
fer/efi/test_opendap.F | 16 +-
fer/efi/tracks2grid_mask_ave_xyt.F | 685 +++
fer/efi/tracks2grid_std_xyt.F | 787 +++
fer/efi/unique_str2int.F | 2 +-
fer/fmt/full_uvar_name.F | 10 +-
fer/fmt/full_uvar_name_xml.F | 9 +-
fer/gnl/cdf_list.F | 15 +-
fer/gnl/cdf_list_global_atts.F | 12 +-
fer/gnl/define_ef_aggregate_grid.F | 15 +-
fer/gnl/edit_attribute.F | 12 +-
fer/gnl/init_ef_aggregate_dset.F | 3 +-
fer/gnl/init_memory.F | 15 +-
fer/gnl/parse_command.F | 7 +
fer/gnl/redefine_ax_att.F | 10 +-
fer/gnl/repl_exprns.F | 15 +-
fer/gnl/reset_ax_att.F | 12 +-
fer/gnl/set_agg_var_atts.F | 15 +-
fer/gnl/set_var.F | 10 +-
fer/gnl/show_1_uvar_xml.F | 10 +-
fer/gnl/show_data_files.F | 5 +-
fer/gnl/show_data_set_vars.F | 13 +-
fer/gnl/show_line_xml.F | 13 +-
fer/gnl/special_symbol.F | 36 +-
fer/plt/axis_ends.F | 2 +
fer/plt/plot_set_up.F | 61 +-
fer/stk/is_algebra.F | 2 +-
fer/stk/is_do_gc_fcn.F | 4 +-
fer/stk/is_regrid.F | 10 +
fer/stk/is_uvar_grid.F | 13 +-
fer/stk/rcvd_regrid.F | 4 +-
fer/stk/rqst_regrid.F | 5 +-
fer/utl/SOURCE_FILES | 1 +
fer/utl/inherit_attrs.F | 19 +-
fer/utl/save_uvar_grid.F | 18 +-
fer/utl/{save_uvar_grid.F => save_uvar_type.F} | 20 +-
fer/utl/store_dependency.F | 8 +-
fer/utl/update_attributes.F | 17 +-
fer/xeq/xeq_annotate.F | 1 -
fer/xeq/xeq_cancel.F | 8 +-
fer/xeq/xeq_define.F | 16 +-
fer/xeq/xeq_plot.F | 2 +-
fer/xeq/xeq_spawn.F | 32 +-
fer/xeq/xeq_wire.F | 63 +-
fmt/cmn/netcdf_declareUnderscore.inc | 2 +-
fmt/src/NCF_Util.c | 28 +-
fmt/src/SOURCE_FILES | 6 +
.../{cd_get_var_outflag.F => cd_get_id_varname.F} | 49 +-
fmt/src/cd_get_time_units.F | 0
.../{cd_get_var_info.F => cd_get_var_dims_info.F} | 36 +-
fmt/src/cd_get_var_info.F | 25 +
.../{cd_get_var_outflag.F => cd_get_var_natts.F} | 52 +-
fmt/src/cd_get_var_outflag.F | 48 +-
.../{cd_get_var_outflag.F => cd_get_var_type.F} | 37 +-
.../{cd_get_var_outflag.F => cd_get_var_varname.F} | 51 +-
fmt/src/{cd_get_var_info.F => cd_isit_coordvar.F} | 62 +-
fmt/src/ez_delimited_read.c | 26 +-
fmt/src/ez_init_dset.F | 27 +-
jnls/examples/color_cover.jnl | 196 +
jnls/examples/my_ocean_stripmap_tn.jnl | 141 +
jnls/go/frequency_histogram2.jnl | 3 +
palettes/inverse_rainbow.spk | 6 +
palettes/pale_green_blue_rev.spk | 9 +
palettes/purple_blue_orange.spk | 14 +
palettes/range_of_blues.spk | 2 +
palettes/ten_reordered_levels.spk | 13 +
palettes/woce2_test.spk | 7 +
ppl/complot/symbel_hershey.F | 3 +-
ppl/plot/plotz.F | 16 +-
ppl/plot/spwn.F | 10 +-
ppl/plot/view.F | 24 +-
ppl/plotlib/contur.F | 47 +-
ppl/symlib/cmderr.F | 42 +-
ppl/tmap_inc/taxis_inc.decl | 18 +-
ppl/tmapadds/fillpol.F | 17 +-
ppl/tmapadds/key.F | 7 +-
ppl/tmapadds/set_levels_shade_fill.F | 9 +-
ppl/tmapadds/setlab_syms.F | 45 +-
pyfermod/libpyferret.c | 2 +-
pyfermod/pyferret.h | 3 +-
setup.py | 14 +-
site_specific.mk | 26 +-
233 files changed, 20212 insertions(+), 10395 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyferret.git
More information about the debian-science-commits
mailing list