Merge branch 'master' of https://github.com/ACManke/PyFerret into dev

NOAA-PMEL · Sep 21, 2021 · b02f15d · b02f15d
2 parents 6cb29cb + 4acd168
commit b02f15d
Show file tree

Hide file tree

Showing 27 changed files with 15 additions and 141,630 deletions.
diff --git a/bench/run_all_logs.pyferret_dunkel_err b/bench/run_all_logs.pyferret_dunkel_err
diff --git a/bench/run_all_logs.pyferret_dunkel_log b/bench/run_all_logs.pyferret_dunkel_log
diff --git a/bench/test_results/dsg_points_plot.png b/bench/test_results/dsg_points_plot.png
diff --git a/bench/test_results/dsg_traj_1.png b/bench/test_results/dsg_traj_1.png
diff --git a/bench/test_results/dsg_traj_2.png b/bench/test_results/dsg_traj_2.png
diff --git a/bench/test_results/dsg_traj_3.png b/bench/test_results/dsg_traj_3.png
diff --git a/bench/test_results/dsg_traj_4.png b/bench/test_results/dsg_traj_4.png
diff --git a/bench/test_results/dsg_trajprof_traj.png b/bench/test_results/dsg_trajprof_traj.png
diff --git a/bench/test_results/dsg_tseries_plot_2.png b/bench/test_results/dsg_tseries_plot_2.png
diff --git a/bench/test_results/dsg_use_feature.png b/bench/test_results/dsg_use_feature.png
diff --git a/bench/test_results/plot_alongxy_dsg.png b/bench/test_results/plot_alongxy_dsg.png
diff --git a/bench/test_results/pyferret_run_tests_err b/bench/test_results/pyferret_run_tests_err
@@ -296,7 +296,7 @@ Re-defining viewport UM6
 plot/over/i=1:10/color=noexist i
 Executed by script: *** GO bn_plot.jnl ***
  **ERROR: value out of legal range: thick=4
-          When color is not specified, only 1, 2, or 3 is acceptable
+          When color is not specified or for ribbon plot only 1, 2, or 3 is acceptable
 plot/over/i=1:10/thick=4 i
 Executed by script: *** GO bn_plot.jnl ***
  **ERROR: value out of legal range: size=-1

diff --git a/bench/test_results/pyferret_run_tests_log b/bench/test_results/pyferret_run_tests_log
@@ -76289,8 +76289,10 @@ set mode/last ignore
 ! See if the F-TDS is working and bail if not.
 let status = TEST_OPENDAP("https://data.pmel.noaa.gov/nvods/thredds/dodsC/las/COADS-climatology/data_coads_climatology.jnl")
 load status
-if `status NE 0` then EXIT/SCRIPT
- !-> if 0 then EXIT/SCRIPT
+if `status NE 0` then
+ !-> if 0 then
+endif
+
 use "https://data.pmel.noaa.gov/nvods/thredds/dodsC/las/woa05_annual/data_https___data.pmel.noaa.gov_pmel_thredds_dodsC_data_PMEL_WOA05nc_annual_t00an1.nc.jnl"
 let/D=1/remote myvar = t00an1[k=1:5@sum]
 let/D=1/remote ave_z = t00an1[z=0:20@ave]
@@ -112925,7 +112927,7 @@ LIST /PREC=6 /X=12E /Y=12S /Z=5.0 value
  02-MAY-2021 / 245:  5.63651
  02-JUN-2021 / 246:  4.96113
  02-JUL-2021 / 247:  4.30451
- DD-MON-YYYY / 248:  3.74505
+ 01-AUG-2021 / 248:  3.74505
  01-SEP-2021 / 249:  3.41025
  01-OCT-2021 / 250:  3.36147
  01-NOV-2021 / 251:  3.60787
@@ -132079,7 +132081,9 @@ GO bn_reset
 cancel mode verify
 ooooooooooooooooooooooooooooooooooooooooooo
 GO err763_din.jnl
-
+! err763_din
+! See pyferret issue # 91
+!
 ! Tests of @DIN when the region requested lies inside one grid cell
 ! the results prevoiusly retuned 1.0 times the units for those steps
 
@@ -132245,7 +132249,7 @@ set view lower
 plot/vs/line/thick/hlim=50:160/vlim=-90:0/noax xs, ys
 plot/vs/over/nolab/line/thick/color=blue/axes xs, ys-20
 
- 
+frame/file=plot_vs_over_axes.png
 *** Running ferret script: bn_gif.jnl
 ! bn_gif.jnl
 ! do not use /text= in def view in PyFerret
@@ -137899,7 +137903,7 @@ FerVar(varname='sstcopy', dsetname='', title = '', defn='sstcopy')
 >>> print repr(pyferret.anondset.sstcopy._isfilevar)
 False
 >>> print repr(pyferret.anondset.sstcopy._requires)
-{'SSTCOPY', 'SST'}
+{'SST', 'SSTCOPY'}
 >>> print repr(coads.sst)
 FerVar(varname='SST', dsetname='coads_climatology.cdf', title = '', defn='SST[d=coads_climatology.cdf]')
 >>> print repr(coads.sst._isfilevar)

diff --git a/bench/test_results/regrid_to_dsg_traj.png b/bench/test_results/regrid_to_dsg_traj.png
diff --git a/bench/test_results/ribbon_set_ppl_plot.png b/bench/test_results/ribbon_set_ppl_plot.png
diff --git a/bench/test_results/symbolcolors.pdf b/bench/test_results/symbolcolors.pdf
diff --git a/bench/test_results/symbolcolors.png b/bench/test_results/symbolcolors.png
diff --git a/bench/test_results_noremote/dsg_traj_1.png b/bench/test_results_noremote/dsg_traj_1.png
diff --git a/bench/test_results_noremote/dsg_traj_2.png b/bench/test_results_noremote/dsg_traj_2.png
diff --git a/bench/test_results_noremote/dsg_traj_3.png b/bench/test_results_noremote/dsg_traj_3.png
diff --git a/bench/test_results_noremote/dsg_trajprof_traj.png b/bench/test_results_noremote/dsg_trajprof_traj.png
diff --git a/bench/test_results_noremote/plot_alongxy_dsg.png b/bench/test_results_noremote/plot_alongxy_dsg.png
diff --git a/bench/test_results_noremote/ribbon_set_ppl_plot.png b/bench/test_results_noremote/ribbon_set_ppl_plot.png
diff --git a/bench/test_results_noremote/symbolcolors.pdf b/bench/test_results_noremote/symbolcolors.pdf
diff --git a/bench/test_results_noremote/symbolcolors.png b/bench/test_results_noremote/symbolcolors.png
diff --git a/fer/plt/equal_thick.F b/fer/plt/equal_thick.F
@@ -43,6 +43,7 @@ SUBROUTINE EQUAL_THICK(strng, dfltthick, icolor, ipen, istat)
 * only a thickness of 1.0, 2.0, or 3.0 (or no "=value", which becomes
 * 2.0) is accepted.  In these cases, ipen = icolor, icolor-10, or icolor-20
 *
+* 9/15/2021 *ACM* clarify error message for /thick setting
 
         IMPLICIT NONE
 
@@ -164,7 +165,7 @@ SUBROUTINE EQUAL_THICK(strng, dfltthick, icolor, ipen, istat)
  5030   risc_buff = strng
         CALL ERRMSG(ferr_out_of_range, istat, 
      .              risc_buff(:TM_LENSTR1(risc_buff))//
-     .              pCR//'When color is not specified, '//
+     .              pCR//'When color is not specified or for ribbon plot '//
      .              'only 1, 2, or 3 is acceptable',
      .              *5000)
 

diff --git a/fer/xeq/xeq_plot.F b/fer/xeq/xeq_plot.F
@@ -136,6 +136,7 @@ SUBROUTINE XEQ_PLOT
 * V76  1/20 *acm*  working with Point-type dsg data
 * V76  4/20 *acm*  New flag ribbon_on so that RIBBON/SET; PPL PLOT works correctly
 * v763 *acm* 9/20  Ribbon plots of id-variables in trajectory-profile, timeseries-profile data
+* v764+ *acm* 9/21  Fix implementation of /THICK for ribbon plots.
 
 	IMPLICIT NONE
 	include 'tmap_dims.parm'
@@ -498,7 +499,7 @@ SUBROUTINE XEQ_PLOT
 	IF ( ribbon_plot  ) THEN
 	   CALL RIBBON_PLOT_SET_UP (versus, num_uvars_in_cmnd, addgaps, 
      .	      dsg_as_traj, idir, thick, overlay, spectrum, status)
-	   color = thick
+	   ipen = thick
 
 	   IF (dsg_as_traj .AND. idir.EQ.x_dim .AND.
      .	       qual_given(slash_plot_line).EQ.0 ) use_line = .TRUE.