Changeset 4197

Timestamp:

06/24/10 14:50:20 (15 years ago)

Author:

seroussi

Message:

serial SetCurrentAnalysis

Location:

issm/trunk/src/m/solutions

Files:

• NewFemModel.m (modified) (3 diffs)
• SetCurrentAnalysis.m (modified) (3 diffs)

issm/trunk/src/m/solutions/NewFemModel.m

@@ -8 +8 @@
 %      femmodel=NewFemModel(md,solution_type,analysis_types,nummodels)
 %
-
 
    femmodel.solution_type=solution_type;
@@ -27 +26 @@
 
    %now, go through all analyses types and post-process datasets
-   for i=1:length(analysis_types),
+   for i=1:nummodels,
            
            analysis_type=femmodel.analysis_type_list(i);
            displaystring(md.verbose,'%s%s','   dealing with analysis type: ',EnumAsString(analysis_type));
+
+                femmodel=SetCurrentAnalysis(femmodel,analysis_type);
 
            displaystring(md.verbose,'%s','      generating degrees of freedofemmodel...');
@@ -56 +57 @@
                 displaystring(md.verbose,'%s','      configuring element and loads...');
                 [femmodel.elements,femmodel.loads,femmodel.nodes,femmodel.parameters] = ConfigureObjects( femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices,femmodel.materials,femmodel.parameters);
+                disp('file: NewFemModel.m line: 59');
+
 
    end
-
-        displaystring(md.verbose,'%s','   process parameters...');
-        femmodel.parameters=ProcessParams(femmodel.parameters);

issm/trunk/src/m/solutions/SetCurrentAnalysis.m

@@ -11 +11 @@
 
         %first, look for analysis: 
-        found=0;
+        found=-1;
         for i=1:length(femmodel.analysis_type_list),
+                femmodel.analysis_type_list(i)
+                analysis_enum
                 if femmodel.analysis_type_list(i)==analysis_enum,
                         found=i;
@@ -19 +21 @@
         end
 
-        if ~found==1,
+        if found==-1,
                 error('SetCurrentAnalysis error message: could not find analysis_type in list of FemModel analyses');
         end
-
         
         %activate matrices and vectors: 
@@ -34 +35 @@
         %Now, plug analysis_counter and analysis_type inside the parameters: 
         %set counter and analyse_type
-        femmodel.parameters.AnalysisCounter=found;
+        femmodel.parameters.AnalysisCounter=found-1; %for c indices
         femmodel.parameters.AnalysisType=analysis_enum;