Changeset 5776 for issm/trunk/src/m/solutions/NewFemModel.m

Timestamp:

09/13/10 14:19:35 (15 years ago)

Author:

Mathieu Morlighem

Message:

New Kff Kfs framework

File:

• issm/trunk/src/m/solutions/NewFemModel.m (modified) (2 diffs)

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

@@ -19 +19 @@
    
         %Initialize some fiels with empty celils
-        femmodel.m_yg=cell(nummodels,1);
         femmodel.m_nodesets=cell(nummodels,1);
         femmodel.m_ys=cell(nummodels,1);
@@ -32 +31 @@
                 femmodel=SetCurrentConfiguration(femmodel,analysis_type);
 
-                displaystring(md.verbose,'%s','      generating degrees of freedom...');
+                displaystring(md.verbose,'%s','      generating vertices degrees of freedom');
                 if ~isfield(femmodel,'part'),
                         [femmodel.vertices,femmodel.part,femmodel.tpart]=VerticesDof(femmodel.vertices, femmodel.parameters); %do not create partition vector twice! we only have one set of vertices!
                 end
+
+                displaystring(md.verbose,'%s','      resolve node constraints');
+                [femmodel.nodes]=SpcNodes(femmodel.nodes,femmodel.constraints,analysis_type);
+
+                displaystring(md.verbose,'%s','      create nodal degrees of freedom');
                 [femmodel.nodes]=NodesDof(femmodel.nodes,femmodel.parameters);
 
-                displaystring(md.verbose,'%s','      generating single point constraints...');
-                [femmodel.nodes,femmodel.m_yg{i}]=SpcNodes(femmodel.nodes,femmodel.constraints,analysis_type);
+                displaystring(md.verbose,'%s','      create nodal constraints vector');
+                femmodel.m_ys{i}=CreateNodalConstraints(femmodel.nodes,analysis_type);
 
-                displaystring(md.verbose,'%s','      generating node sets...');
+                displaystring(md.verbose,'%s','      create node sets');
                 femmodel.m_nodesets{i}=BuildNodeSets(femmodel.nodes,analysis_type);
 
-                displaystring(md.verbose,'%s','      reducing single point constraints vector...');
-                femmodel.m_ys{i}=Reducevectorgtos(femmodel.m_yg{i},femmodel.m_nodesets{i});
-
-                displaystring(md.verbose,'%s','      configuring elements and loads...');
+                displaystring(md.verbose,'%s','      configuring elements and loads');
                 [femmodel.elements,femmodel.loads,femmodel.nodes,femmodel.parameters] = ConfigureObjects( femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices,femmodel.materials,femmodel.parameters);
         end