Changeset 27176

Timestamp:

08/02/22 02:53:11 (3 years ago)

Author:

bdef

Message:

CHG: changes in the way we deal with convergence in HydroDC

Location:

issm/trunk-jpl/src/c

Files:

• modules/Reducevectorgtofx/Reducevectorgtofx.cpp (modified) (1 diff)
• solutionsequences/convergence.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/modules/Reducevectorgtofx/Reducevectorgtofx.cpp

@@ -16 +16 @@
         /*If fsize is 0, return NULL vector*/
         if(fsize==0){
-                *puf=NULL;
+                Vector<IssmDouble>* uf=new Vector<IssmDouble>(0);
+                *puf=uf;
+                //*puf=NULL;
                 return;
         }

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

@@ -1 +1 @@
 /*!\file: convergence.cpp
  * \brief: figure out if convergence has been reached
- */ 
+ */
 
 #include "../classes/classes.h"
@@ -21 +21 @@
         IssmDouble res;
         int analysis_type;
+        int ufsize;
 
         if(VerboseModule()) _printf0_("   checking convergence\n");
 
-        /*If uf is NULL in input, f-set is nil, model is fully constrained, therefore converged from 
+        /*If uf is NULL in input, f-set is nil, model is fully constrained, therefore converged from
          * the get go: */
-        if(uf->IsEmpty()){
+        uf->GetSize(&ufsize);
+        if(ufsize==0){
                 *pconverged=true;
                 return;
         }
+
+        /* if(uf->IsEmpty()){ */
+        /*      *pconverged=true; */
+        /*      return; */
+        /* } */
 
         /*Force equilibrium (Mandatory)*/
@@ -54 +61 @@
                 converged=true;
         }
-        else{ 
+        else{
                 if(VerboseConvergence()) _printf0_(setw(50)<<left<<"   mechanical equilibrium convergence criterion"<<res*100<<" > "<<eps_res*100<<" %\n");
                 converged=false;
@@ -64 +71 @@
                 //compute norm(du)/norm(u)
                 duf=old_uf->Duplicate(); old_uf->Copy(duf); duf->AYPX(uf,-1.0);
-                ndu=duf->Norm(NORM_TWO); nu=old_uf->Norm(NORM_TWO);
+                ndu=duf->Norm(NORM_TWO); nu=old_uf->Norm(NORM_TWO)+1.e-14;
 
                 if (xIsNan<IssmDouble>(ndu) || xIsNan<IssmDouble>(nu)) _error_("convergence criterion is NaN!");
@@ -76 +83 @@
                                 if(VerboseConvergence()) _printf0_(setw(50) << left << "   Convergence criterion: norm(du)/norm(u)" << ndu/nu*100 << " < " << eps_rel*100 << " %\n");
                         }
-                        else{ 
+                        else{
                                 if(VerboseConvergence()) _printf0_(setw(50) << left << "   Convergence criterion: norm(du)/norm(u)" << ndu/nu*100 << " > " << eps_rel*100 << " %\n");
                                 converged=false;