Changeset 4055 for issm/trunk/src/c/solutions/balancedvelocities_core.cpp

Timestamp:

06/18/10 19:24:59 (15 years ago)

Author:

Eric.Larour

Message:

Keep simplifying solutions.
New convergence module at the input level, instead at the solution level, when solution vectors are not
available anymore.

File:

• issm/trunk/src/c/solutions/balancedvelocities_core.cpp (modified) (1 diff)

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

@@ -11 +11 @@
 #include "../solvers/solvers.h"
 
-Results* balancedvelocities_core(Model* model){
-
-        extern int my_rank;
-
-        /*output: */
-        Results* results=NULL;
-        Result* result=NULL;
-
-        /*intermediary: */
-        Vec u_g=NULL;
-
-        /*solutions: */
-        Vec v_g=NULL;
+void balancedvelocities_core(FemModel* femmodel){
 
         /*flags: */
         int verbose=0;
-        int numberofdofspernode;
-        int numberofnodes;
-        int dofs[2]={1,1};
+        int dim;
 
-        /*fem balancedvelocities model: */
-        FemModel* fem_p=NULL;
-
-        //initialize results:
-        results=new Results();
-
-        /*recover fem model: */
-        fem_p=model->GetFormulation(BalancedvelocitiesAnalysisEnum);
-
-        //first recover parameters common to all solutions
-        model->FindParam(&verbose,VerboseEnum);
-        model->FindParam(&numberofnodes,NumberOfNodesEnum);
-        model->FindParam(&numberofdofspernode,NumberOfDofsPerNodeEnum);
+        /*activate formulation: */
+        femmodel->SetCurrentAnalysis(BalancedvelocitiesAnalysisEnum);
+        
+        /*recover parameters: */
+        femmodel->parameters->FindParam(&verbose,VerboseEnum);
+        femmodel->parameters->FindParam(&dim,DimEnum);
 
         _printf_("depth averaging velocity...\n");
-        //u_g=inputs->Get("velocity",&dofs[0],2); //take (vx,vy) from inputs velocity
-        //FieldDepthAveragex( u_g, fem_p->elements,fem_p->nodes, fem_p->vertices,fem_p->loads, fem_p->materials,fem_p->parameters,"velocity");
-        //inputs->Add("velocity_average",u_g,2,numberofnodes);
-        ISSMERROR(" not supported yet!");
-        
+        DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum);
+        DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum);
+        if(dim==3) DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VzEnum);
+
         _printf_("call computational core:\n");
-        diagnostic_core_linear(&v_g,fem_p,BalancedvelocitiesAnalysisEnum,NoneAnalysisEnum);
+        solver_linear(NULL,femmodel);
 
-        _printf_("extrude computed thickness on all layers:\n");
-        FieldExtrudex( v_g, fem_p->elements,fem_p->nodes, fem_p->vertices,fem_p->loads, fem_p->materials,fem_p->parameters,"thickness",0);
+        _printf_("extrude computed velocity on all layers:\n");
+        ExtrudeInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum);
+        ExtrudeInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum);
 
-        /*Plug results into output dataset: */
-        InputToResultx(&result,fem_p->elements,fem_p->nodes,fem_p->vertices, fem_p->loads, fem_p->materials,fem_p->parameters,VxEnum,results->Size()+1,0,1); results->AddObject(result);
-        InputToResultx(&result,fem_p->elements,fem_p->nodes,fem_p->vertices, fem_p->loads, fem_p->materials,fem_p->parameters,VyEnum,results->Size()+1,0,1); results->AddObject(result);
-        results->AddObject(new StringResult(results->Size()+1,AnalysisTypeEnum,0,1,EnumAsString(BalancedvelocitiesAnalysisEnum)));
+        if(verbose)_printf_("saving results:\n");
+        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum);
+        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum);
 
-        /*Free ressources:*/
-        VecFree(&u_g);
-        VecFree(&v_g);
-
-        /*return: */
-        return results;
 }