Changeset 27954

Timestamp:

10/10/23 10:14:26 (17 months ago)

Author:

Mathieu Morlighem

Message:

CHG: making plotmodel work with AMR (used to load models from Ua)

Location:

issm/trunk-jpl/src/m

Files:

• exp/isoline.m (modified) (2 diffs)
• plot/plot_transient_movie.m (modified) (4 diffs)

issm/trunk-jpl/src/m/exp/isoline.m

@@ -30 +30 @@
         index=md.mesh.elements;
 end
+if exist(options,'amr')
+        amr = getfieldvalue(options,'amr');
+        x=amr.MeshX;
+        y=amr.MeshY;
+        index=amr.MeshElements;
+end
 
 %Deal with z coordinate
@@ -44 +50 @@
         end
 else
-        if length(field)~=md.mesh.numberofvertices
+        if length(field)~=numel(x)
                 error('field provided should be of size md.mesh.numberofvertices'); 
         end

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

@@ -74 +74 @@
                 range = [Inf -Inf];
                 for i=steps
-                        [data datatype]=processdata(md,results(i).(field),options);
+                        if isfield(results(i), 'MeshElements')
+                                options=changefieldvalue(options,'amr', i);
+                        end
+                        [data datatype]=processdata(md,results(i).(field), options);
                         range(1) = min(range(1),min(data));
                         range(2) = max(range(2),max(data));
@@ -80 +83 @@
                 options=addfielddefault(options,'caxis',range);
         end
-
 
         %Process mesh once for all
@@ -91 +93 @@
 
                 if ~isempty(results(i).(field)),
+                        %Process mesh if necessary
+                        if isfield(results(i), 'MeshElements')
+                                options=changefieldvalue(options,'amr', i);
+                                [x y z elements is2d isplanet]=processmesh(md,results(i).(field),options);
+                        end
+
                         %process data
                         [data datatype]=processdata(md,results(i).(field),options);
@@ -114 +122 @@
                         if exist(options,'icefront')
                                 if dimension(md.mesh)==2
-                                        contours=isoline(md, results(i).MaskIceLevelset,'output','matrix');
+                                        if exist(options, 'amr')
+                                                contours=isoline(md, results(i).MaskIceLevelset,'output','matrix', 'amr', results(i));
+                                        else
+                                                contours=isoline(md, results(i).MaskIceLevelset,'output','matrix');
+                                        end
                                 else
                                         ice = project2d(md, results(i).MaskIceLevelset, 1);