Changeset 1758

Timestamp:

08/18/09 15:35:46 (15 years ago)

Author:

Mathieu Morlighem

Message:

some fixing while renaming

Location:

issm/trunk/src/m/classes/public

Files:

• BasinConstrain.m (modified) (1 diff)
• BasinConstrain2.m (modified) (1 diff)
• BasinConstrainShelf.m (modified) (1 diff)
• display/displayprognostic.m (modified) (1 diff)
• geography2.m (modified) (1 diff)
• modelzoom.m (modified) (2 diffs)
• plot/plot_manager.m (modified) (1 diff)
• plot/plot_pressureload.m (added)
• plot/plot_segmentonneumann.m (deleted)

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

@@ -62 +62 @@
 
 %make sure icefronts that are completely spc'd are taken out:
-free_segments=find(sum(md.spcvelocity(md.segmentonneumann_diag(:,1:2),1:2),2)~=2);
+free_segments=find(sum(md.spcvelocity(md.pressureload(:,1:2),1:2),2)~=2);
 md.pressureload=md.pressureload(free_segments,:);

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

@@ -63 +63 @@
 
 %make sure icefronts that are completely spc'd are taken out:
-free_segments=find(sum(md.spcvelocity(md.segmentonneumann_diag(:,1:2),1:2),2)~=2);
+free_segments=find(sum(md.spcvelocity(md.pressureload(:,1:2),1:2),2)~=2);
 md.pressureload=md.pressureload(free_segments,:);

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

@@ -76 +76 @@
 
 %make sure icefronts that are completely spc'd are taken out:
-free_segments=find(sum(md.spcvelocity(md.segmentonneumann_diag(:,1:2),1:2),2)~=2);
+free_segments=find(sum(md.spcvelocity(md.pressureload(:,1:2),1:2),2)~=2);
 md.pressureload=md.pressureload(free_segments,:);

issm/trunk/src/m/classes/public/display/displayprognostic.m

@@ -18 +18 @@
 disp(sprintf('\n      boundary conditions:'));
 fielddisplay(md,'spcthickness','constraints flag list (first column) and values (second column)');
-fielddisplay(md,'segmentonneumann_prog','segments on ice front list');
-fielddisplay(md,'neumannvalues_prog','values of the Neumann [m/a]');

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

@@ -148 +148 @@
 md.elementonicesheet=elementonicesheet;
 
-md.segmentonneumann_diag=segments;
+md.pressureload=segments;
 md.counter=2;
 md.segmentmarkers(:)=1;

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

@@ -32 +32 @@
 elementlist=find( (xel>xlim0(1)) & (xel<xlim0(2)) & (yel>ylim0(1)) & (yel<ylim0(2)) );
 
-%Create a list of elements locations from the input model, which are on the segmentonneumann_diag: 
-if(~isempty(md.segmentonneumann_diag)),
-        xelneumann=(md.x(md.elements(md.segmentonneumann_diag(:,3),1))+md.x(md.elements(md.segmentonneumann_diag(:,3),2))+md.x(md.elements(md.segmentonneumann_diag(:,3),3)))/3;
-        yelneumann=(md.y(md.elements(md.segmentonneumann_diag(:,3),1))+md.y(md.elements(md.segmentonneumann_diag(:,3),2))+md.y(md.elements(md.segmentonneumann_diag(:,3),3)))/3;
-        %Figure out which elements are within the area, and on segmentonneumann_diag: 
+%Create a list of elements locations from the input model, which are on the pressureload: 
+if(~isempty(md.pressureload)),
+        xelneumann=(md.x(md.elements(md.pressureload(:,3),1))+md.x(md.elements(md.pressureload(:,3),2))+md.x(md.elements(md.pressureload(:,3),3)))/3;
+        yelneumann=(md.y(md.elements(md.pressureload(:,3),1))+md.y(md.elements(md.pressureload(:,3),2))+md.y(md.elements(md.pressureload(:,3),3)))/3;
+        %Figure out which elements are within the area, and on pressureload: 
         elementlistneumann=find( (xelneumann>xlim0(1)) & (xelneumann<xlim0(2)) & (yelneumann>ylim0(1)) & (yelneumann<ylim0(2)) );
 end
@@ -95 +95 @@
 end
 
-%Deal with segmentonneumann_diag: 
-if(~isempty(md.segmentonneumann_diag)),
-        md2.segmentonneumann_diag=md.segmentonneumann_diag(elementlistneumann,:);
-        md2.segmentonneumann_diag(:,1)=gridpos(md2.segmentonneumann_diag(:,1));
-        md2.segmentonneumann_diag(:,2)=gridpos(md2.segmentonneumann_diag(:,2));
-        md2.segmentonneumann_diag(:,3)=elempos(md2.segmentonneumann_diag(:,3));
+%Deal with pressureload: 
+if(~isempty(md.pressureload)),
+        md2.pressureload=md.pressureload(elementlistneumann,:);
+        md2.pressureload(:,1)=gridpos(md2.pressureload(:,1));
+        md2.pressureload(:,2)=gridpos(md2.pressureload(:,2));
+        md2.pressureload(:,3)=elempos(md2.pressureload(:,3));
 end
 

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

@@ -72 +72 @@
                         plot_sarpwr(md,options_structure,width,i)
                         return
-                case {'segmentonneumann_diag','segmentonneumann_prog'}
-                        plot_segmentonneumann(md,options_structure,width,i,data)
+                case 'pressureload'
+                        plot_pressureload(md,options_structure,width,i,data)
                         return
                 case 'segments'