Changeset 17619

Timestamp:

04/01/14 13:28:22 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added initial guess when u=0 and number of non linear iterations from md.stressbalance

Location:

issm/trunk-jpl/src/c

Files:

• classes/Materials/Matice.cpp (modified) (1 diff)
• solutionsequences/solutionsequence_la_theta.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/classes/Materials/Matice.cpp

@@ -249 +249 @@
                 if(eps_eff==0.){
                         viscosity = 1.e+14/2.;
+                        //viscosity = B;
                         //viscosity=2.5*pow(10.,17);
                 }

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_la_theta.cpp

@@ -19 +19 @@
         Vector<IssmDouble>*  df     = NULL;
         Vector<IssmDouble>*  ys     = NULL;
-        int  configuration_type;
+        int  configuration_type,max_nonlinear_iterations;
 
         /*Create analysis*/
@@ -26 +26 @@
         /*Recover parameters: */
         femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
+        femmodel->parameters->FindParam(&max_nonlinear_iterations,StressbalanceMaxiterEnum);
 
         /*Update constraints and initialize d and tau if necessary*/
@@ -34 +35 @@
         int        count   = 0;
         IssmDouble eps_rel = .001;
-        femmodel->parameters->SetParam(0.6,AugmentedLagrangianREnum);
+        femmodel->parameters->SetParam(.6,AugmentedLagrangianREnum);
         GetSolutionFromInputsx(&ug,femmodel);
 
@@ -46 +47 @@
                 CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
                 Reduceloadx(pf, Kfs, ys); delete Kfs;
+
+        //      pf->Echo();
+        //      IssmDouble* temp=Kff->ToSerial();
+        //      int m,n;
+        //      Kff->GetSize(&m,&n);
+        //      printarray(temp,m,n);
+        //      xDelete<IssmDouble>(temp);
+
                 Solverx(&uf, Kff, pf, NULL, df, femmodel->parameters); 
+                //uf->Echo();
                 delete Kff; delete pf; delete df;
+
                 Mergesolutionfromftogx(&ug, uf,ys,femmodel->nodes,femmodel->parameters);delete uf; delete ys;
 
@@ -71 +82 @@
 
                 count++;
-                if(count>20) break;
+                if(count>=max_nonlinear_iterations) break;
         }