Changeset 2966

Timestamp:

02/05/10 11:58:49 (15 years ago)

Author:

Mathieu Morlighem

Message:

enable rifts

Location:

issm/trunk/src

Files:

• c/Bamgx/objects/Geometry.cpp (modified) (1 diff)
• m/classes/public/bamg.m (modified) (2 diffs)

issm/trunk/src/c/Bamgx/objects/Geometry.cpp

@@ -726 +726 @@
                         }
 
-                        // close the liste around the vertex 
+                        // close the list around the vertex 
                         Int4 no=-1, ne = head_v[i];
                         while (ne >=0) ne = next_p[no=ne];        

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

@@ -34 +34 @@
 
                 for i=1:length(domain),
-                        nods=domain(i).nods-1; %the domain are closed 1=end;
-                        bamg_geometry.Vertices=[bamg_geometry.Vertices; [domain(i).x(1:nods) domain(i).y(1:nods) ones(nods,1)]];
-                        bamg_geometry.Edges=[bamg_geometry.Edges; [transp(count+1:count+nods) transp([count+2:count+nods count+1])  ones(nods,1)]];
-                        if i>1,
-                                %if closed : hole
-                                if (domain(i).x(1)==domain(i).x(end) & domain(i).y(1)==domain(i).y(end)),
+
+                        %if current profile is closed
+                        if (domain(i).x(1)==domain(i).x(end) & domain(i).y(1)==domain(i).y(end)),
+                                nods=domain(i).nods-1; %the domain are closed 1=end;
+                                bamg_geometry.Vertices=[bamg_geometry.Vertices; [domain(i).x(1:nods) domain(i).y(1:nods) ones(nods,1)]];
+                                bamg_geometry.Edges=[bamg_geometry.Edges; [transp(count+1:count+nods) transp([count+2:count+nods count+1])  ones(nods,1)]];
+                                if i>1,
+                                        %if closed : hole
                                         clockwise=-1;
                                         bamg_geometry.SubDomains=[2 count+1 clockwise 1];
-                                else
-                                        %rift
+
                                 end
+
+                        elseif i>1
+                                %rift
+                                nods=domain(i).nods-1;
+                                bamg_geometry.Vertices=[bamg_geometry.Vertices; [domain(i).x(:) domain(i).y(:) ones(nods+1,1)]];
+                                bamg_geometry.Edges=[bamg_geometry.Edges; [transp(count+1:count+nods) transp([count+2:count+nods+1])  ones(nods,1)]];
+
+                        else
+                                error('bamg error message: the first domain should be closed');
                         end
                         count=count+nods;
@@ -55 +65 @@
                 end
                 bamg_geometry.NumVertices=size(bamg_geometry.Vertices,1);
-                bamg_geometry.NumEdges=size(bamg_geometry.Edges,1);
+                bamg_geometry.NumEdges=size(bamg_geometry.Edges,1)
+                bamg_geometry.Edges
                 bamg_geometry.NumSubDomains=size(bamg_geometry.SubDomains,1);
         end