Changeset 4114

Timestamp:

06/21/10 18:03:02 (15 years ago)

Author:

Eric.Larour

Message:

New serial solvers.
New SetCurrentAnalysis serial routine.

Location:

issm/trunk/src

Files:

• c/solvers/solver_diagnostic_nonlinear.cpp (modified) (8 diffs)
• m/solutions/jpl/NewFemModel.m (modified) (1 diff)
• m/solutions/jpl/SetCurrentAnalysis.m (added)
• m/solutions/jpl/SetCurrentAnalysisAlias.m (added)
• m/solutions/jpl/diagnostic_core_linear.m (deleted)
• m/solutions/jpl/diagnostic_core_nonlinear.m (deleted)
• m/solutions/jpl/thermal_core_nonlinear.m (deleted)
• m/solvers (added)
• m/solvers/solver_diagnostic_nonlinear.m (added)
• m/solvers/solver_linear.m (added)
• m/solvers/solver_thermal_nonlinear.m (added)

issm/trunk/src/c/solvers/solver_diagnostic_nonlinear.cpp

@@ -10 +10 @@
 #include "./solvers.h"
 
-void solver_diagnostic_nonlinear(Vec* pug,Mat* pKff0,Mat* pKfs0, FemModel* fem,bool conserve_loads){
+void solver_diagnostic_nonlinear(Vec* pug,Mat* pKff0,Mat* pKfs0, FemModel* femmodel,bool conserve_loads){
 
 
@@ -42 +42 @@
         /*Recover parameters: */
         kflag=1; pflag=1;
-        fem->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
-        fem->parameters->FindParam(&solver_string,SolverStringEnum);
-        fem->parameters->FindParam(&dim,DimEnum);
-        fem->parameters->FindParam(&verbose,VerboseEnum);
-        fem->parameters->FindParam(&min_mechanical_constraints,MinMechanicalConstraintsEnum);
-        fem->parameters->FindParam(&max_nonlinear_iterations,MaxNonlinearIterationsEnum);
+        femmodel->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
+        femmodel->parameters->FindParam(&solver_string,SolverStringEnum);
+        femmodel->parameters->FindParam(&dim,DimEnum);
+        femmodel->parameters->FindParam(&verbose,VerboseEnum);
+        femmodel->parameters->FindParam(&min_mechanical_constraints,MinMechanicalConstraintsEnum);
+        femmodel->parameters->FindParam(&max_nonlinear_iterations,MaxNonlinearIterationsEnum);
         
         /*Were loads requested as output? : */
         if(conserve_loads){
-                loads=fem->loads->Copy(); //protect loads from being modified by the solution
+                loads=femmodel->loads->Copy(); //protect loads from being modified by the solution
         }
         else{
-                loads=fem->loads; //modify loads  in this solution
+                loads=femmodel->loads; //modify loads  in this solution
         }
 
@@ -61 +61 @@
 
         /*Start non-linear iteration using input velocity: */
-        GetSolutionFromInputsx(&ug, fem->elements, fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters);
-        Reducevectorgtofx(&uf, ug, fem->nodesets);
+        GetSolutionFromInputsx(&ug, femmodel->elements, femmodel->nodes, femmodel->vertices, loads, femmodel->materials, femmodel->parameters);
+        Reducevectorgtofx(&uf, ug, femmodel->nodesets);
 
         for(;;){
@@ -71 +71 @@
 
                 if (verbose) _printf_("   Generating matrices\n");
-                //*Generate system matrices
-                SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem->vertices,loads,fem->materials,fem->parameters,kflag,pflag);
+                SystemMatricesx(&Kgg, &pg,femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters,kflag,pflag);
 
                 if (verbose) _printf_("   Generating penalty matrices\n");
-                //*Generate penalty system matrices
-                PenaltySystemMatricesx(Kgg, pg,NULL,fem->elements,fem->nodes,fem->vertices,loads,fem->materials,fem->parameters,kflag,pflag);
-
+                PenaltySystemMatricesx(Kgg, pg,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters,kflag,pflag);
+                
                 if (verbose) _printf_("   reducing matrix from g to f set\n");
-                /*!Reduce matrix from g to f size:*/
-                Reducematrixfromgtofx(&Kff,&Kfs,Kgg,fem->Gmn,fem->nodesets);
+                Reducematrixfromgtofx(&Kff,&Kfs,Kgg,femmodel->Gmn,femmodel->nodesets);
 
                 /*Free ressources: */
@@ -86 +83 @@
         
                 if (verbose) _printf_("   reducing load from g to f set\n");
-                /*!Reduce load from g to f size: */
-                Reduceloadfromgtofx(&pf, pg, fem->Gmn, Kfs, fem->ys, fem->nodesets);
+                Reduceloadfromgtofx(&pf, pg, femmodel->Gmn, Kfs, femmodel->ys, femmodel->nodesets);
 
                 //no need for pg and Kfs anymore 
@@ -93 +89 @@
                 MatFree(&Kfs);
 
-                /*Solve: */
                 if (verbose) _printf_("   solving\n");
                 Solverx(&uf, Kff, pf, old_uf, solver_string);
 
-                //Merge back to g set
                 if (verbose) _printf_("   merging solution from f to g set\n");
-                Mergesolutionfromftogx(&ug, uf,fem->Gmn,fem->ys,fem->nodesets);
+                Mergesolutionfromftogx(&ug, uf,femmodel->Gmn,femmodel->ys,femmodel->nodesets);
 
                 //Update inputs using new solution:
-                InputUpdateFromSolutionx( fem->elements,fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters,ug);
+                InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug);
 
-                //Deal with penalty loads
                 if (verbose) _printf_("   penalty constraints\n");
-                PenaltyConstraintsx(&constraints_converged, &num_unstable_constraints, fem->elements,fem->nodes,fem->vertices,loads,fem->materials,fem->parameters);
+                PenaltyConstraintsx(&constraints_converged, &num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters);
 
                 if(verbose)_printf_("   number of unstable constraints: %i\n",num_unstable_constraints);
 
                 /*Figure out if convergence is reached.*/
-                convergence(&converged,Kff,pf,uf,old_uf,fem->parameters);
+                convergence(&converged,Kff,pf,uf,old_uf,femmodel->parameters);
                 MatFree(&Kff);VecFree(&pf);
                 
                 /*add converged to inputs: */
-                InputUpdateFromConstantx( fem->elements,fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters,converged,ConvergedEnum);
+                InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,converged,ConvergedEnum);
 
                 //rift convergence
@@ -137 +130 @@
         if (dim==3){
                 if(verbose)_printf_("%s\n","extruding velocity and pressure in 3d...");
-                InputExtrudex( fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,VxEnum);
-                InputExtrudex( fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,VyEnum);
+                InputExtrudex( femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum);
+                InputExtrudex( femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum);
         }
 
@@ -146 +139 @@
                 kflag=1; pflag=0; //stiffness generation only
         
-                SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem->vertices,loads,fem->materials,fem->parameters,kflag,pflag);
-                Reducematrixfromgtofx(&Kff,&Kfs,Kgg,fem->Gmn,fem->nodesets);
+                SystemMatricesx(&Kgg, &pg,femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters,kflag,pflag);
+                Reducematrixfromgtofx(&Kff,&Kfs,Kgg,femmodel->Gmn,femmodel->nodesets);
                 MatFree(&Kgg);VecFree(&pg);
 

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

@@ -31 +31 @@
 
                    displaystring(md.verbose,'%s','      generating single point constraints...');
-                   [femmodel.nodes,femmodel.yg(i)]=SpcNodes(femmodel.nodes,femmodel.constraints,analysis_type);
+                   [femmodel.nodes,femmodel.m_yg(i)]=SpcNodes(femmodel.nodes,femmodel.constraints,analysis_type);
 
                    displaystring(md.verbose,'%s','      generating rigid body constraints...');
-                   [femmodel.Rmg(i),femmodel.nodes]=MpcNodes(femmodel.nodes,femmodel.constraints,analysis_types);
+                   [femmodel.m_Rmg(i),femmodel.nodes]=MpcNodes(femmodel.nodes,femmodel.constraints,analysis_types);
 
                    displaystring(md.verbose,'%s','      generating node sets...');
-                   femmodel.nodesets(i)=BuildNodeSets(femmodel.nodes,analysis_type);
+                   femmodel.m_nodesets(i)=BuildNodeSets(femmodel.nodes,analysis_type);
 
                    displaystring(md.verbose,'%s','      reducing single point constraints vector...');
-                   femmodel.ys(i)=Reducevectorgtos(femmodel.yg(i).vector,femmodel.nodesets(i));
+                   femmodel.m_ys(i)=Reducevectorgtos(femmodel.m_yg(i).vector,femmodel.m_nodesets(i));
 
                    displaystring(md.verbose,'%s','      normalizing rigid body constraints matrix...');
-                   femmodel.Gmn(i)= NormalizeConstraints(femmodel.Rmg(i),femmodel.nodesets(i));
+                   femmodel.m_Gmn(i)= NormalizeConstraints(femmodel.m_Rmg(i),femmodel.m_nodesets(i));
 
                    displaystring(md.verbose,'%s','      configuring element and loads...');