Changeset 3658

Timestamp:

05/05/10 15:30:48 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added track support in bamg as well as points outside the domain

Location:

issm/trunk/src/m/classes/public

Files:

• bamg.m (modified) (3 diffs)
• processgeometry.m (added)
• queue/QueueRequirements.m (modified) (1 diff)

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

@@ -39 +39 @@
 %   - rifts : followed by an ARGUS file that prescribes the rifts
 %   - toltip: tolerance to move tip on an existing point of the domain outline
+%   - tracks: followed by an ARGUS file that prescribes the tracks that the mesh will stick to
+%   - tol:    if the distance between 2 points of the domain outline is less than tol, they
+%             will be merged
 %
 %   Examples:
@@ -200 +203 @@
         end
 
+        %Deal with tracks
+        if exist(options,'tracks'),
+
+                %Check that file exists
+                trackfile=getfieldvalueerr(options,'tracks');
+                if ~exist(trackfile,'file')
+                        error(['bamg error message: file ' trackfile ' not found ']);
+                end
+                track=expread(trackfile);
+
+                for i=1:length(track),
+
+                        %Add all points to bamg_geometry
+                        nods=track(i).nods;
+                        bamg_geometry.Vertices=[bamg_geometry.Vertices; [track(i).x(1:nods) track(i).y(1:nods) 3*ones(nods,1)]];
+                        bamg_geometry.Edges=[bamg_geometry.Edges; [transpose(count+1:count+nods-1) transpose([count+2:count+nods])  3*ones(nods-1,1)]];
+
+                        %update counter
+                        count=count+nods;
+                end
+        end
+
         if exist(options,'hVertices'),
                 bamg_geometry.hVertices=getfieldvalueerr(options,'hVertices');
@@ -206 +231 @@
                 end
         end
+
+        %process geom
+        bamg_geometry=processgeometry(bamg_geometry,getfieldvalue(options,'tol',NaN),domain(1));
 
 elseif isstruct(md.bamg),

issm/trunk/src/m/classes/public/queue/QueueRequirements.m

@@ -14 +14 @@
 
         available_queues={'debug','shortq','longq','specialq'};
-        queue_requirements_time=[60 180 720 1440];
+        queue_requirements_time=[60*1 60*3 60*17 1440];
         queue_requirements_np=[32 128 256 256];
         queue_requirements_modulo=[1 1 1 1];