Changeset 4055 for issm/trunk/src/c/solutions/prognostic_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/prognostic_core.cpp (modified) (1 diff)

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

@@ -11 +11 @@
 #include "../solvers/solvers.h"
 
-Results* prognostic_core(Model* model){
+void prognostic_core(FemModel* femmodel){
 
-        extern int my_rank;
-
-        /*output: */
-        Results* results=NULL;
-        Result*  result=NULL;
-
-        /*solutions: */
-        Vec h_g=NULL;
-
-        /*flags: */
+        /*parameters: */
         int verbose=0;
 
-        /*fem prognostic model: */
-        FemModel* fem_p=NULL;
-
-        //initialize results
-        results=new Results();
-
-        /*recover fem model: */
-        fem_p=model->GetFormulation(PrognosticAnalysisEnum); ISSMASSERT(fem_p);
-
-        //first recover parameters common to all solutions
-        model->FindParam(&verbose,VerboseEnum);
+        /*activate formulation: */
+        femmodel->SetCurrentAnalysis(PrognosticAnalysisEnum);
+        
+        /*recover parameters: */
+        femmodel->parameters->FindParam(&verbose,VerboseEnum);
 
         _printf_("depth averaging velocity...\n");
-        DepthAverageInputx(fem_p->elements,fem_p->nodes, fem_p->vertices,fem_p->loads, fem_p->materials,fem_p->parameters,VxEnum);
-        DepthAverageInputx(fem_p->elements,fem_p->nodes, fem_p->vertices,fem_p->loads, fem_p->materials,fem_p->parameters,VyEnum);
+        DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum,VxAverageEnum);
+        DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum,VyAverageEnum);
         
         _printf_("call computational core:\n");
-        diagnostic_core_linear(&h_g,fem_p,PrognosticAnalysisEnum,NoneAnalysisEnum);
+        solver_linear(NULL,femmodel);
                 
-        _printf_("update inputs:\n");
-        UpdateInputsFromSolutionx( fem_p->elements,fem_p->nodes, fem_p->vertices, fem_p->loads, fem_p->materials, fem_p->parameters,h_g,PrognosticAnalysisEnum,NoneAnalysisEnum);
+        _printf_("extrude computed thickness on all layers:\n");
+        ExtrudeInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,ThicknessEnum);
 
-        _printf_("extrude computed thickness on all layers:\n");
-        ExtrudeInputx(fem_p->elements,fem_p->nodes, fem_p->vertices,fem_p->loads, fem_p->materials,fem_p->parameters,ThicknessEnum);
+        if(verbose)_printf_("saving results:\n");
+        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ThicknessEnum);
         
-        _printf_("extract result from extruded inputs: \n");
-        InputToResultx(&result,fem_p->elements,fem_p->nodes,fem_p->vertices, fem_p->loads, fem_p->materials,fem_p->parameters,ThicknessEnum,results->Size()+1,0,1); results->AddObject(result);
-        results->AddObject(new StringResult(results->Size()+1,AnalysisTypeEnum,0,1,EnumAsString(PrognosticAnalysisEnum)));
+}
 
-        /*Free ressources:*/
-        VecFree(&h_g);
-        
-        //return: 
-        return results;
-
-}