Changeset 45

Timestamp:

04/24/09 15:21:17 (16 years ago)

Author:

Mathieu Morlighem

Message:

removed accelerated element

Location:

issm/trunk/src/m/classes

Files:

• @acceleratedtriaelem (deleted)
• @model/model.m (modified) (2 diffs)
• @pentaelem/CreatePVector.m (modified) (2 diffs)
• @pentaelem/PentaCollapseIntoTriaMatrix.m (modified) (1 diff)
• @pentaelem/PentaCollapseIntoTriaVector.m (modified) (1 diff)
• @pentaelem/display.m (modified) (1 diff)
• @pentaelem/pentaelem.m (modified) (1 diff)
• @triaelem/CreateKMatrix.m (modified) (1 diff)
• @triaelem/CreatePVector.m (modified) (1 diff)
• @triaelem/display.m (modified) (1 diff)
• @triaelem/triaelem.m (modified) (1 diff)
• public/displaycontrol.m (modified) (1 diff)
• public/displaysolutionparameters.m (modified) (1 diff)
• public/ismodelselfconsistent.m (modified) (2 diffs)

issm/trunk/src/m/classes/@model/model.m

@@ -150 +150 @@
         md.eps_rel=0.01;
         md.eps_abs=10;
-        md.acceleration=0;
         md.sparsity=0.001;
         md.connectivity=10;
@@ -172 +171 @@
 
         %Control
-        md.control_type={'drag'};
+        md.control_type='drag';
         md.cont_vx=NaN;
         md.cont_vy=NaN;

issm/trunk/src/m/classes/@pentaelem/CreatePVector.m

@@ -10 +10 @@
 %
 %   See also CREATEKMATRIX
-
-
 if strcmpi(analysis_type,'diagnostic_horiz'),
 
@@ -895 +893 @@
                 element.meanvel=pentaelem.meanvel;
                 element.epsvel=pentaelem.epsvel;
-                element.acceleration=pentaelem.acceleration;
 
                 %Call CreateKMatrix for this new element.

issm/trunk/src/m/classes/@pentaelem/PentaCollapseIntoTriaMatrix.m

@@ -27 +27 @@
         element.meanvel=pentaelem.meanvel;
         element.epsvel=pentaelem.epsvel;
-        element.acceleration=pentaelem.acceleration;
 
         %Call CreateKMatrix for this new element.
         Ke=CreateKMatrix(element,grids,materials,inputs,analysis_type);
-

issm/trunk/src/m/classes/@pentaelem/PentaCollapseIntoTriaVector.m

@@ -27 +27 @@
         element.meanvel=pentaelem.meanvel;
         element.epsvel=pentaelem.epsvel;
-        element.acceleration=pentaelem.acceleration;
 
         %Call CreateKMatrix for this new element.
         Pe=CreatePVector(element,grids,materials,inputs,analysis_type);
-

issm/trunk/src/m/classes/@pentaelem/display.m

@@ -21 +21 @@
 disp(sprintf('   meanvel: %g',pentaelem.meanvel));
 disp(sprintf('   epsvel: %g',pentaelem.epsvel));
-disp(sprintf('   acceleration (use MacAyeal''s accelerated formulation''): %g',pentaelem.acceleration));
 disp(sprintf('   collapse (collapse penta into tria at the base): %g',pentaelem.collapse));
 disp(sprintf('   melting: %g %g %g',pentaelem.melting(1),pentaelem.melting(2),pentaelem.melting(3)));

issm/trunk/src/m/classes/@pentaelem/pentaelem.m

@@ -24 +24 @@
         pentaelem.meanvel=NaN;
         pentaelem.epsvel=NaN;
-        pentaelem.acceleration=0;
         pentaelem.collapse=0;
         pentaelem.melting=zeros(6,1);

issm/trunk/src/m/classes/@triaelem/CreateKMatrix.m

@@ -199 +199 @@
 
 global element_debug  element_debugid
-
-
-%Check if MacAyeal's acceleration is not on? 
-if triaelem.acceleration==1,
-        Ke=elemmatrix(0);
-        return;
-end
 
 %some variables

issm/trunk/src/m/classes/@triaelem/CreatePVector.m

@@ -123 +123 @@
         global element_debug  element_debugid
 
-        %Check if MacAyeal's acceleration is not on? 
-        if triaelem.acceleration==1,
-                pe={};
-        end
-
         %some variables
         numgrids=3;

issm/trunk/src/m/classes/@triaelem/display.m

@@ -20 +20 @@
 disp(sprintf('   epsvel: %g',triaelem.epsvel));
 disp(sprintf('   artificial_diffusivity: %i',triaelem.artificial_diffusivity));
-disp(sprintf('   acceleration: %i',triaelem.acceleration));

issm/trunk/src/m/classes/@triaelem/triaelem.m

@@ -23 +23 @@
         triaelem.epsvel=NaN;
         triaelem.artificial_diffusivity=0;
-        triaelem.acceleration=0;
         
         triaelem=class(triaelem,'triaelem');

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

@@ -21 +21 @@
 end
 control_string=control_string(1:length(control_string)-5);
-disp(sprintf('         control_type: %s %s',control_string,'(list of parameters where inverse control is carried out; ex: {''drag''}, or {''drag'',''B''})'));
+disp(sprintf('         control_type: %s %s',control_string,'(parameter where inverse control is carried out; ex: ''drag'', or ''B'')'));
 disp(sprintf('         fit: (%i)      (''absolute: 0'', ''relative: 1'', or ''logarithmic: 2''. default is ''absolute: 0'', for each optimization steps)',length(md.fit)));
 disp(sprintf('         meanvel: %g      (velocity scaling factor when evaluating relative or logarithmic misfit)',md.meanvel));

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

@@ -21 +21 @@
 disp(sprintf('         sparsity: %g      (matrix sparsity. Set to .001 for < 1M dof, .0001 for 5M dof, and .00001 for > 10M dof',md.sparsity));
 disp(sprintf('         connectivity: %i      (element connectivity)',md.connectivity)); 
-disp(sprintf('         acceleration: %i      (accelerate MacAyeal''s formulation? yes -> 1, no -> 0 )',md.acceleration));
 disp(sprintf('         debug: %i      (output debug statements when possible yes-> 1, no -> 0. Default is 1',md.debug));
 disp(sprintf('         element_debug: %i      (output debug statements for elementswhen possible yes-> 1, no -> 0. Default is 0',md.element_debug));

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

@@ -269 +269 @@
         end
 
-        %ACCELERATION
-        if strcmpi(md.type,'2d') & md.acceleration
-                disp(['solution requires acceleration=0']);
-                bool=0;return;
-        end
-
         %HUTTER
         if any(md.elements_type(:,1)==hutterenum); 
@@ -286 +280 @@
 
         %CONTROL TYPE
-        if ~iscell(md.control_type),
-                disp('control_type should be a cell array of strings');
+        if ~ischar(md.control_type),
+                disp('control_type should be a string');
                 bool=0;return;
         end