Changeset 8815

Timestamp:

07/06/11 09:15:35 (14 years ago)

Author:

Mathieu Morlighem

Message:

Always use configuration

Location:

issm/trunk/src/c/solvers

Files:

• solver_adjoint_linear.cpp (modified) (1 diff)
• solver_nonlinear.cpp (modified) (3 diffs)
• solver_stokescoupling_nonlinear.cpp (modified) (4 diffs)
• solver_thermal_nonlinear.cpp (modified) (3 diffs)

issm/trunk/src/c/solvers/solver_adjoint_linear.cpp ¶

@@ -18 +18 @@
         Vec  df  = NULL;
         Vec  ys  = NULL;
-        int  analysis_type;
+        int  configuration_type;
 
         /*Recover parameters: */
-        femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+        femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
 
         SystemMatricesx(&Kff, &Kfs, &pf, &df, NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-        CreateNodalConstraintsx(&ys,femmodel->nodes,analysis_type);
+        CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
         Reduceloadx(pf, Kfs, ys,true); MatFree(&Kfs); //true means spc = 0
         Solverx(&uf, Kff, pf, NULL, df, femmodel->parameters); MatFree(&Kff); VecFree(&pf); VecFree(&df);

issm/trunk/src/c/solvers/solver_nonlinear.cpp ¶

@@ -29 +29 @@
         int min_mechanical_constraints;
         int max_nonlinear_iterations;
-        int  analysis_type;
+        int  configuration_type;
 
 
@@ -35 +35 @@
         femmodel->parameters->FindParam(&min_mechanical_constraints,MinMechanicalConstraintsEnum);
         femmodel->parameters->FindParam(&max_nonlinear_iterations,MaxNonlinearIterationsEnum);
-        femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+        femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
 
         /*Were loads requested as output? : */
@@ -58 +58 @@
 
                 SystemMatricesx(&Kff, &Kfs, &pf, &df, NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters);
-                CreateNodalConstraintsx(&ys,femmodel->nodes,analysis_type);
+                CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
                 Reduceloadx(pf, Kfs, ys); MatFree(&Kfs);
                 Solverx(&uf, Kff, pf, old_uf, df, femmodel->parameters);

issm/trunk/src/c/solvers/solver_stokescoupling_nonlinear.cpp ¶

@@ -30 +30 @@
         int min_mechanical_constraints;
         int max_nonlinear_iterations;
-        int analysis_type;
+        int configuration_type;
 
         /*Recover parameters: */
@@ -49 +49 @@
                 /*First diagnostic horiz:*/
                 femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
-                femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+                femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
         
                 //Update once again the solution to make sure that vx and vxold are similar (for next step in transient or steadystate)
@@ -59 +59 @@
                 /*solve: */
                 SystemMatricesx(&Kff_horiz, &Kfs_horiz, &pf_horiz, &df_horiz, NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-                CreateNodalConstraintsx(&ys,femmodel->nodes,analysis_type);
+                CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
                 Reduceloadx(pf_horiz, Kfs_horiz, ys); MatFree(&Kfs_horiz);
                 Solverx(&uf_horiz, Kff_horiz, pf_horiz, old_uf_horiz, df_horiz,femmodel->parameters);
@@ -69 +69 @@
                 /*Second compute vertical velocity: */
                 femmodel->SetCurrentConfiguration(DiagnosticVertAnalysisEnum);
-                femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+                femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
                 
                 /*solve: */
                 SystemMatricesx(&Kff_vert, &Kfs_vert, &pf_vert,  &df_vert,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-                CreateNodalConstraintsx(&ys,femmodel->nodes,analysis_type);
+                CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
                 Reduceloadx(pf_vert, Kfs_vert, ys); MatFree(&Kfs_vert);
                 Solverx(&uf_vert, Kff_vert, pf_vert, NULL, df_vert,femmodel->parameters); MatFree(&Kff_vert); VecFree(&pf_vert); VecFree(&df_vert);

issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp ¶

@@ -33 +33 @@
         int kflag,pflag;
         bool lowmem=0;
-        int  analysis_type;
+        int  configuration_type;
 
 
@@ -40 +40 @@
         femmodel->parameters->FindParam(&lowmem,LowmemEnum);
         femmodel->parameters->FindParam(&min_thermal_constraints,MinThermalConstraintsEnum);
-        femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+        femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
 
         count=1;
@@ -51 +51 @@
 
                 SystemMatricesx(&Kff, &Kfs, &pf,&df, &melting_offset,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-                CreateNodalConstraintsx(&ys,femmodel->nodes,analysis_type);
+                CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
                 Reduceloadx(pf, Kfs, ys); MatFree(&Kfs); VecFree(&tf);
                 Solverx(&tf, Kff, pf,tf_old, df, femmodel->parameters);