[pyferret] 65/110: Merge branch 'debian/master' into dev-python3 (upstream 7.0.0)

Alastair McKinstry mckinstry at moszumanska.debian.org
Fri Jul 28 08:42:11 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 51fd6980682100af4aab764910bc5cda43ccb8cf
Merge: 7c6a44c d344891
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Aug 12 16:27:09 2016 +0100

    Merge branch 'debian/master' into dev-python3 (upstream 7.0.0)

 LICENSE                                            |    19 +
 Makefile                                           |   129 +-
 README.md                                          |     5 +
 README_build_ferret                                |    66 -
 README_build_pyferret_mac.txt                      |   159 +
 bench/Makefile                                     |    40 +
 bench/RUN_TESTS.sh                                 |   141 +-
 bench/TEST_SCRIPTS                                 |    40 +-
 bench/TRASH_FILES                                  |    58 +-
 ...cial.linux_err => ansley_official.rhel5_32_err} |   767 +-
 ...cial.linux_log => ansley_official.rhel5_32_log} | 17207 ++++++++++++----
 bench/ansley_official.rhel6-64_err                 |   771 +-
 bench/ansley_official.rhel6-64_log                 | 17928 +++++++++++-----
 bench/ansley_official.x86_64-linux_err             |   464 +-
 bench/axes_subspan.nc                              |   Bin 0 -> 1060 bytes
 bench/bn696_bug_fixes.jnl                          |     3 +
 bench/bn697_bug_fixes.jnl                          |    95 +
 bench/bn_aggregate_e.jnl                           |   100 +-
 bench/bn_aggregate_f.jnl                           |   174 +
 bench/bn_aggregate_f.sub                           |    34 +
 bench/bn_aggregate_t.jnl                           |   326 +
 bench/bn_aggregate_tef.jnl                         |   256 +
 bench/bn_all.jnl                                   |    86 +-
 bench/bn_append_dsg.jnl                            |     8 +-
 bench/bn_auto_tprec.jnl                            |    56 +
 bench/bn_climatology_attr.jnl                      |    58 +
 bench/bn_contourcolor.jnl                          |     8 +
 bench/bn_coordvars_atts.jnl                        |    31 +
 bench/bn_dataset_qualifier.jnl                     |    96 +
 bench/bn_deg_min.jnl                               |    16 +
 bench/bn_dynamic_grids.jnl                         |     6 +-
 bench/bn_floatstr_extended.jnl                     |     9 +
 bench/bn_fmrc.jnl                                  |     6 +-
 bench/bn_gif.jnl                                   |    29 +-
 bench/bn_global_atts.jnl                           |     9 +-
 bench/bn_hovmuller_overlays.jnl                    |    77 +
 bench/bn_internal_external_functions.jnl           |     5 +
 bench/bn_interpolate_6d.jnl                        |     4 +
 bench/bn_labels_on_taxis.jnl                       |   114 +
 bench/bn_let_remote.jnl                            |    90 +
 bench/bn_letd_attributes.jnl                       |    82 +
 bench/bn_list_clim_axes.jnl                        |    12 +
 bench/bn_long_lists.jnl                            |   133 +
 bench/bn_netcdf4.jnl                               |    21 +-
 bench/bn_nocoords.jnl                              |    39 -
 bench/bn_plot_along.jnl                            |    54 +
 bench/bn_plot_decimate.jnl                         |    60 +
 bench/bn_ps.jnl                                    |    10 +-
 bench/bn_regrid_6d.jnl                             |     8 +
 bench/bn_regrid_transforms_6d.jnl                  |     3 +
 bench/bn_samplexy_sampleij.jnl                     |    13 +
 bench/bn_sho_att_longnames.jnl                     |    29 +
 bench/bn_show_commands.jnl                         |   130 +
 bench/bn_show_noupcase.jnl                         |    98 +
 bench/bn_show_uvar_grid.jnl                        |   126 +
 bench/bn_show_xml_file.jnl                         |     7 +-
 bench/bn_speedtest.jnl                             |    18 +
 bench/bn_syntax.jnl                                |    12 +-
 bench/bn_unquoted_args.jnl                         |   134 +
 bench/bn_vtree.jnl                                 |     5 +-
 bench/bn_vtree_outfile.jnl                         |     5 +-
 bench/bn_warn_subspan.jnl                          |    15 +
 bench/bn_xml_output.jnl                            |    62 +-
 bench/bn_xml_repl.jnl                              |    14 +-
 bench/bug1845.nc                                   |   Bin 0 -> 2020 bytes
 bench/coads_slice.nc                               |   Bin 0 -> 3348 bytes
 bench/ens1.nc                                      |   Bin 10048 -> 10112 bytes
 bench/err581_subspanx_fill_bug.jnl                 |     7 +-
 bench/err607_show_var_xml.jnl                      |    13 +-
 bench/err611_return_precision.jnl                  |     1 +
 bench/err62_thick_tic_time_axis.jnl                |     2 +
 bench/err65_read_epic_cdf.jnl                      |    13 +
 bench/err667_mode_desperate.jnl                    |     2 +
 bench/err686_show_xml_letd.jnl                     |    16 +
 bench/err693_std4d.jnl                             |     0
 bench/err693_upcase_quoted_name.jnl                |     1 +
 bench/err695_grave_prec.jnl                        |    18 +
 bench/err696_2d_time_overlay.jnl                   |    45 +
 bench/err696_annotate_numeric.jnl                  |    27 +
 bench/err696_argument_blanks.jnl                   |    17 +
 bench/err696_argument_blanks_sub.jnl               |     3 +
 bench/err696_centerlab_restore.jnl                 |    56 +
 bench/err696_contour_conset.jnl                    |    27 +
 bench/err696_def_att.jnl                           |    28 +
 bench/err696_def_ax_edges.jnl                      |    28 +
 bench/err696_def_ax_f.jnl                          |    19 +
 bench/err696_e_component_mem_crptn.jnl             |    33 +
 bench/err696_ft_calendars.jnl                      |    17 +
 bench/err696_hovmuller_mod_fill.jnl                |     8 +
 bench/err696_mem_err_report.jnl                    |    39 +
 bench/err696_mod_sub_fln.jnl                       |    16 +
 bench/err696_mode_cal_f.jnl                        |    39 +
 bench/err696_multiple_slashes.jnl                  |    56 +
 bench/err696_only_inf_lev.jnl                      |    23 +
 bench/err696_plot_ax_ppl.jnl                       |    79 +
 bench/err696_poly_over_label.jnl                   |    27 +
 bench/err696_red_keylab.jnl                        |    10 +
 bench/err696_repeat_escapes.jnl                    |    14 +
 bench/err696_return_prec.jnl                       |    36 +
 bench/err696_return_type.jnl                       |    27 +
 bench/err696_save_noupcase.jnl                     |    27 +
 bench/err696_shade_subspan_clim.jnl                |    30 +
 bench/err696_singlevec_over.jnl                    |    34 +
 bench/err696_subspan_mod_in_expr.jnl               |    23 +
 bench/err696_subspan_mod_strides.jnl               |    21 +
 bench/err696_subspan_transforms.jnl                |    43 +
 bench/err696_time_overlay.jnl                      |    16 +
 bench/err696_write_no_dim.jnl                      |    13 +
 bench/err69_levels_v.jnl                           |     1 +
 bench/ft_cal_mixed.nc                              |   Bin 0 -> 1164 bytes
 bench/ft_cal_one.nc                                |   Bin 0 -> 1124 bytes
 bench/nodim.nc                                     |   Bin 0 -> 1272 bytes
 bench/run1.nc                                      |   Bin 5384 -> 5424 bytes
 bench/run_all                                      |    52 +-
 bench/stream10by5.unf                              |   Bin 400 -> 0 bytes
 bench/stream10by5_aix.unf                          |   Bin 200 -> 0 bytes
 bench/stream10by5_alp.unf                          |   Bin 200 -> 0 bytes
 bench/stream10by5_dec.unf                          |   Bin 200 -> 0 bytes
 bench/stream10by5_i386-apple-darwin.unf            |   Bin 400 -> 0 bytes
 bench/stream10by5_sgi.unf                          |   Bin 200 -> 0 bytes
 bench/stream10by5_sol.unf                          |   Bin 200 -> 0 bytes
 bench/stream10by5_sun.unf                          |   Bin 200 -> 0 bytes
 bench/stream10by5_x86_64-darwin.unf                |   Bin 0 -> 400 bytes
 bench/test_results/bn_contour_conset.gif           |   Bin 0 -> 17361 bytes
 bench/test_results/bn_contour_conset.png           |   Bin 0 -> 148655 bytes
 bench/test_results/bn_hovmuller_overlays.gif       |   Bin 0 -> 51773 bytes
 bench/test_results/bn_hovmuller_overlays.pdf       |   Bin 0 -> 114913 bytes
 bench/test_results/bn_labels_on_taxis.gif          |   Bin 0 -> 34740 bytes
 bench/test_results/bn_labels_on_taxis.pdf          |   Bin 0 -> 69827 bytes
 bench/test_results/bn_subspan_mod_strides.gif      |   Bin 0 -> 24039 bytes
 bench/test_results/bn_subspan_mod_strides.png      |   Bin 0 -> 65121 bytes
 bench/test_results/bnplot.pdf                      |   Bin 171732 -> 171724 bytes
 bench/test_results/bnplot.png                      |   Bin 0 -> 128925 bytes
 bench/test_results/bnplot_1.gif                    |   Bin 0 -> 32276 bytes
 bench/test_results/bnplot_1.png                    |   Bin 0 -> 290307 bytes
 bench/test_results/bnplot_2.gif                    |   Bin 0 -> 55964 bytes
 bench/test_results/bnplot_2.png                    |   Bin 0 -> 558523 bytes
 bench/test_results/bnplot_3.gif                    |   Bin 0 -> 27755 bytes
 bench/test_results/bnplot_3.png                    |   Bin 0 -> 229820 bytes
 bench/test_results/bnplot_4.pdf                    |   Bin 0 -> 327451 bytes
 bench/test_results/bnplot_4.ps                     | 20384 +++++++++++++++++++
 bench/test_results/closed_lev.pdf                  |   Bin 36893 -> 36870 bytes
 bench/test_results/contourcolor_blue.pdf           |   Bin 0 -> 22745 bytes
 bench/test_results/contourcolor_green.pdf          |   Bin 0 -> 22502 bytes
 bench/test_results/contourcolor_puce.pdf           |   Bin 0 -> 22554 bytes
 bench/test_results/dashbug.gif                     |   Bin 0 -> 7161 bytes
 bench/test_results/dashbug.pdf                     |   Bin 10056 -> 10065 bytes
 bench/test_results/dots.pdf                        |   Bin 5215 -> 5210 bytes
 bench/test_results/ferret_run_tests_err            |  1401 +-
 bench/test_results/ferret_run_tests_log            | 16860 +++++++++++----
 bench/test_results/ferret_run_tests_ncdump         |   945 +-
 bench/test_results/flowlines.pdf                   |   Bin 54060 -> 54090 bytes
 bench/test_results/gif_dashbug.gif                 |   Bin 0 -> 1621 bytes
 bench/test_results/gif_dashbug.png                 |   Bin 0 -> 6690 bytes
 bench/test_results/linecolors.pdf                  |   Bin 16412 -> 16519 bytes
 bench/test_results/multi_line_labels.pdf           |   Bin 31257 -> 31263 bytes
 bench/test_results/outline_poly.pdf                |   Bin 8601 -> 8606 bytes
 bench/test_results/polygon_plot.pdf                |   Bin 12323 -> 12271 bytes
 bench/test_results/pyferret_run_tests_err          |  1443 +-
 bench/test_results/pyferret_run_tests_log          | 18799 +++++++++++++----
 bench/test_results/pyferret_run_tests_ncdump       |   956 +-
 bench/test_results/startup_tests2.pdf              |   Bin 8921 -> 8923 bytes
 bench/test_results/testbackground.gif              |   Bin 0 -> 46738 bytes
 bench/test_results/testbackground.png              |   Bin 0 -> 52303 bytes
 bench/test_results/testfermethods_contour.pdf      |   Bin 0 -> 26777 bytes
 bench/test_results/testfermethods_fill.pdf         |   Bin 0 -> 75925 bytes
 bench/test_results/testfermethods_lineplot.pdf     |   Bin 0 -> 18652 bytes
 bench/test_results/testfermethods_pointplot.pdf    |   Bin 0 -> 18990 bytes
 bench/test_results/testfermethods_shade.pdf        |   Bin 0 -> 20431 bytes
 bench/test_results/testferpyvar.pdf                |   Bin 0 -> 24189 bytes
 bench/test_results/timetics2.pdf                   |   Bin 27634 -> 27680 bytes
 bench/test_results/vec_curv.pdf                    |   Bin 14648 -> 14773 bytes
 bench/test_results/vec_curv2.pdf                   |   Bin 28938 -> 28940 bytes
 bench/testferaggdset.py                            |    38 +
 bench/testferaxis.py                               |   152 +
 bench/testferdset.py                               |    74 +
 bench/testfergrid.py                               |    79 +
 bench/testfermethods.py                            |    47 +
 bench/testferpyvar.py                              |    46 +
 bench/testferregion.py                             |    39 +
 bench/testfervar.py                                |   129 +
 bench/testgetstrdata.py                            |    29 +
 bin/Finstall                                       |   180 +-
 bin/Fpurge                                         |     2 +-
 bin/build_fonts/unix/.gitignore                    |    34 +
 bin/ferret_paths_template.csh                      |     2 +-
 bin/ferret_paths_template.sh                       |     2 +-
 bin/make_dist_tar                                  |   202 +
 bin/make_environment_tar                           |   163 -
 bin/make_executable_tar                            |   184 -
 bin/make_source_tar                                |    20 +-
 bin/pyferret_template                              |     9 +-
 efmem/Makefile                                     |    44 -
 external_functions/Makefile                        |     9 +-
 .../cflib/curv_to_lonlat_from_weights.c            |     1 +
 external_functions/cflib/curv_to_lonlat_regrid.c   |     1 +
 external_functions/cflib/fcn_curv_to_lonlat.c      |     1 +
 external_functions/contributed/pco2.F              |    21 -
 external_functions/date_and_time/date_decode.c     |     9 +-
 external_functions/date_and_time/time_decode.c     |     1 +
 external_functions/ef_utility/Makefile             |    37 +
 .../ef_utility}/copy_ferret_ef_mem_subsc.F         |    20 +-
 .../platform_specific.mk.i386-apple-darwin         |    37 -
 .../ef_utility/platform_specific.mk.i386-linux     |    26 +-
 .../ef_utility/platform_specific.mk.i386-linux-gnu |    26 +-
 .../ef_utility/platform_specific.mk.intel-mac      |    35 +-
 .../ef_utility/platform_specific.mk.x86_64-linux   |    28 +-
 .../platform_specific.mk.x86_64-linux-gnu          |    28 +-
 external_functions/ef_utility/site_specific.mk     |     4 +-
 external_functions/extrema/maxminmax.F             |     1 -
 external_functions/extrema/minminmax.F             |     1 -
 external_functions/gridding/scat2grid_minmax_xyt.F |   101 +-
 external_functions/gridding/scat2grid_nobs_xy.F    |   445 -
 external_functions/gridding/scat2grid_std_xyt.F    |   143 +-
 external_functions/gridding/scat2grid_t.F          |   381 -
 .../gridding/tracks2grid_mask_ave_xyt.F            |    74 +-
 external_functions/gridding/tracks2grid_std_xyt.F  |    63 +-
 external_functions/las/Makefile                    |     4 +-
 external_functions/matlab/matlab_func_link.c       |     1 +
 external_functions/matlab/matlab_link.c            |     1 +
 external_functions/v5d/binio.c                     |     1 +
 external_functions/v5d/v5d.c                       |     1 +
 external_functions/zaxr/Makefile                   |     2 +-
 fer/AIX_MODIFICATIONS.LOG                          |   347 -
 fer/AIX_MODIFICATIONS_SCHMIDT.LOG                  |   330 -
 fer/Makefile                                       |    15 +-
 fer/ccr/EF_InternalUtil.c                          |   329 +-
 fer/ccr/SOURCE_FILES                               |     1 +
 fer/ccr/binaryRead.c                               |     3 -
 fer/ccr/binaryRead.h                               |     2 -
 fer/ccr/cache_full_array.c                         |     1 +
 fer/ccr/free_cached_full_array.c                   |     1 +
 ...ull_array.c => recover_cached_2d_array_point.c} |    24 +-
 fer/ccr/recover_cached_full_array.c                |     1 +
 fer/ccr/save_arg_pointers.c                        |     1 +
 fer/ccr/set_null_c_string_array.c                  |     1 +
 fer/ccr/sizeof_pointer.c                           |     1 +
 fer/cferbind/Makefile                              |     2 +-
 fer/cferbind/cairoCFerBind_drawPoints.c            |     2 +-
 fer/common/ferret.parm                             |    25 +-
 fer/common/fgrdel.cmn                              |     4 +-
 fer/common/interp_stack.parm                       |     4 +-
 fer/common/plot_setup.parm                         |     6 +-
 fer/common/slash.parm                              |    38 +-
 fer/common/xbox_bounds.cmn                         |     7 +-
 fer/common/xcalc_vars.cmn                          |    85 -
 fer/common/xcommand.cmn                            |    44 +-
 fer/common/xcontrol.cmn                            |    13 +-
 fer/common/xcontrol.equiv                          |    10 +
 fer/common/xdset_parms.cmn                         |    55 -
 fer/common/xplot_setup.cmn                         |     5 +
 fer/common/xplot_state.cmn                         |    15 +-
 fer/common/xprog_state.cmn                         |     9 +-
 fer/common/xrevision.cmn                           |     2 +-
 fer/common/xrevision_type.cmn                      |     2 +-
 fer/common/xrisc.cmn                               |     4 +-
 fer/common/xtext_info.cmn                          |     5 +-
 fer/common/xtra_compute_attr.cmn                   |    13 +
 fer/ctx/complete_missing_limits.F                  |     9 +-
 fer/ctx/get_auto_aux_vars.F                        |    19 +-
 fer/ctx/get_context_bad_flag.F                     |     6 +-
 fer/ctx/get_context_grid.F                         |    36 +-
 fer/ctx/known_data_type.F                          |    19 +-
 fer/ctx/parse_var_name.F                           |    15 +-
 fer/dat/SOURCE_FILES                               |     2 -
 fer/dat/netcdf4_settings_data.F                    |     8 +
 fer/dat/xalgebra_data.F                            |     1 +
 fer/dat/xcalc_vars_data.F                          |  2472 ---
 fer/dat/xcommand_data.F                            |   125 +-
 fer/dat/xdset_parms_data.F                         |    77 -
 fer/dat/xplot_setup_data.F                         |     3 +-
 fer/dat/xprog_state_data.F                         |     3 +-
 fer/dat/xrevision_data.F                           |    14 +-
 fer/dat/xtext_info_data.F                          |     5 +-
 fer/doo/do_aux_var_regrid_2d_tf.F                  |    23 +-
 fer/doo/do_fill_interp.F                           |    14 +-
 fer/doo/do_internal_gc_fcn.F                       |     4 +-
 fer/doo/regrid_comments.F                          |    11 +-
 fer/efi/SOURCE_FILES                               |     6 +
 fer/efi/{is_element_of.F => bcompressi.F}          |   158 +-
 fer/efi/bxcat.F                                    |   326 +
 fer/efi/bxsequence.F                               |   241 +
 fer/efi/bxsequence_str.F                           |   245 +
 fer/efi/curv_to_rect_subs.F                        |     0
 fer/efi/element_index.F                            |     3 +
 fer/efi/floatstr.F                                 |    10 +-
 fer/efi/is_element_of.F                            |     3 +
 fer/efi/maxminmax.F                                |     1 -
 fer/efi/minminmax.F                                |     1 -
 fer/efi/rect_to_curv.F                             |     3 +-
 fer/efi/sample_fast_i.F                            |     3 +
 fer/efi/sampleij.F                                 |    17 +-
 .../{scat2grid_nbin_xyt.F => scat2grid_bin_xyz.F}  |   216 +-
 .../{scat2grid_nbin_xyt.F => scat2grid_bin_xyzt.F} |   303 +-
 fer/efi/scat2grid_nbin_xyt.F                       |    16 +-
 fer/efi/scat2grid_subs.F                           |    23 +-
 fer/efi/separate.F                                 |     3 +
 fer/fmt/ascii_limits.F                             |    37 +-
 fer/fmt/aux_var_units.F                            |    15 +-
 fer/fmt/cx_dim_str.F                               |    38 +-
 fer/fmt/full_uvar_name.F                           |    24 +
 fer/fmt/full_uvar_name_xml.F                       |    18 +
 fer/fmt/lohi_world.F                               |    71 +-
 fer/fmt/var_title.F                                |    15 +-
 fer/fmt/var_title_mod.F                            |   125 +-
 fer/fmt/var_units.F                                |    14 +-
 fer/gnl/SOURCE_FILES                               |    21 +-
 fer/gnl/add_attribute.F                            |    16 +-
 fer/gnl/agg_clean_grids.F                          |   148 +
 fer/gnl/build_t_agg_axis.F                         |   583 +
 fer/gnl/cancel_data_set.F                          |   231 +-
 fer/gnl/cancel_one_data_set.F                      |   140 +
 fer/gnl/cdf_list.F                                 |    38 +-
 fer/gnl/check_member_sets.F                        |   100 +-
 .../full_uvar_name.F => gnl/choose_line_name.F}    |    79 +-
 fer/gnl/coached_str_sub.F                          |    22 +-
 fer/gnl/create_agg_axis.F                          |    66 +-
 fer/gnl/create_agg_dset.F                          |    61 +-
 fer/gnl/define_aggregate_grid.F                    |   421 -
 fer/gnl/define_ef_aggregate_grid.F                 |   638 +
 fer/gnl/define_special_grids.F                     |     6 +-
 fer/gnl/define_t_agg_mc_dset.F                     |   177 +
 fer/gnl/define_t_aggregation.F                     |   132 +
 fer/gnl/dollar_arg.F                               |    12 +-
 fer/gnl/errmsg.F                                   |    54 +-
 fer/gnl/fill_fmrc_time_gaps.F                      |   123 +
 fer/gnl/get_context_mods.F                         |    29 +-
 fer/gnl/get_fer_command.F                          |     7 +
 fer/gnl/get_mode_arg.F                             |     3 +-
 .../its_gksm.c => fer/gnl/get_upcase_flag.F        |    26 +-
 fer/gnl/init_aggregate_dset.F                      |   426 -
 fer/gnl/init_ef_aggregate_dset.F                   |   395 +
 fer/gnl/init_t_agg_mc_dset.F                       |   190 +
 fer/gnl/init_t_aggregate_dset.F                    |   136 +
 fer/gnl/initialize.F                               |    68 +-
 fer/gnl/{show_data_set_xml.F => is_agg_member.F}   |   129 +-
 fer/gnl/{create_agg_dset.F => its_fmrc_2dtime.F}   |    90 +-
 fer/gnl/line_facts.F                               |   147 +-
 fer/gnl/line_facts_xml.F                           |    13 +-
 fer/gnl/netcdf4_show_list_settings.F               |    17 +
 fer/gnl/ok_as_agg_var.F                            |   210 +
 fer/gnl/parse_command.F                            |   344 +-
 fer/gnl/pop_cs.F                                   |    18 +-
 fer/gnl/redefine_ax_att.F                          |     2 +-
 fer/gnl/repl_exprns.F                              |    25 +-
 fer/gnl/reset_ax_att.F                             |     2 +-
 fer/{mem/purge_dset.F => gnl/scalar_grid_line.F}   |    61 +-
 fer/gnl/set_agg_var_atts.F                         |   220 +
 fer/gnl/set_var.F                                  |    25 +-
 fer/gnl/show_1_mr.F                                |     5 +-
 fer/gnl/show_1_uvar_xml.F                          |    11 +-
 fer/gnl/show_data.F                                |     5 +-
 fer/gnl/show_data_files.F                          |    33 +-
 fer/gnl/show_data_set_attrs.F                      |   209 +-
 fer/gnl/show_data_set_params.F                     |    55 +-
 fer/gnl/show_data_set_vars.F                       |    25 +-
 fer/gnl/show_data_set_vars_xml.F                   |    87 +-
 fer/gnl/show_data_set_xml.F                        |    38 +-
 fer/gnl/show_diag_vars.F                           |   132 -
 fer/gnl/show_dyn_grids.F                           |    35 +-
 fer/gnl/show_grid.F                                |    25 +-
 fer/gnl/show_grid_string_xml.F                     |    15 +-
 fer/gnl/show_grid_xml.F                            |    20 +-
 fer/gnl/show_line.F                                |     9 +-
 fer/gnl/sort_fmrc_dsets.F                          |   233 +
 fer/gnl/sort_tseries_dsets.F                       |   146 +
 fer/grdel/fgd_gqpen.F                              |    53 +
 fer/ino/SOURCE_FILES                               |     2 -
 fer/ino/get_dset_parms.F                           |   323 -
 fer/ino/init_ez_dset.F                             |     2 +-
 fer/ino/make_cvar_grids.F                          |   116 -
 fer/ino/var_ss_lims.F                              |    31 +-
 fer/link.ppc64.sh                                  |    27 -
 fer/mem/SOURCE_FILES                               |     1 +
 fer/mem/create_full_range_context.F                |     7 +-
 fer/mem/deallo_uvar_grids.F                        |    62 +-
 fer/mem/delete_old_expr.F                          |     8 +-
 fer/mem/delete_user_var.F                          |    24 +-
 fer/mem/delete_user_var_sub.F                      |    48 +-
 fer/mem/erase_dset.F                               |    24 +-
 fer/mem/find_mem_var_incl_c_cache.F                |     3 +-
 fer/mem/find_var_name.F                            |    24 +-
 fer/mem/get_memory.F                               |     4 +-
 fer/mem/purge_dset.F                               |    37 +-
 fer/mem/purge_mr_grid.F                            |    15 +-
 fer/mem/{purge_dset.F => purge_one_dset.F}         |     3 +-
 fer/mem/var_code.F                                 |    16 +-
 fer/ocn/LIB_NAME                                   |     1 -
 fer/ocn/Makefile                                   |    37 -
 fer/ocn/SOURCE_FILES                               |    34 -
 fer/ocn/air_temp.F                                 |   132 -
 fer/ocn/calc_cvar.F                                |   740 -
 fer/ocn/conv_adj_mask.F                            |   160 -
 fer/ocn/cvar_context.F                             |   243 -
 fer/ocn/ew_hadvec.F                                |   140 -
 fer/ocn/expl_coriolis.F                            |   163 -
 fer/ocn/fuw.F                                      |   150 -
 fer/ocn/fvn.F                                      |   152 -
 fer/ocn/gfdl_terms.F                               |   233 -
 fer/ocn/grad_p_clinic.F                            |   215 -
 fer/ocn/hflux.F                                    |   176 -
 fer/ocn/hradiation.F                               |   162 -
 fer/ocn/knudsen.F                                  |   162 -
 fer/ocn/prof.F                                     |   175 -
 fer/ocn/sn_hadvec.F                                |   150 -
 fer/ocn/state.F                                    |   238 -
 fer/ocn/u_from_psi.F                               |   133 -
 fer/ocn/vel_adv_ew.F                               |   161 -
 fer/ocn/vel_adv_ns.F                               |   153 -
 fer/ocn/vel_adv_z.F                                |   168 -
 fer/ocn/vel_by_grad_p.F                            |   115 -
 fer/ocn/vel_by_wind.F                              |   140 -
 fer/ocn/vel_dif_xy.F                               |   236 -
 fer/ocn/vel_dif_z.F                                |   186 -
 fer/ocn/w_on_ts.F                                  |   216 -
 fer/ocn/w_on_uv.F                                  |   170 -
 fer/ocn/wind_stress.F                              |   182 -
 fer/ocn/xy_hdiffus.F                               |   145 -
 fer/ocn/z_hadvec.F                                 |   178 -
 fer/ocn/z_hdiffus.F                                |   174 -
 fer/plt/SOURCE_FILES                               |     2 +
 fer/plt/axis_format.F                              |    11 +
 fer/plt/box_label.F                                |    76 +-
 fer/plt/choose_cx_ww.F                             |    32 +-
 fer/plt/disp_data_set_up.F                         |     8 +
 fer/plt/disp_init.F                                |    13 +-
 fer/plt/disp_labels.F                              |     3 +-
 fer/plt/disp_prep.F                                |    22 +-
 fer/plt/disp_reset.F                               |     4 +-
 fer/plt/disp_set_up.F                              |    88 +-
 fer/plt/line_style.F                               |    15 +-
 .../lon_lat_fmt.F}                                 |    63 +-
 fer/plt/plot_along_data_set_up.F                   |   224 +
 fer/plt/plot_set_up.F                              |    55 +-
 fer/plt/polygon_set_up.F                           |    33 +-
 fer/plt/setup_keys.F                               |    15 +-
 fer/plt/taxis_style.F                              |    11 +-
 fer/pyf/SOURCE_FILES                               |     1 +
 fer/pyf/get_str_data_array_params.F                |   169 +
 fer/rpn/break_varattname.F                         |     6 +
 fer/rpn/break_varname.F                            |     9 +-
 fer/rpn/init_uvar.F                                |    20 +-
 fer/rpn/init_uvar_sub.F                            |    51 +-
 fer/special/.gitignore                             |     3 +
 fer/special/ferret_dispatch.F                      |     2 -
 fer/stk/SOURCE_FILES                               |     3 +-
 .../aux_var_units.F => stk/conformable_agg_grid.F} |   113 +-
 fer/stk/get_axis_speed.F                           |     2 +
 fer/stk/get_prot_cmnd_data.F                       |    66 +-
 fer/stk/get_uvar_grid.F                            |     9 +-
 fer/stk/interp_stack.F                             |    95 +-
 fer/stk/is_aggregate_gather.F                      |   253 +-
 fer/stk/is_aggregate_grid.F                        |     6 +-
 fer/stk/is_algebra.F                               |    37 +-
 fer/stk/is_attrib_val.F                            |    45 +-
 fer/stk/is_auxvar_regrid.F                         |    23 +-
 fer/stk/is_calc.F                                  |   191 -
 fer/{ocn/hourly_data.F => stk/is_dummy.F}          |    63 +-
 fer/stk/is_regrid.F                                |     9 +-
 fer/stk/is_strip.F                                 |   188 +-
 fer/stk/is_uvar_grid.F                             |   241 +-
 fer/stk/known_grid.F                               |    18 +-
 fer/utl/SOURCE_FILES                               |    13 +
 .../its_gksm.c => fer/utl/acts_like_fvar.F         |    26 +-
 fer/utl/axis_intervals.F                           |    26 +-
 fer/utl/cal_factr.F                                |    25 +-
 fer/utl/copy_agg_into.F                            |    20 +-
 fer/utl/{make_step_axis.F => define_climat_att.F}  |    78 +-
 fer/utl/display_dependency_sub.F                   |     4 +-
 .../ensemble_member_dset.F}                        |    64 +-
 fer/{ocn/mesh.F => utl/free_uvar_grids.F}          |    57 +-
 fer/utl/gcf_impose_axes.F                          |     9 +
 .../get_saved_uvar_aux_info.F}                     |    73 +-
 .../get_saved_uvar_grid.F}                         |    62 +-
 .../get_saved_uvar_grid_list_len.F}                |    62 +-
 .../purge_dset.F => utl/get_string_element_1d_x.F} |    48 +-
 fer/utl/igrid.F                                    |     8 +-
 fer/utl/inherit_attrs.F                            |    13 +-
 fer/utl/make_step_axis.F                           |    26 +-
 fer/utl/report_dependency.F                        |    17 +-
 .../its_gksm.c => fer/utl/reset_climat_att.F       |    29 +-
 .../save_uvar_aux_info.F}                          |    73 +-
 .../utl/save_uvar_grid.F                           |    66 +-
 fer/utl/secs_to_date_out.F                         |    15 +-
 fer/{ocn/hourly_data.F => utl/t0_adjust.F}         |    61 +-
 fer/{ocn/hourly_data.F => utl/t0_adjust_init.F}    |    75 +-
 fer/utl/transfer_axis.F                            |     1 -
 fer/utl/transfer_cx_axis_to_uv.F                   |     1 -
 fer/utl/transfer_uv_axis_to_uv.F                   |     1 -
 fer/utl/tstep_to_date.F                            |    15 +-
 fer/utl/update_attributes.F                        |    30 +-
 fer/xeq/xeq_annotate.F                             |    18 +-
 fer/xeq/xeq_cancel.F                               |    56 +-
 fer/xeq/xeq_contour.F                              |    40 +-
 fer/xeq/xeq_define.F                               |   291 +-
 fer/xeq/xeq_go.F                                   |    20 +-
 fer/xeq/xeq_plot.F                                 |    80 +-
 fer/xeq/xeq_polygon.F                              |    13 +-
 fer/xeq/xeq_pplus.F                                |    18 +-
 fer/xeq/xeq_set.F                                  |    73 +-
 fer/xeq/xeq_shade.F                                |    42 +-
 fer/xeq/xeq_show.F                                 |   108 +-
 fer/xeq/xeq_vector.F                               |     3 +-
 fmt/cmn/NCF_Util.h                                 |    39 +-
 fmt/cmn/gt_lib.parm                                |    44 +-
 fmt/cmn/tmap_dims.parm                             |    17 +-
 fmt/cmn/tmap_errors.parm                           |    17 +-
 fmt/cmn/xdset_info.cmn_text                        |    47 +-
 fmt/cmn/xrisc_buff.cmn                             |     2 +
 fmt/cmn/xunits.cmn_text                            |     7 +
 fmt/src/NCF_Util.c                                 |   558 +-
 fmt/src/SOURCE_FILES                               |    12 +-
 fmt/src/cd_1d_line_from_2d.F                       |   105 +-
 fmt/src/cd_add_var.F                               |     4 +
 fmt/src/cd_axis_name.F                             |    18 +-
 fmt/src/cd_clean_grids.F                           |    20 +-
 fmt/src/cd_consistent_axis_orient.F                |    18 +-
 fmt/src/cd_get_1_axis.F                            |    21 +-
 fmt/src/cd_get_1_dep_var.F                         |     6 +-
 fmt/src/cd_get_agg_var_info.F                      |     5 +
 fmt/src/cd_get_calendar_name.F                     |     0
 fmt/src/cd_get_generic_bounds.F                    |    11 +-
 fmt/src/cd_get_generic_grids.F                     |    65 +-
 fmt/src/cd_get_t0.F                                |   181 +
 fmt/src/cd_get_var_att_id.F                        |     7 +
 fmt/src/cd_get_var_id.F                            |    81 +-
 fmt/src/cd_get_var_info.F                          |     3 +
 fer/ocn/cmesh.F => fmt/src/cd_get_var_uvflag.F     |    56 +-
 fmt/src/cd_init_dset.F                             |    31 +-
 fmt/src/cd_isit_recdim.F                           |     4 +-
 fmt/src/cd_load_dset_attrs.F                       |    10 +-
 fmt/src/cd_make_fmrc_axes.F                        |    26 +-
 fmt/src/cd_make_fmrc_fcal_axis.F                   |     4 +-
 fmt/src/cd_make_var.F                              |    16 +-
 fmt/src/cd_ncclose.F                               |    20 +-
 fmt/src/cd_quik_ncopen.F                           |   204 +
 fmt/src/cd_rd_r8_as_r4.c                           |     1 +
 fmt/src/cd_read.F                                  |     7 +
 fmt/src/cd_scan_aux_coords.F                       |    11 +-
 fmt/src/cd_set_compress.F                          |    21 +-
 fmt/src/cd_write_attrib.F                          |     7 +-
 fmt/src/cd_write_axis.F                            |    49 +-
 fmt/src/deleted_list_clear.c                       |     3 +-
 fmt/src/deleted_list_get_del.c                     |     1 +
 fmt/src/deleted_list_get_undel.c                   |     1 +
 fmt/src/deleted_list_init.c                        |     1 +
 fmt/src/deleted_list_modify.c                      |     1 +
 fmt/src/ez_delimited_read.c                        |     1 -
 fmt/src/fbits.h                                    |     1 -
 fmt/src/mc_init_dset.F                             |    24 +-
 fmt/src/mc_read.F                                  |     3 +-
 fmt/src/nc.h                                       |     1 -
 fmt/src/nc_get_attrib.F                            |     4 +-
 fmt/src/nc_get_attrib_string.F                     |     4 +-
 fmt/src/ncconfig.h                                 |     1 -
 fmt/src/ncio.h                                     |     3 +-
 fmt/src/str_case_blind_compare_sub.c               |     1 +
 fmt/src/str_dncase_sub.c                           |     1 +
 fmt/src/str_upcase_sub.c                           |     1 +
 fmt/src/string_array_clear.c                       |     1 +
 fmt/src/string_array_find.c                        |     1 +
 fmt/src/string_array_find_caseblind.c              |     1 +
 fmt/src/string_array_find_exact.c                  |     1 +
 fmt/src/string_array_find_quoted.c                 |     1 +
 fmt/src/string_array_get_strlen.c                  |     1 +
 fmt/src/string_array_get_strlen1.c                 |     1 +
 fmt/src/string_array_hash.c                        |     1 +
 fmt/src/string_array_init.c                        |     1 +
 fmt/src/string_array_modify.c                      |     1 +
 fmt/src/string_array_modify_upcase.c               |     1 +
 fmt/src/tm_allo_tmp_line.F                         |     3 +-
 fmt/src/{cd_ncclose.F => tm_bad_epic.F}            |    45 +-
 fmt/src/tm_blockify_ferret_strings.c               |     2 +
 fmt/src/tm_check_bnds_attrib.F                     |     9 +-
 ...k_bnds_attrib.F => tm_check_fmrc_bnds_attrib.F} |    43 +-
 fmt/src/tm_close_set.F                             |   202 +-
 .../{tm_close_set.F => tm_close_set_cond_deallo.F} |    27 +-
 fmt/src/tm_copy_line.F                             |     2 +
 fmt/src/tm_fmt_user.F                              |   405 +
 fmt/src/tm_get_like_dyn_line.F                     |     2 +
 fmt/src/tm_get_linematch.F                         |    29 +-
 fmt/src/tm_get_linematch_sub.F                     |     2 +
 fmt/src/tm_get_strlen.c                            |     1 +
 fmt/src/tm_init_dset.F                             |    67 +-
 .../its_gksm.c => fmt/src/tm_its_index_axis.F      |    34 +-
 fmt/src/tm_make_basic_axis.F                       |     5 +-
 fmt/src/tm_make_dyn_line.F                         |     2 +
 fmt/src/tm_match_capital_name.c                    |     1 +
 fmt/src/tm_purge_tmp_grids.F                       |    54 +-
 fmt/src/{cd_ncclose.F => tm_rm_tmp_grid.F}         |    49 +-
 fmt/src/{cd_ncclose.F => tm_rm_tmp_line.F}         |    51 +-
 fmt/src/tm_set_free_event.c                        |     2 +
 fmt/src/tm_unix_versions.c                         |     1 -
 .../{cd_get_calendar_name.F => tm_warn_subspan.F}  |    77 +-
 fmt/src/tm_world_recur.c                           |    46 +
 fmt/src/xdset_info_data.F                          |    67 +-
 fmt/src/xerror_text_data.F                         |     4 +
 fmt/src/xgt_grid_data.F                            |   413 +-
 jnls/contrib/def_monthaxis_days.jnl                |     3 -
 jnls/contrib/ratio_set.jnl                         |     3 -
 jnls/contrib/taylor_agraticule.jnl                 |     3 -
 jnls/contrib/taylor_example1.jnl                   |     3 -
 jnls/contrib/taylor_frame.jnl                      |     3 -
 jnls/contrib/taylor_frame_accurate.jnl             |     3 -
 jnls/contrib/taylor_label.jnl                      |     3 -
 jnls/contrib/taylor_plot.jnl                       |     3 -
 jnls/contrib/taylor_polymark.jnl                   |     3 -
 jnls/contrib/taylor_rgraticule.jnl                 |     3 -
 jnls/contrib/taylor_rmscircles.jnl                 |     3 -
 jnls/contrib/taylor_wtarea.jnl                     |     3 -
 jnls/examples/annotate_demo.jnl                    |    88 +
 jnls/examples/ccbar_demo.jnl                       |     8 +
 jnls/examples/constant_array_demo.jnl              |    14 -
 jnls/examples/dods_demo.jnl                        |    36 +-
 jnls/examples/ef_fft_demo.jnl                      |    30 +-
 jnls/examples/ef_sort_demo.jnl                     |    20 +-
 jnls/examples/graticules_demo.jnl                  |    24 +-
 jnls/examples/land_detail_demo.jnl                 |     8 +-
 jnls/examples/objective_analysis_demo.jnl          |    84 +-
 jnls/examples/opendap_demo.jnl                     |     9 +
 jnls/examples/palette_demo.jnl                     |     9 +-
 jnls/examples/topo_palette_demo.jnl                |     2 +-
 jnls/examples/trackplot_demo.jnl                   |    14 +-
 jnls/go/define_12_colors.jnl                       |    20 +
 palettes/QC_V3_by_level.spk                        |     4 +-
 palettes/blue_gold.spk                             |     0
 palettes/mpl_PSU_inferno.spk                       |   104 +
 palettes/mpl_PSU_magma.spk                         |   104 +
 palettes/mpl_PSU_plasma.spk                        |   104 +
 palettes/mpl_PSU_viridis.spk                       |   105 +
 palettes/parula.spk                                |    67 +
 palettes/rainbow3.spk                              |     8 +
 platform_specific.mk.i386-apple-darwin             |   171 -
 platform_specific.mk.i386-linux                    |    23 +-
 platform_specific.mk.i386-linux-gnu                |    25 +-
 platform_specific.mk.intel-mac                     |    62 +-
 platform_specific.mk.x86_64-linux                  |    24 +-
 platform_specific.mk.x86_64-linux-gnu              |    32 +-
 ppl/Makefile                                       |     6 -
 ppl/complot/Makefile                               |     6 -
 ppl/include/AXIS.INC                               |     7 +-
 ppl/include/CONT.INC                               |     4 +-
 ppl/include/LINES.INC                              |     3 +-
 ppl/include/TAXIS.INC                              |     7 +-
 ppl/ourlib/Makefile                                |     6 -
 ppl/plot/Makefile                                  |     6 -
 ppl/plot/daxis.F                                   |    11 +-
 ppl/plot/labdrw.F                                  |     8 +-
 ppl/plot/lev.F                                     |    11 +-
 ppl/plot/plotxy.F                                  |    18 +-
 ppl/plot/plotxy_ribbon.F                           |    14 +-
 ppl/plot/plotz.F                                   |    50 +-
 ppl/plot/pltit.F                                   |    25 +-
 ppl/plot/pplcmd_f.F                                |    79 +-
 ppl/plot/ppldata.F                                 |     3 +-
 ppl/plot/pplldx.F                                  |     7 +
 ppl/plot/prmtiv.F                                  |     8 +-
 ppl/plot/setax.F                                   |     3 +
 ppl/plot/vecfld.F                                  |    19 +-
 ppl/plotlib/Makefile                               |     6 -
 ppl/plotlib/SOURCE_FILES                           |     2 +
 ppl/plotlib/contur.F                               |    16 +
 ppl/plotlib/numcde.F                               |    86 +-
 ppl/plotlib/numcde_off.F                           |    87 +-
 ppl/plotlib/taxis.F                                |    17 +-
 ppl/plotlib/taxis0.F                               |   224 +-
 ppl/plotlib/{taxis0.F => taxis4.F}                 |    47 +-
 ppl/plotlib/tayis.F                                |    21 +-
 ppl/plotlib/tayis0.F                               |   230 +-
 ppl/plotlib/tayis3.F                               |    15 +-
 ppl/plotlib/{tayis0.F => tayis4.F}                 |    51 +-
 ppl/plotlib/xaxis1.F                               |    44 +-
 ppl/plotlib/yaxis1.F                               |    80 +-
 ppl/pplepic/Makefile                               |     6 -
 ppl/pplusr/Makefile                                |     6 -
 ppl/symlib/Makefile                                |     6 -
 ppl/tmap_inc/axis_inc.decl                         |     8 +
 ppl/tmap_inc/cont_inc.decl                         |     2 +
 ppl/tmap_inc/lines_inc.decl                        |     2 +
 ppl/tmap_inc/taxis_inc.decl                        |     4 +
 ppl/tmapadds/Makefile                              |     6 -
 ppl/tmapadds/SOURCE_FILES                          |     1 +
 ppl/tmapadds/compute_mnstd.F                       |    34 +-
 ppl/tmapadds/fillpoly.F                            |   108 +-
 ppl/tmapadds/get_ndx.F                             |     3 +-
 ppl/tmapadds/its_gksm.c                            |     2 +
 ppl/tmapadds/key.F                                 |   137 +-
 ppl/tmapadds/reallo_envelope.c                     |     1 +
 ppl/tmapadds/set_levels_shade_fill.F               |    39 +-
 ppl/tmapadds/{its_gksm.c => set_t1_date.F}         |    30 +-
 ppl/tmapadds/setlab_syms.F                         |    26 +-
 pviewmod/cmndhelperpq.py                           |     2 +-
 pyfermod/__init__.py                               |  1398 +-
 pyfermod/datamethods.py                            |   990 +
 pyfermod/feraggdset.py                             |   162 +
 pyfermod/feraxis.py                                |   486 +
 pyfermod/ferdset.py                                |   348 +
 pyfermod/fergrid.py                                |   197 +
 pyfermod/fermethods.py                             |   569 +
 pyfermod/ferpyvar.py                               |   173 +
 pyfermod/ferrdataset.py                            |    24 -
 pyfermod/ferrdatavar.py                            |    22 -
 pyfermod/ferregion.py                              |   247 +
 pyfermod/ferrvar.py                                |    22 -
 pyfermod/fervar.py                                 |  1038 +
 pyfermod/libpyferret.c                             |   396 +-
 pyfermod/pyefmethods.py                            |   346 +
 pyfermod/pyferret.h                                |    15 +
 setup.py                                           |    70 +-
 site_specific.mk                                   |    28 +-
 threddsBrowser/.gitignore                          |     2 +
 threddsBrowser/Makefile                            |     5 +-
 712 files changed, 103662 insertions(+), 38227 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