Changeset 27170

Timestamp:

08/01/22 11:52:48 (3 years ago)

Author:

jdquinn

Message:

BUG: Reverting Basile’s commit temporarily

Location:

issm/trunk-jpl/src/c

Files:

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

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

@@ -16 +16 @@
         /*If fsize is 0, return NULL vector*/
         if(fsize==0){
-                Vector<IssmDouble>* uf=new Vector<IssmDouble>(0);
-                *puf=uf;
-                //*puf=NULL;
+                *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"
@@ -24 +24 @@
         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()){
@@ -39 +39 @@
         nKUoldF=KUoldF->Norm(NORM_TWO);
         nF=pf->Norm(NORM_TWO);
-        nF+=1.0e14;
         res=nKUoldF/nF;
         if (xIsNan<IssmDouble>(res)){
@@ -55 +54 @@
                 converged=true;
         }
-        else{
+        else{ 
                 if(VerboseConvergence()) _printf0_(setw(50)<<left<<"   mechanical equilibrium convergence criterion"<<res*100<<" > "<<eps_res*100<<" %\n");
                 converged=false;
@@ -66 +65 @@
                 duf=old_uf->Duplicate(); old_uf->Copy(duf); duf->AYPX(uf,-1.0);
                 ndu=duf->Norm(NORM_TWO); nu=old_uf->Norm(NORM_TWO);
+
                 if (xIsNan<IssmDouble>(ndu) || xIsNan<IssmDouble>(nu)) _error_("convergence criterion is NaN!");
 
@@ -76 +76 @@
                                 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;