Changeset 24082 for issm/trunk-jpl/src/c/solutionsequences/convergence.cpp

Timestamp:

07/11/19 11:37:13 (6 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added md.toolkits.RecoveryAnalysis, which is a recovery mode when default solver fails

File:

• issm/trunk-jpl/src/c/solutionsequences/convergence.cpp (modified) (2 diffs)

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

@@ -13 +13 @@
 
         /*intermediary*/
-        Vector<IssmDouble>* KU=NULL;
-        Vector<IssmDouble>* KUF=NULL;
         Vector<IssmDouble>* KUold=NULL;
         Vector<IssmDouble>* KUoldF=NULL;
         Vector<IssmDouble>* duf=NULL;
         IssmDouble ndu,nduinf,nu;
-        IssmDouble nKUF;
         IssmDouble nKUoldF;
         IssmDouble nF;
-        IssmDouble solver_residue,res;
+        IssmDouble res;
         int analysis_type;
 
@@ -32 +29 @@
                 *pconverged=true;
                 return;
-        }
-
-
-        /*Display solver caracteristics*/
-        if (VerboseConvergence()){
-
-        
-
-                /*compute KUF = KU - F = K*U - F*/
-                KU=uf->Duplicate(); Kff->MatMult(uf,KU);
-                KUF=KU->Duplicate(); KU->Copy(KUF); KUF->AYPX(pf,-1.0);
-
-                /*compute norm(KUF), norm(F) and residue*/
-                nKUF=KUF->Norm(NORM_TWO);
-                nF=pf->Norm(NORM_TWO);
-                solver_residue=nKUF/nF;
-                _printf0_("\n" << "   solver residue: norm(KU-F)/norm(F)=" << solver_residue << "\n");
-                if(xIsNan<IssmDouble>(solver_residue)){
-                        //Kff->Echo();
-                }
-
-                /*clean up*/
-                delete KU;
-                delete KUF;
         }