Changeset 1797

Timestamp:

08/24/09 09:53:34 (16 years ago)

Author:

Mathieu Morlighem

Message:

SetBC now works in 3d

Location:

issm/trunk/src/m/utils/BC

Files:

• SetIceSheetBC.m (modified) (1 diff)
• SetIceShelfBC.m (modified) (1 diff)
• SetMarineIceSheetBC.m (modified) (1 diff)

issm/trunk/src/m/utils/BC/SetIceSheetBC.m

@@ -21 +21 @@
 
 %segment on neumann (Ice Front) -> none
-md.pressureload=zeros(0,3);
+if strcmpi(md.type,'2d')
+        md.pressureload=zeros(0,3);
+else
+        md.pressureload=zeros(0,5);
+end
 
 %Create zeros melting and accumulation if not specified

issm/trunk/src/m/utils/BC/SetIceShelfBC.m

@@ -34 +34 @@
 %segment on Ice Front
 pos=find(gridonicefront(md.segments(:,1)) | gridonicefront(md.segments(:,2)));
-md.pressureload=md.segments(pos,:);
+pressureload=md.segments(pos,:);
+if strcmpi(md.type,'3d')
+        oldpressureload=pressureload;
+        pressureload_layer1=[oldpressureload(:,1:2)  oldpressureload(:,2)+md.numberofgrids2d  oldpressureload(:,1)+md.numberofgrids2d  oldpressureload(:,3)];
+        pressureload=[];
+        for i=1:md.numlayers-1,
+                pressureload=[pressureload ;pressureload_layer1(:,1:4)+(i-1)*md.numberofgrids2d pressureload_layer1(:,5)+(i-1)*md.numberofelements2d ];
+        end
+end
+md.pressureload=pressureload;
 
 %Create zeros melting and accumulation if not specified

issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m

@@ -46 +46 @@
 %segment on Neumann (Ice Front)
 pos=find(gridonicefront(md.segments(:,1)) | gridonicefront(md.segments(:,2)));
-md.pressureload=md.segments(pos,:);
+pressureload=md.segments(pos,:);
+if strcmpi(md.type,'3d')
+        oldpressureload=pressureload;
+        pressureload_layer1=[oldpressureload(:,1:2)  oldpressureload(:,2)+md.numberofgrids2d  oldpressureload(:,1)+md.numberofgrids2d  oldpressureload(:,3)];
+        pressureload=[];
+        for i=1:md.numlayers-1,
+                pressureload=[pressureload ;pressureload_layer1(:,1:4)+(i-1)*md.numberofgrids2d pressureload_layer1(:,5)+(i-1)*md.numberofelements2d ];
+        end
+end
+md.pressureload=pressureload;
 
 %Create zeros melting and accumulation if not specified