updates for ribbon plots of DSG trajectory data

Author: AnsleyManke

bench/test_results/ferret_run_tests_rh6_log

@@ -62,6 +62,7 @@ SUBROUTINE DSG_TRAJ_PLOT_SET_UP(
 * V760 *acm* 4/20 PLOT_DSG_CHECK_LON360 now applies a lon-360 conversion of the 
 *                 longitudes if it'll be better and /HLIM not given
 * V760 *acm* 5/20 initialize dep_dim. Was unset when we get latitude from the DSG dataset
+* V762 *acm* 8/20 Add a second test for is this a trajectory ribbon plot.
 
 	include 'tmap_dims.parm'
 	include 'xtm_grid.cmn_text'
@@ -271,7 +272,7 @@ SUBROUTINE DSG_TRAJ_PLOT_SET_UP(
      .                      status)
 	   IF (npts .NE. obsdimlen) THEN
 	      status = 0
-	      GOTO 5140
+	      GOTO 4000
 	   ENDIF
 	   numcx = 1  ! The context should come from the color-by var
 	   CALL GRP_CX_DOC( cx_list(nmv), numcx, cx_plot, key_doc )
@@ -446,7 +447,7 @@ SUBROUTINE DSG_TRAJ_PLOT_SET_UP(
      .                          status  )
 	      IF (npts .NE. obsdimlen) THEN
 	         status = 0
-	         GOTO 5140
+	         GOTO 4000
 	      ENDIF
 	   ENDIF
 
@@ -784,6 +785,10 @@ SUBROUTINE DSG_TRAJ_PLOT_SET_UP(
 	status = ferr_ok
 	IF (overlay) iautot = iautot_save
 	RETURN
+	
+* not trajectory after all, will just do a ribbon-plot.
+
+ 4000	RETURN
 
 * error exit
  5000	CALL PPLCMD ( from, line, 0, 'NLINES', 1, 1 )	! wipe buffers clean

fer/plt/dsg_traj_plot_set_up.F

@@ -231,7 +231,7 @@ SUBROUTINE PLOT_SET_UP(
 *                 such as"go fland" will work. (DSG and non-DSG data.)
 * V760 *acm* 4/20 Similarly, if PLOT/VS and a depth coord var is on the vertical
 *                 axis, reverse the axis to run DEEP:SHALLOW
-
+* V762 *acm* 8/20 Add a second test for is this a trajectory ribbon plot.
 
         IMPLICIT NONE
 	include 'tmap_dims.parm'
@@ -419,6 +419,7 @@ SUBROUTINE PLOT_SET_UP(
      .              overlay, no_labels, symbol, sym_size, color, color1, 
      .              use_line, do_dash, dashstyle, nokey, its_traj, only_val, 
      .              skipsym, mv_list, cx_list, numv, indep_dat, dep_dat, status )
+		  IF (numv.EQ.3 .AND. status.NE.ferr_ok) GOTO 2000  ! not traj after all, just a ribbon plot
 		  GOTO 1000
 	       ENDIF
 
@@ -430,6 +431,8 @@ SUBROUTINE PLOT_SET_UP(
 
 * initialize
 
+ 2000	CONTINUE
+
 	dep_max = arbitrary_small_val8
 	dep_min = arbitrary_large_val8
 	ind_max = arbitrary_small_val8

fer/plt/plot_set_up.F

@@ -209,8 +209,12 @@ SUBROUTINE CD_DSG_SCAN_VARS(dset, cdfid, errstr, status)
      .                 orient .EQ. pfeatureType_TimeseriesProfile)
 
 	IF (cmpnd_ftype) THEN
+	   ftrname = CD_DSG_FEATURENAME ( orient ) 
 	   i = MAX(INDEX(ftrname, 'Profile'), INDEX(ftrname, 'profile'))
 	   index_dir_buff = ftrname(:i-1)//'_id'
+
+	   IF (redo_lonlat) ftrname = CD_DSG_FEATURENAME (dsg_orientation(dset))
+
 	ENDIF
 
 * First find probable coordinate variabes - if the axis attribute is
@@ -626,14 +630,6 @@ SUBROUTINE CD_DSG_SCAN_VARS(dset, cdfid, errstr, status)
 	   has_DSG_coordinates = (ndims .EQ. 4)
 	ENDIF
 
-* If this is a timeseriesProfile dataset, then the X-Y coordinates are in
-* the timeseries instance-dimension direction. Use the station index variable
-* to redefine the dsg-coordiate variables for the translation grid to list these 
-* coordinates in the profile dimension.  The test when orient is profile is
-* for the case when the user has said USE/feature=profile for a TimeseriesProfile set.
-
-	IF (redo_lonlat) CALL CD_DSG_TP_TO_PROF (dset)
-
 * A valid DSG contiguous ragged dataset must have a rowSize variable
 * and coordinates on the dsg_orientation axis. If they erroneously set
 * the /FEATURETYPE to an invalid direction, that's an error. Otherwise
@@ -794,6 +790,16 @@ SUBROUTINE CD_DSG_SCAN_VARS(dset, cdfid, errstr, status)
 	   ENDIF
 
 	ENDIF
+	
+
+* If this is a timeseriesProfile dataset, then the X-Y coordinates are in
+* the timeseries instance-dimension direction. Use the station index variable
+* to redefine the dsg-coordiate variables for the translation grid to list these 
+* coordinates in the profile dimension.  The test when orient is profile is
+* for the case when the user has said USE/feature=profile for a TimeseriesProfile set.
+
+	IF (redo_lonlat) CALL CD_DSG_TP_TO_PROF (dset)
+
 
 *   * * * * * * * * * * * * * * * * * * * * * * * * 
 * pass through the variable names making sure that case-sensitive

fmt/src/cd_dsg_scan_vars.F

@@ -68,6 +68,7 @@ SUBROUTINE PLOTXY(X,NXS,XF,YF,IPV)
 * V698  4/16 *acm* New PLOT/SKIP=
 * V73  3/18 *kms*  For clarity, append MD to makedot.cmn values IPT, XDOT, 
 *                  and YDOT; make MDOT (99) a makedot.cmn parameter DOTSYMIM
+* V762  8/20 *acm* Don't draw outside plot edges when doing modulo correction.
 
         include         'xinterrupt.cmn' ! 1/89 *sh*
         include         'ppl_in_ferret.cmn'
@@ -316,8 +317,10 @@ SUBROUTINE PLOTXY(X,NXS,XF,YF,IPV)
 * the new point on new wrap, then go on.
 		  IF (xadd .NE. xaddlast) THEN
 		     datxlast = datx - xadd + xaddlast
-		     CALL TRANS(I,datxlast,daty,XT,YT)
-		     CALL PLOT(xt,yt,idn,0)
+		     IF (datxlast.LT.xhi .AND. datxlast.GT.xlo) THEN
+		        CALL TRANS(I,datxlast,daty,XT,YT)
+		        CALL PLOT(xt,yt,idn,0)
+		     ENDIF
 		     CALL TRANS(I,datx,daty,XT,YT)
 		     CALL PLOT(XT,YT,0,0)
 		     CALL PLOT(XT,YT,IDN,0)

ppl/plot/plotxy.F

@@ -72,6 +72,7 @@ SUBROUTINE PLOTXY_RIBBON(X,NXS,XF,YF)
 * V698  4/16 *acm* New PLOT/NTH=
 * V73  3/18 *kms*  For clarity, append MD to makedot.cmn values IPT, XDOT, 
 *                  and YDOT; make MDOT (99) a makedot.cmn parameter DOTSYMIM
+* V762  8/20 *acm* Don't draw outside plot edges when doing modulo correction.
 
         include         'xinterrupt.cmn' ! 1/89 *sh*
         include         'ppl_in_ferret.cmn'
@@ -363,14 +364,15 @@ SUBROUTINE PLOTXY_RIBBON(X,NXS,XF,YF)
 
 	          IF (line_ndx .LT. 1) line_ndx = 1
 
-	          IF ( colr_ndx.NE.last_colr_ndx) THEN
+	          IF ( colr_ndx.NE.last_colr_ndx ) THEN
 
 * In default (not fast) mode, draw sub-segments filling in all the colors
 * corresponding to the index range between the color at this point and the
 * color at the previous point.
 
 		     IF (.NOT.RIBBON_FAST .AND. 
      .                    .NOT.isbad .AND. .NOT.last_bad .AND.
+     .                    last_colr_ndx.GT.0 .AND.
      .                    ABS(colr_ndx-last_colr_ndx) .GT. 1 .AND.
      .                    (.NOT.new_branch) .AND. ITYPE(I).NE.3) THEN