Changeset 24313 for issm/trunk/src/c/solutionsequences/convergence.cpp

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/solutionsequences/convergence.cpp (modified) (4 diffs)

issm/trunk/src/c

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota

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

@@ -7 +7 @@
 #include "../shared/shared.h"
 
-void convergence(bool* pconverged, Matrix<IssmDouble>* Kff,Vector<IssmDouble>* pf,Vector<IssmDouble>* uf,Vector<IssmDouble>* old_uf,IssmDouble eps_res,IssmDouble eps_rel,IssmDouble eps_abs){/*{{{*/
+void convergence(bool* pconverged, Matrix<IssmDouble>* Kff,Vector<IssmDouble>* pf,Vector<IssmDouble>* uf,Vector<IssmDouble>* old_uf,IssmDouble eps_res,IssmDouble eps_rel,IssmDouble eps_abs){
 
         /*output*/
@@ -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;
         }
 
@@ -139 +112 @@
         /*assign output*/
         *pconverged=converged;
-}/*}}}*/
-
-
+}

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota