Changeset 15352

Timestamp:

06/28/13 15:50:56 (12 years ago)

Author:

bdef

Message:

CHG:Minor modification in Hydro Solver naming

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Tria.cpp (modified) (5 diffs)
• classes/FemModel.cpp (modified) (2 diffs)
• solutionsequences/solutionsequence_hydro_nonlinear.cpp (modified) (11 diffs)

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -6132 +6132 @@
 
                 gauss->GaussPoint(ig);
-
                 GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss);
 
@@ -6157 +6156 @@
                 }
         }
-
         /*Clean up and return*/
         delete gauss;
@@ -6244 +6242 @@
         /* Start  looping on the number of gaussian points: */
         gauss=new GaussTria(2);
-
         for(int ig=gauss->begin();ig<gauss->end();ig++){
 
                 gauss->GaussPoint(ig);
-
                 GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss);
                 GetNodalFunctions(basis, gauss);
@@ -6311 +6307 @@
 
                 gauss->GaussPoint(ig);
-
                 GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss);
                 GetNodalFunctions(basis, gauss);
@@ -6691 +6686 @@
                 /*Increase of the efficient system is needed if the epl head reach the maximum value (sediment max value for now)*/
                 this->GetHydrologyDCInefficientHmax(&h_max,nodes[i]);
-                if(eplhead[i]>=h_max && this->AnyActive()){                     
+                if(eplhead[i]>=h_max && this->AnyActive()){
                         for(j=0;j<numdof;j++){
                                 if(old_active[j]>0.){

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -853 +853 @@
                         element->CreateKMatrix(Kff_temp,NULL);
                 }
+
                 for (i=0;i<this->loads->Size();i++){
                         load=dynamic_cast<Load*>(this->loads->GetObjectByOffset(i));
@@ -872 +873 @@
                 element->CreateKMatrix(Kff,Kfs);
         }
+        
         for (i=0;i<this->loads->Size();i++){
                 load=dynamic_cast<Load*>(this->loads->GetObjectByOffset(i));

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

@@ -9 +9 @@
 
 void solutionsequence_hydro_nonlinear(FemModel* femmodel){
-
         /*solution : */
         Vector<IssmDouble>* ug_sed=NULL;
         Vector<IssmDouble>* ug_epl=NULL; 
         Vector<IssmDouble>* uf=NULL;
-        Vector<IssmDouble>* old_uf=NULL; 
-        Vector<IssmDouble>* aged_ug_sed=NULL; 
-        Vector<IssmDouble>* aged_ug_epl=NULL; 
+        Vector<IssmDouble>* uf_int_iter=NULL; 
+        Vector<IssmDouble>* ug_sed_main_iter=NULL; 
+        Vector<IssmDouble>* ug_epl_main_iter=NULL; 
         Vector<IssmDouble>* ys=NULL; 
         Vector<IssmDouble>* dug=NULL; 
-
+        Vector<IssmDouble>* old_ug=NULL; 
+        
         Matrix<IssmDouble>* Kff=NULL;
         Matrix<IssmDouble>* Kfs=NULL;
@@ -34 +34 @@
         IssmDouble eps_hyd;
         IssmDouble ndu_sed,nu_sed;
-        IssmDouble ndu_epl,nu_epl;      
+        IssmDouble ndu_epl,nu_epl;
 
         /*Recover parameters: */
@@ -41 +41 @@
         femmodel->parameters->FindParam(&eps_hyd,HydrologydcRelTolEnum);
         femmodel->parameters->FindParam(&time,TimeEnum);
-        hydro_maxiter=100;
+        hydro_maxiter=150;
         hydrocount=1;
 
@@ -57 +57 @@
                 eplcount=1;
                 //save pointer to old velocity
-                delete aged_ug_sed;
-                aged_ug_sed=ug_sed;
+                delete ug_sed_main_iter;
+                ug_sed_main_iter=ug_sed;
                 if(isefficientlayer){
-                        delete aged_ug_epl;
-                        aged_ug_epl=ug_epl;
+                        delete ug_epl_main_iter;
+                        ug_epl_main_iter=ug_epl;
                 }
 
@@ -78 +78 @@
                         Reduceloadx(pf,Kfs,ys); delete Kfs;
                         delete uf;
-                        Solverx(&uf, Kff, pf,old_uf, df, femmodel->parameters);
-                        delete old_uf; old_uf=uf->Duplicate();
-                        if(sedcount>1)delete ug_sed; /*Not on first time to avoid deleting aged_ug_sed*/
+                        Solverx(&uf, Kff, pf,uf_int_iter, df, femmodel->parameters);
+                        delete uf_int_iter; uf_int_iter=uf->Duplicate();
+                        if(sedcount>1)delete ug_sed; /*Not on first time to avoid deleting ug_sed_main_iter*/
                         delete Kff; delete pf; delete df;
 
@@ -120 +120 @@
                                 Reduceloadx(pf,Kfs,ys); delete Kfs;
                                 delete uf;
-                                Solverx(&uf, Kff, pf,old_uf, df, femmodel->parameters);
-                                delete old_uf; old_uf=uf->Duplicate();
+                                Solverx(&uf, Kff, pf,uf_int_iter, df, femmodel->parameters);
+                                delete uf_int_iter; uf_int_iter=uf->Duplicate();
                                 if(eplcount>1) delete ug_epl; 
                                 delete Kff;delete pf;
@@ -127 +127 @@
                                 Mergesolutionfromftogx(&ug_epl,uf,ys,femmodel->nodes,femmodel->parameters); delete ys;
                                 InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug_epl);
-                                //femmodel->HydrologyEPLupdateDomainx();
                                 ConstraintsStatex(&constraints_converged,&num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
+                                femmodel->HydrologyEPLupdateDomainx();                  
                                 
                                 if (!eplconverged){
@@ -138 +138 @@
                                 }
                                 eplcount++;
-                                
+
                                 if(eplconverged){
                                         InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,eplconverged,ConvergedEnum);
                                         InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,sediment_kmax,MeltingOffsetEnum);
                                         InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug_epl);
-                                        //femmodel->HydrologyEPLupdateDomainx();
                                         break;
                                 }
@@ -152 +151 @@
                         //compute norm(du)/norm(u)
                         dug=ug_sed->Duplicate(); _assert_(dug);
-                        aged_ug_sed->Copy(dug); 
+                        ug_sed_main_iter->Copy(dug);    
                         dug->AYPX(ug_sed,-1.0);
-                        ndu_sed=dug->Norm(NORM_TWO); nu_sed=aged_ug_sed->Norm(NORM_TWO);
+                        ndu_sed=dug->Norm(NORM_TWO); nu_sed=ug_sed_main_iter->Norm(NORM_TWO);
                         if (xIsNan<IssmDouble>(ndu_sed) || xIsNan<IssmDouble>(nu_sed)) _error_("Sed convergence criterion is NaN!");
                         if (!xIsNan<IssmDouble>(eps_hyd)){
                                 if (!isefficientlayer){
                                         if ((ndu_sed/nu_sed)<eps_hyd){
-                                                if(VerboseConvergence()) _printf0_(setw(50) << left << "   Converged \n");
+                                                if(VerboseConvergence()) _printf0_(setw(50) << left << "   Converged after, " << hydrocount << " iterations \n");
                                                 hydroconverged=true;
                                         }
@@ -169 +168 @@
                                 else{
                                         dug=ug_epl->Duplicate();_assert_(dug); 
-                                        aged_ug_epl->Copy(dug);_assert_(aged_ug_epl); 
+                                        ug_epl_main_iter->Copy(dug);_assert_(ug_epl_main_iter); 
                                         dug->AYPX(ug_epl,-1.0);
                                         ndu_epl=dug->Norm(NORM_TWO); 
-                                        nu_epl=aged_ug_epl->Norm(NORM_TWO);
+                                        nu_epl=ug_epl_main_iter->Norm(NORM_TWO);
 
                                         if (xIsNan<IssmDouble>(ndu_epl) || xIsNan<IssmDouble>(nu_epl)) _error_("EPL convergence criterion is NaN!");
                                         if (ndu_epl==0.0 && nu_epl==0.0) nu_epl=1.0e-6; /*Hacking the case where the EPL is used but empty*/
-                                        if ((ndu_epl/nu_epl)<eps_hyd && (ndu_sed/nu_sed)<eps_hyd){
-                                                if (VerboseConvergence()) _printf0_(setw(50) << left << "   Converged \n");
+                                        if ((ndu_epl/nu_epl)<eps_hyd && (ndu_sed/nu_sed)<(eps_hyd*10)){
+                                                if (VerboseConvergence()) _printf0_(setw(50) << left << "   Converged after, " << hydrocount << " iterations \n");
                                                 hydroconverged=true;
                                         }
@@ -202 +201 @@
         delete ug_sed;
         delete uf;
-        delete old_uf;
-        delete aged_ug_sed;
-        delete aged_ug_epl;
+        delete uf_int_iter;
+        delete ug_sed_main_iter;
+        delete ug_epl_main_iter;
         delete dug;
-
 }