Changeset 4370

Timestamp:

06/30/10 16:10:37 (15 years ago)

Author:

seroussi

Message:

remove SetCurrentAnalysisAlias

Location:

issm/trunk/src/m/solutions

Files:

• SetCurrentAnalysisAlias.m (deleted)
• SetCurrentConfiguration.m (modified) (2 diffs)

issm/trunk/src/m/solutions/SetCurrentConfiguration.m

@@ -1 @@
-function femmodel=SetCurrentConfiguration(femmodel,analysis_enum)
+function femmodel=SetCurrentConfiguration(femmodel,configuration_enum,varargin)
 %SETCURRENTCONFIGURATION- set current analysis used to configure elements and nodes in our solutions
 %
+%   Use configuration_type to setup the analysis counter, the configurations of objects etc ... 
+%   but use  analysis_type to drive the element numerics. 
+%   This allows for use of 1 configuration_type for several  analyses
+%
 %   Usage:
-%      femmodel=SetCurrentConfiguration(femmodel,analysis_type)
+%      femmodel=SetCurrentConfiguration(femmodel,configuration_type)
+%      femmodel=SetCurrentConfiguration(femmodel,configuration_type,analysis_type)
 %
 %   Ex:
 %      femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum)
+%      femmodel=SetCurrentConfiguration(femmodel,SurfaceSlopeAnalysisEnum,SurfaceSlopeXAnalysisEnum)
 %
 
+if nargin==3,
+        analysis_enum=varargin{1};
+elseif nargin==2
+        femmodel=SetCurrentConfiguration(femmodel,configuration_enum,configuration_enum);
+else
+        help SetCurrentConfiguration
+        error('bad usage');
+end
 
         %first, look for analysis: 
         found=-1;
         for i=1:length(femmodel.analysis_type_list),
-                if femmodel.analysis_type_list(i)==analysis_enum,
+                if femmodel.analysis_type_list(i)==configuration_enum,
                         found=i;
                         break;
@@ -34 +48 @@
         femmodel.parameters.AnalysisCounter=found-1; %for c indices
         femmodel.parameters.AnalysisType=analysis_enum;
+        femmodel.parameters.ConfigurationType=configuration_enum;