Changeset 25929

Timestamp:

01/05/21 19:59:08 (4 years ago)

Author:

jdquinn

Message:

CHG: Changes to plotting of partition overlay; minor clean up

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (2 diffs)
• src/m/plot/applyoptions.m (modified) (1 diff)
• src/m/plot/plotdoc.m (modified) (1 diff)
• src/m/plot/plotdoc.py (modified) (1 diff)

issm/trunk-jpl/m4/issm_options.m4

@@ -342 +342 @@
                 HAVE_MATLAB=no
         else
-                HAVE_MATLAB=yes
                 if ! test -d "${MATLAB_ROOT}"; then
                         AC_MSG_ERROR([MATLAB directory provided (${MATLAB_ROOT}) does not exist!]);
@@ -349 +348 @@
                         AC_MSG_ERROR([Couldn't find mex.h... check your installation of MATLAB])
                 fi
+                HAVE_MATLAB=yes
         fi
         AC_MSG_RESULT([${HAVE_MATLAB}])

issm/trunk-jpl/src/m/plot/applyoptions.m

@@ -448 +448 @@
 
 %flag edges of a partition
-if exist(options,'partitionedges') & ~strcmp(getfieldvalue(options,'partitionedges','off'),'off')
-        mdp=getfieldvalue(options,'partitionedges','off');
-        if ischar(mdp)
-                mdp=md;
-        end
-        [xsegments ysegments]=flagedges(mdp.mesh.elements,mdp.mesh.x,mdp.mesh.y,mdp.qmu.partition);
+%
+% TODO:
+% - Figure out how to expand string representing an object (e.g. 
+%       'md.qmu.variables.thickness.partition') to get the actual value *without* 
+%       using `eval` and like functions (md.('token').('token') works, but how do 
+%       we access md given the string 'md').
+if exist(options,'partition')
+        partition=getfieldvalue(options,'partition','');
+        if isvector(partition) & isnumeric(partition) % partition option is vector
+                % do nothing: we already have a partition vector
+        % elseif ischar(partition) & ~isempty(partition) % partition option is string
+        %       % expand string
+        %       partition=eval(partition);
+        %       class(partition);
+        %       if ~(isvector(partition) & isnumeric(partition))
+        %               error('String passed to ''partition'' option does not represent a partition vector');
+        %       end
+        else
+                error('If ''partition'' option is supplied, it should be a partition vector object');
+        end
+        mdp=md;
+        [xsegments ysegments]=flagedges(mdp.mesh.elements,mdp.mesh.x,mdp.mesh.y,partition);
         xsegments=xsegments*getfieldvalue(options,'unit',1);
         ysegments=ysegments*getfieldvalue(options,'unit',1);

issm/trunk-jpl/src/m/plot/plotdoc.m

@@ -122 +122 @@
 disp('       ''mask'': list of flags of size numberofnodes or numberofelements. Only ''true'' values are plotted ');
 disp('       ''nan'': value assigned to NaNs (convenient when plotting BC)');
-disp('       ''partitionedges'': ''off'' by default. overlay plot of partition edges');
+disp('       ''partition'': a partion vector. generates overlay plot of partition edges');
 disp('       ''log'': value of log');
 disp('       ''latlon'': ''on'' or {latstep lonstep [resolution [color]]} where latstep,longstep and resolution are in degrees, color is a [r g b] array');

issm/trunk-jpl/src/m/plot/plotdoc.py

@@ -127 +127 @@
     #                'border': " size of printlay border (in pixels). active only for overlay plots",
     #                'nan': " value assigned to NaNs (convenient when plotting BC)",
-    #                'partitionedges': " 'off' by default. overlay plot of partition edges",
+    #                'partition: " a partion vector. generates overlay plot of partition edges",
     #                'latlon': " 'on' or {latstep lonstep [resolution [color]]} where latstep, longstep and resolution are in degrees, color is a [r g b] array",
     #                'latlonnumbering': " 'on' or {latgap longap colornumber latangle lonangle} where latgap and longap are pixel gaps for the numbers",