Changeset 2298

Timestamp:

09/23/09 15:56:06 (15 years ago)

Author:

Mathieu Morlighem

Message:

removed mesh2grid

Location:

issm/trunk/src/m/classes/public

Files:

• display/displaymesh2grid.m (deleted)
• ismodelselfconsistent.m (modified) (1 diff)
• plot/plot_overlay.m (modified) (1 diff)
• process_solve_options.m (modified) (1 diff)
• solve.m (modified) (1 diff)

issm/trunk/src/m/classes/public/ismodelselfconsistent.m

@@ -396 +396 @@
         end
 end
-
-%MESH2GRID
-if md.analysis_type==Mesh2gridAnalysisEnum,
-        if ~strcmpi(md.cluster,'none'),
-                disp(['model is not correctly configured: mesh2grid not supported in parallel yet!']);
-                bool=0;return;
-        end
-end
-
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  PACKAGE CHECKS   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

issm/trunk/src/m/classes/public/plot/plot_overlay.m

@@ -54 +54 @@
         end
 
-
-        writefile('contours.exp',md.domainoutline);
-        contours=expread('contours.exp',0);
-        contours=contours(1); %just keep the outer domain outline.
-        delete('contours.exp');
-
         %use mesh2grid solution to get an gridded data to display using imagesc
-        if isongrid,
-                interpolation='node';
-        else
-                interpolation='element';
-        end
-        data_mesh2grid=GriddataMeshToGrid(elements,x,y,contours,data,min(xlim),max(ylim),...
-                (max(xlim)-min(xlim))/length(md.sarxm),(max(ylim)-min(ylim))/length(md.sarym),length(md.sarym),length(md.sarxm),...
-                interpolation,'average',options_structure.windowsize);
+        [x_m y_m data_mesh2grid]=InterpFromMeshToGrid(elements,x,y,data,min(xlim),max(ylim),...
+                (max(xlim)-min(xlim))/length(md.sarxm),(max(ylim)-min(ylim))/length(md.sarym),length(md.sarym),length(md.sarxm),NaN);
 else
         %process mesh and data

issm/trunk/src/m/classes/public/process_solve_options.m

@@ -47 +47 @@
 
 %check solution type is supported
-if ~ismemberi(analysis_type,{'diagnostic','prognostic','thermal','steadystate','parameters','mesh2grid','transient'}),
+if ~ismemberi(analysis_type,{'diagnostic','prognostic','thermal','steadystate','parameters','transient'}),
         error(['process_solve_options error message: analysis_type ' analysis_type ' not supported yet!']);
 else

issm/trunk/src/m/classes/public/solve.m

@@ -55 +55 @@
         md=transient(md);
 
-elseif md.analysis_type==Mesh2gridAnalysisEnum,
-        md=mesh2grid(md);;
-
 elseif md.analysis_type==PrognosticAnalysisEnum,
         md=prognostic(md);;