Changeset 4494

Timestamp:

07/09/10 07:59:41 (15 years ago)

Author:

Mathieu Morlighem

Message:

Fixed Balanced Thickness2 in serial mode

Location:

issm/trunk/src

Files:

• c/objects/Elements/Tria.cpp (modified) (1 diff)
• c/solutions/balancedthickness2_core.cpp (modified) (2 diffs)
• m/solutions/balancedthickness2_core.m (modified) (1 diff)

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -5871 +5871 @@
 /*FUNCTION Tria::InputUpdateFromSolutionBalancedthickness2 {{{1*/
 void  Tria::InputUpdateFromSolutionBalancedthickness2(double* solution){
-        ISSMERROR(" not supported yet!");
+        int i;
+
+        const int    numvertices=3;
+        const int    numdofpervertex=1;
+        const int    numdof=numdofpervertex*numvertices;
+
+        int          doflist[numdof];
+        double       values[numdof];
+
+        int          dummy;
+
+        /*Get dof list: */
+        GetDofList(&doflist[0],&dummy);
+
+        /*Use the dof list to index into the solution vector: */
+        for(i=0;i<numdof;i++){
+                values[i]=solution[doflist[i]];
+        }
+
+        /*Add thickness as inputs to the tria element: */
+        this->inputs->AddInput(new TriaVertexInput(ThicknessEnum,values));
 }
 /*}}}*/

issm/trunk/src/c/solutions/balancedthickness2_core.cpp

@@ -20 +20 @@
 
         /*activate formulation: */
-        femmodel->SetCurrentConfiguration(BalancedthicknessAnalysisEnum);
+        femmodel->SetCurrentConfiguration(Balancedthickness2AnalysisEnum);
         
         /*recover parameters: */
@@ -34 +34 @@
         solver_linear(NULL,femmodel);
 
-        _printf_("Averaging over vertices:\n");
-        ISSMERROR(" not supported yet!");
-//FieldAverageOntoVerticesx(&h_g,fem_p->elements,fem_p->nodes,fem_p->vertices,fem_p->loads,fem_p->materials,fem_p->parameters);
+        //_printf_("Averaging over vertices:\n");
+        //FieldAverageOntoVerticesx(&h_g,fem_p->elements,fem_p->nodes,fem_p->vertices,fem_p->loads,fem_p->materials,fem_p->parameters);
 
-//      _printf_("extrude computed thickness on all layers:\n");
-//      FieldExtrudex( h_g, fem_p->elements,fem_p->nodes, fem_p->vertices,fem_p->loads, fem_p->materials,fem_p->parameters,"thickness",0);
+        //      _printf_("extrude computed thickness on all layers:\n");
+        //      FieldExtrudex( h_g, fem_p->elements,fem_p->nodes, fem_p->vertices,fem_p->loads, fem_p->materials,fem_p->parameters,"thickness",0);
 
         if(verbose)_printf_("saving results:\n");

issm/trunk/src/m/solutions/balancedthickness2_core.m

@@ -14 +14 @@
 
         displaystring(verbose,'\n%s',['depth averaging velocities...']);
-        %[femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters]=InputDepthAverage(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VxEnum,VxAverageEnum);
-        %[femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters]=InputDepthAverage(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VyEnum,VyAverageEnum);
-        if dim==3,
-        %       [femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters]=InputDepthAverage(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VzEnum,VzAverageEnum);
-        end
+        [femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters]=InputDepthAverage(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VxEnum,VxAverageEnum);
+        [femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters]=InputDepthAverage(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VyEnum,VyAverageEnum);
 
         displaystring(verbose,'\n%s',['call computational core...']);