Changeset 4344

Timestamp:

06/30/10 11:42:06 (15 years ago)

Author:

seroussi

Message:

matlab typo

Location:

issm/trunk/src/m/solutions

Files:

• SetCurrentAnalysisAlias.m (modified) (1 diff)
• diagnostic_core.m (modified) (1 diff)
• surfaceslope_core.m (modified) (1 diff)

issm/trunk/src/m/solutions/SetCurrentAnalysisAlias.m

@@ -10 +10 @@
 %
 
-
         %first, look for analysis: 
-        int found=0;
+        found=-1;
         for i=1:length(femmodel.analysis_type_list),
-                if analysis_type_list(i)==base_analysis_enum,
+                if femmodel.analysis_type_list(i)==base_analysis_enum,
                         found=i;
                         break;
+                end
         end
 
-        if (found!=1),
+        if found==-1,
                 error('SetCurrentAnalysisAlias error message: could not find analysis_type in list of FemModel analyses');
         end
-
         
         %activate matrices and vectors: 
-        femmodel.Rmg=femmodel.m_Rmg(found);
-        femmodel.Gmn=femmodel.m_Gmn(found);
-        femmodel.nodesets=femmodel.m_nodesets(found);
-        femmodel.yg=femmodel.m_yg(found);
-        femmodel.ys=femmodel.m_ys(found);
-
+        femmodel.Rmg=femmodel.m_Rmg{found};
+        femmodel.Gmn=femmodel.m_Gmn{found};
+        femmodel.nodesets=femmodel.m_nodesets{found};
+        femmodel.yg=femmodel.m_yg{found};
+        femmodel.ys=femmodel.m_ys{found};
 
         %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=real_analysis_type;

issm/trunk/src/m/solutions/diagnostic_core.m

@@ -29 +29 @@
 
         %Compute slopes: 
-        if(ishutter)femmodel=surfaceslope_core(femmodel);end
-        if(isstokes)femmodel=bedslope_core(femmodel);end
+        if(ishutter), femmodel=surfaceslope_core(femmodel); end
+        if(isstokes), femmodel=bedslope_core(femmodel); end
 
         if ishutter,

issm/trunk/src/m/solutions/surfaceslope_core.m

@@ -24 +24 @@
                 femmodel.elements=InputExtrude(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials,femmodel.parameters,SurfaceSlopeXEnum);
                 femmodel.elements=InputExtrude(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials,femmodel.parameters,SurfaceSlopeYEnum);
-        }
+        end
         
         if solution_type==SurfaceSlopeSolutionEnum,