Changeset 1413

Timestamp:

07/29/09 14:23:13 (16 years ago)

Author:

Mathieu Morlighem

Message:

Added residue convergence criterion

File:

• issm/trunk/src/c/parallel/diagnostic_core_nonlinear.cpp (modified) (4 diffs)

issm/trunk/src/c/parallel/diagnostic_core_nonlinear.cpp

@@ -20 +20 @@
         Vec old_uf=NULL; 
         DataSet* loads=NULL;
-        Vec residue=NULL;
         Vec KU=NULL;
+        Vec KUF=NULL;
 
         /*intermediary: */
@@ -37 +37 @@
         Vec dug=NULL;
         double ndu,nduinf,nu;
-        double nresidue;
+        double nKUF;
+        double nF;
+        double residue;
 
         /*parameters:*/
@@ -113 +115 @@
 
                 /*Compute residue*/
+                //compute KUF = KU - F = K*U - F
                 VecDuplicate(uf,&KU); MatMultPatch(Kff,uf,KU);
-                VecDuplicate(KU,&residue);VecCopy(KU,residue); VecAYPX(residue,-1.0,pf);
-                VecNorm(residue,NORM_2,&nresidue); VecFree(&residue);
+                VecDuplicate(KU,&KUF);VecCopy(KU,KUF); VecAYPX(KUF,-1.0,pf);
+                //comput norm(KUF), norm(F) and residue
+                VecNorm(KUF,NORM_2,&nKUF); VecFree(&KUF);
+                VecNorm(pf,NORM_2,&nF);
+                residue=nKUF/nF;
         
                 //no need for Kff and pf anymore
@@ -137 +143 @@
 
                 //residue
-                if (debug) _printf_("%s%g\n","   Convergence criterion: norm(residue)=",nresidue);
+                if (debug) _printf_("%s%g\n","   Convergence criterion: norm(KU-F)/norm(F)=",residue);
 
                 //relative criterion