Changeset 1293

Timestamp:

07/10/09 16:20:23 (16 years ago)

Author:

Mathieu Morlighem

Message:

fixed overlay

Location:

issm/trunk/src/m/classes/public

Files:

• plot/plot_overlay.m (modified) (2 diffs)
• radarpower.m (modified) (2 diffs)
• solversettoasm.m (modified) (1 diff)

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

@@ -35 +35 @@
 
         %Ok, first we need to recover the radar map.
-        md=radarpower(md,options_structure.highres);
+        if ~isnan(options_structure.xlim),
+                xlim=options_structure.xlim;
+        else
+                xlim=[min(md.x) max(md.x)];
+        end
+        if ~isnan(options_structure.ylim),
+                ylim=options_structure.ylim;
+        else
+                ylim=[min(md.y) may(md.y)];
+        end
+        if ~any(isnan(md.sarxm)) & ~any(isnan(md.sarym))
+                choice=input('This model seems to have a radar power image. Do you want to use it? (y/n)','s');
+                if ~strcmp(choice,'y')
+                        md=radarpower(md,xlim,ylim,options_structure.highres);
+                end
+        else
+                md=radarpower(md,xlim,ylim,options_structure.highres);
+        end
+
 
         writefile('contours.exp',md.domainoutline);
@@ -48 +66 @@
                 interpolation='element';
         end
-        data_mesh2grid=GriddataMeshToGrid(elements,x,y,contours,data,min(x),max(y),...
-                (max(x)-min(x))/length(md.sarxm),(max(y)-min(y))/length(md.sarym),length(md.sarym),length(md.sarxm),...
+        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);
 else

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

@@ -1 @@
-function md=radarpower(md,highres)
+function md=radarpower(md,xlim,ylim,highres)
 %RADARPOWER - overlay a power radar image on an existing mesh
 %
@@ -16 +16 @@
 
 %find gdal coordinates
-x0=min(md.x);
-x1=max(md.x);
+x0=min(xlim);
+x1=max(xlim);
 
-y0=min(md.y);
-y1=max(md.y);
+y0=min(ylim);
+y1=max(ylim);
 
 %Get path  to gdal binaries

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

@@ -5 +5 @@
 %      md=solversettoasm(md)
 
-md.solverstring=' -mat_type aij -ksp_type cgs -pc_type asm -sub_mat_type mumps -sub_pc_type lu -pc_asm_overlap 2 ';
+md.solverstring=' -mat_type aij -ksp_type cgs -pc_type asm -sub_mat_type mumps -sub_pc_type lu -pc_asm_overlap 4 ';
 %md.solverstring=' -mat_type aij -ksp_type cgs -pc_type asm -sub_pc_type lu -pc_asm_overlap 2 ';