[pyferret] 18/110: Merge tag 'upstream_1.1.0'
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jul 28 08:41:47 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 af3a4625c4ef9eec5c321ab9a0ef57a9e2ef3681
Merge: 07e1a08 29b824f
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat May 9 22:27:11 2015 +0100
Merge tag 'upstream_1.1.0'
Makefile | 12 +-
bench/TEST_SCRIPTS | 10 +
bench/TRASH_FILES | 16 +-
...estCoastCarbon_9d9c_f562_77b5_5f8e_5d19_7b1d.nc | Bin 0 -> 9840 bytes
bench/anew_global.cdl | 40 +
bench/ansley_official.linux_err | 263 +-
bench/ansley_official.linux_log | 5814 ++++++++++++++------
bench/ansley_official.rhel6-64_err | 214 +-
bench/ansley_official.rhel6-64_log | 4961 ++++++++++++-----
bench/ansley_official.x86_64-linux_err | 219 +-
bench/ansley_official.x86_64-linux_log | 4627 ++++++++++++----
bench/badbounds_even.nc | Bin 0 -> 844 bytes
bench/badbounds_non_enclose.nc | Bin 0 -> 868 bytes
bench/badbounds_uneven.nc | Bin 0 -> 792 bytes
bench/bn691_bug_fixes.jnl | 75 +
bench/bn69_bug_fixes.jnl | 4 +-
bench/bn_all.jnl | 30 +
bench/bn_append_dsg.jnl | 30 +
bench/bn_axis_viewports.jnl | 19 +-
bench/bn_center_key_labels.jnl | 43 +
bench/bn_conventions_history.jnl | 19 +
bench/bn_date1900_array.jnl | 18 +
bench/bn_dsg_e_x.jnl | 12 +
bench/bn_global_atts.jnl | 29 +
bench/bn_plot.jnl | 2 +-
bench/bn_polygon_log.jnl | 33 +
bench/bn_show_outfile.jnl | 83 +
bench/bn_spawn_size.jnl | 27 +
bench/bn_vtree_outfile.jnl | 185 +
bench/bn_vtree_outfile.sub | 19 +
bench/bn_wgt_transform.jnl | 40 +
bench/check_metafiles_rh6 | 93 -
bench/conventions_history_in.nc | Bin 0 -> 984 bytes
bench/err686_set_var_name.jnl | 12 +-
bench/err691_bnds_case.jnl | 10 +
bench/err69_arg_type_error.jnl | 17 +
bench/err69_bad_bounds.jnl | 25 +
bench/err69_const_array.jnl | 26 +
bench/err69_countervar_context.jnl | 11 +
bench/err69_ens_badvalue.jnl | 14 +
bench/err69_fill_trans.jnl | 18 +
bench/err69_if_then_split.jnl | 42 +
bench/err69_isready_and_regridding.jnl | 36 +
bench/err69_isready_bugs.jnl | 28 +
bench/err69_isready_status_errmsgs.jnl | 15 +
bench/err69_label_backspace.jnl | 7 +
bench/err69_letd_dsetnum.jnl | 7 +
bench/err69_levels_v.jnl | 14 +
bench/err69_load_big_grid.jnl | 24 +
bench/err69_long_string_to_xml.jnl | 12 +
bench/err69_multi_label_ascii.jnl | 29 +
bench/err69_plot_vs_labs.jnl | 21 +
bench/err69_repeat_in_if.jnl | 55 +
bench/err69_repl_scinot.jnl | 15 +
bench/err69_ribbon_by_levels.jnl | 21 +
bench/err69_ribbon_histogram.jnl | 23 +
bench/err69_vtree_and_uvar_regrid.jnl | 8 +
bench/err69_vtree_cancel_axis.jnl | 19 +
bench/err69_write_attribute.jnl | 62 +
bench/global.nc | Bin 0 -> 1696 bytes
bench/lev_v_bug.nc | Bin 0 -> 43264 bytes
bench/maize_1.nc | Bin 0 -> 968 bytes
bench/maize_2.nc | Bin 0 -> 968 bytes
bench/maize_3.nc | Bin 0 -> 968 bytes
bench/test_results/axticlabel.pdf | Bin 7177 -> 7166 bytes
bench/test_results/bnplot.pdf | Bin 183832 -> 183735 bytes
bench/test_results/closed_lev.pdf | Bin 38462 -> 38600 bytes
bench/test_results/dashbug.pdf | Bin 10413 -> 10364 bytes
bench/test_results/degC_axlab.pdf | Bin 6948 -> 6880 bytes
bench/test_results/dots.pdf | Bin 5193 -> 5269 bytes
bench/test_results/ferret_run_tests_err | 201 +-
bench/test_results/ferret_run_tests_log | 3434 +++++++++---
bench/test_results/ferret_run_tests_ncdump | 395 +-
bench/test_results/flowlines.pdf | Bin 55408 -> 55588 bytes
bench/test_results/graticules.pdf | Bin 24461 -> 25097 bytes
bench/test_results/linecolors.pdf | Bin 16544 -> 16442 bytes
bench/test_results/multi_line_labels.pdf | Bin 30878 -> 30894 bytes
bench/test_results/polygon_plot.pdf | Bin 16333 -> 16172 bytes
bench/test_results/pyferret_run_tests_err | 181 +-
bench/test_results/pyferret_run_tests_log | 3596 +++++++++---
bench/test_results/pyferret_run_tests_ncdump | 395 +-
bench/test_results/startup_tests2.pdf | Bin 11505 -> 11570 bytes
bench/test_results/timetics.pdf | Bin 15654 -> 15977 bytes
bench/test_results/timetics2.pdf | Bin 27328 -> 27383 bytes
bench/test_results/vec_curv.pdf | Bin 14409 -> 14410 bytes
bench/test_results/vec_curv2.pdf | Bin 28782 -> 29018 bytes
bench/test_results/viewaxes.pdf | Bin 8042 -> 8091 bytes
bench/test_save_dsg_in.nc | Bin 0 -> 1680 bytes
bin/Finstall | 116 +-
bin/ferret_paths_template.csh | 58 +-
bin/ferret_paths_template.sh | 57 +-
bin/make_executable_tar | 2 +-
bin/{pyferret_template.sh => pyferret_template} | 29 +-
bin/pyferret_template.csh | 55 -
external_functions/Makefile | 4 +-
external_functions/cmprsi_by/Makefile | 3 +-
external_functions/cmprsi_by/expndi_by_m_counts.F | 292 +
external_functions/decimate/Makefile | 6 +-
.../decimate/{separate.F => piecewise1.F} | 255 +-
external_functions/decimate/piecewise2.F | 403 ++
external_functions/decimate/piecewise3.F | 604 +-
external_functions/decimate/piecewise_subs.F | 510 ++
external_functions/decimate/sample_fast_i.F | 2 +-
.../{sample_fast_i.F => sample_fast_i_str.F} | 32 +-
external_functions/decimate/separate.F | 24 +-
.../decimate/{separate.F => separate_str.F} | 40 +-
.../ef_utility/ferret_cmn/EF_mem_subsc.cmn | 2 -
.../ef_utility/ferret_cmn/EF_mem_subsc_f90.inc | 2 -
external_functions/eof/Makefile | 9 +-
external_functions/eof/eof_space_tgap.F | 629 +++
external_functions/eof/eof_stat_tgap.F | 646 +++
external_functions/eof/eof_tfunc_tgap.F | 617 +++
external_functions/eof/eofsubs.F | 1012 ++++
external_functions/sort/Makefile | 2 +-
external_functions/stringfcns/efstrings.F | 12 +-
external_functions/stringfcns/length_of_strings.F | 10 +-
external_functions/stringfcns/maxstrlen.F | 10 +-
external_functions/stringfcns/pass_thru_string.F | 13 +-
external_functions/stringfcns/pick_a_string.F | 13 +-
external_functions/stringfcns/str_missing.F | 13 +-
external_functions/stringfcns/string_cat3.F | 16 +-
external_functions/stringfcns/string_len_sum.F | 11 +-
external_functions/stringfcns/strings_as_args.F | 18 +-
fer/ccr/EF_InternalUtil.c | 64 +-
fer/cferbind/cairoCFerBind_createSurface.c | 6 -
fer/cferbind/cairoCFerBind_drawPolygon.c | 6 +-
fer/cferbind/cairoCFerBind_drawRectangle.c | 6 +-
fer/cferbind/cairoCFerBind_saveWindow.c | 19 +-
fer/common/EF_mem_subsc.cmn | 1 +
fer/common/ferret.parm | 9 +-
fer/common/interp_stack.parm | 9 +-
fer/common/plot_setup.parm | 12 +-
fer/common/slash.parm | 5 +-
fer/ctx/get_var_context.F | 5 +-
fer/ctx/region_class.F | 3 +
fer/dat/xalgebra_data.F | 18 +-
fer/dat/xrevision_data.F | 14 +-
fer/doo/SOURCE_FILES | 4 +
fer/doo/{do_xyave_regrid.F => do_4d_ave_wgt.F} | 49 +-
fer/doo/do_4d_wgt.F | 303 +
fer/doo/{do_xyave_regrid.F => do_avg_wgt.F} | 40 +-
fer/doo/do_internal_gc_fcn.F | 18 +-
fer/doo/do_wgt.F | 244 +
fer/doo/do_xyave_regrid.F | 8 +-
fer/doo/xyave_regrid.F | 17 +-
fer/ef_utility/ef_get_string_arg_elem_len_sub.F | 6 +-
fer/ef_utility/ef_get_string_arg_element_6d.F | 4 +-
fer/ef_utility/ef_get_string_arg_element_len_6d.F | 4 +-
fer/ef_utility/ef_get_string_arg_element_sub.F | 4 +-
fer/ef_utility/ef_get_string_arg_max_len.F | 4 +-
fer/efi/SOURCE_FILES | 2 +
fer/efi/date1900.F | 105 +-
fer/efi/expndi_by_m_counts.F | 318 ++
fer/efi/labwid.F | 7 +-
fer/efi/list_value_xml.F | 4 +-
fer/efi/samplexy_curv.F | 16 +-
fer/efi/samplexy_curv_avg.F | 13 +-
fer/efi/samplexy_curv_nrst.F | 12 +
.../decimate => fer/efi}/separate.F | 34 +-
fer/gnl/SOURCE_FILES | 1 +
fer/gnl/cdf_list.F | 2 +-
fer/gnl/get_context_mods.F | 6 +
.../isit_const_arr_var.F} | 61 +-
fer/gnl/list_cmnd_data.F | 2 +
fer/gnl/list_multi_sub.F | 5 +-
fer/gnl/repl_exprns.F | 19 +-
fer/gnl/sample.F | 26 +-
fer/gnl/set_var.F | 5 +-
fer/gnl/show_1_function.F | 2 +
fer/gnl/show_1_pyvar.F | 4 +-
fer/gnl/show_data.F | 3 +-
fer/gnl/show_grid.F | 5 +-
fer/ino/init_ez_dset.F | 37 +-
fer/ino/var_ss_lims.F | 8 +-
fer/mem/SOURCE_FILES | 1 +
fer/mem/assign_mr_cx.F | 3 +
fer/mem/create_mem_var.F | 29 +-
fer/mem/create_temp_mem_var.F | 19 +-
fer/mem/find_mem_var.F | 5 +-
fer/mem/get_memory.F | 60 +-
fer/mem/get_work_mr.F | 7 +-
fer/mem/get_work_spc.F | 8 +-
fer/mem/{get_work_spc.F => r_cgrid_size_delta.F} | 56 +-
fer/ocn/calc_cvar.F | 22 +-
fer/plt/disp_data_set_up.F | 11 +-
fer/plt/disp_set_up.F | 4 +
fer/plt/plot_set_up.F | 76 +-
fer/plt/polygon_set_up.F | 28 +
fer/stk/get_dependencies.F | 5 +
fer/stk/interp_stack.F | 6 +-
fer/stk/is_aggregate_gather.F | 27 +-
fer/stk/is_counter_var.F | 5 +-
fer/stk/is_dependencies.F | 12 +
fer/stk/is_do_gc_fcn.F | 11 +-
fer/stk/is_trans.F | 15 +-
fer/stk/offset_ss.F | 11 +-
fer/utl/get_dependency_status.F | 6 +-
fer/utl/get_string_element.F | 3 +-
fer/utl/parse_number_list.F | 21 +-
fer/utl/report_aux_dependency.F | 3 +-
fer/xeq/xeq_cancel.F | 2 +-
fer/xeq/xeq_contour.F | 44 +-
fer/xeq/xeq_plot.F | 42 +-
fer/xeq/xeq_polygon.F | 39 +-
fer/xeq/xeq_shade.F | 40 +-
fer/xeq/xeq_show.F | 36 +-
ferretmagic.py | 121 +-
fmt/cmn/tmap_errors.parm | 11 +-
fmt/src/SOURCE_FILES | 2 +
fmt/src/cd_conventions_out.F | 60 +-
fmt/src/cd_dim_only.F | 40 +
fmt/src/cd_get_1_axis.F | 60 +-
fmt/src/cd_get_line_direction.F | 16 +
fmt/src/cd_make_var.F | 28 +-
fmt/src/cd_stamp_out.F | 47 +-
fmt/src/cd_write_axis.F | 94 +-
fmt/src/cd_write_grid.F | 6 +-
fmt/src/cd_write_var.F | 25 +-
fmt/src/ez_count_dset.F | 242 +
fmt/src/tm_fmt.F | 1 +
fmt/src/tm_secs_to_date.F | 6 +-
fmt/src/xerror_text_data.F | 2 +
jnls/contrib/regressxy.jnl | 46 -
jnls/go/polymark.jnl | 9 +-
palettes/QC_V3_by_level.spk | 16 +
palettes/QC_regions.spk | 14 +
palettes/brown_soft.spk | 2 +
palettes/coralreefwatch_dhw.spk | 18 +
palettes/coralreefwatch_dhw_pct_white.spk | 21 +
palettes/coralreefwatch_dhw_percent.spk | 21 +
palettes/coralreefwatch_hotspot.spk | 127 +
palettes/coralreefwatch_sst.spk | 127 +
palettes/coralreefwatch_sstanomaly.spk | 128 +
palettes/fifteen_by_levels.spk | 18 +
palettes/green_pine.spk | 2 +
palettes/pale_green_blue.spk | 9 +
palettes/ten2_levels.spk | 13 +
palettes/ten_bright_levels.spk | 15 +
palettes/woce.spk | 7 +
platform_specific.mk.i386-linux | 2 +-
platform_specific.mk.i386-linux-gnu | 5 +-
platform_specific.mk.intel-mac | 7 +-
platform_specific.mk.x86_64-linux | 4 +-
platform_specific.mk.x86_64-linux-gnu | 7 +-
ppl/complot/symbel.F | 10 +
ppl/include/PLT.INC | 5 +-
ppl/plot/daxis.F | 7 +-
ppl/plot/daxis2.F | 5 +-
ppl/plot/labdrw.F | 13 +-
ppl/plot/lev.F | 16 +-
ppl/plot/opnppl.F | 10 +-
ppl/plot/plotxy_ribbon.F | 75 +-
ppl/plot/pplcmd_f.F | 18 +-
ppl/plot/ppldata.F | 4 +-
ppl/plot/prmtiv.F | 21 +-
ppl/plot/vecfld.F | 16 +-
ppl/tmap_inc/plt_inc.decl | 3 +-
ppl/tmap_inc/shade_vars.cmn | 8 +-
ppl/tmapadds/SOURCE_FILES | 1 +
ppl/tmapadds/compute_histo_bins.F | 27 +-
ppl/tmapadds/compute_mnstd.F | 100 +-
ppl/tmapadds/getlabfonts.F | 122 +-
ppl/tmapadds/key.F | 37 +-
ppl/tmapadds/set_fill_ndx.F | 33 +
ppl/tmapadds/set_levels_shade_fill.F | 20 +-
.../tmapadds/set_ribbon_ndx.F | 42 +-
ppl/tmapadds/shade_key.F | 15 +-
ppl/tmapadds/ws_line_spectrum.F | 26 +-
pviewmod/pipedviewerpq.py | 16 +-
pyfermod/__init__.py | 34 +-
site_specific.mk | 62 +-
271 files changed, 27823 insertions(+), 7775 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