Changeset 6420

Timestamp:

10/26/10 07:39:38 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added checks on solutions

Location:

issm/trunk/src/c/objects/Elements

Files:

• Penta.cpp (modified) (13 diffs)
• Tria.cpp (modified) (5 diffs)

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -3744 +3744 @@
                 vx[i+3]=vx[i];
                 vy[i+3]=vy[i];
+
+                /*Check solution*/
+                if(isnan(vx[i])) _error_("NaN found in solution vector");
+                if(isnan(vy[i])) _error_("NaN found in solution vector");
         }
 
@@ -3841 +3845 @@
                 vx[i]=macayeal_values[i*NDOF2+0]+pattyn_values[i*NDOF2+0];
                 vy[i]=macayeal_values[i*NDOF2+1]+pattyn_values[i*NDOF2+1];
+
+                /*Check solution*/
+                if(isnan(vx[i])) _error_("NaN found in solution vector");
+                if(isnan(vy[i])) _error_("NaN found in solution vector");
         }
 
@@ -3934 +3942 @@
                 vzstokes[i]=stokes_values[i*NDOF4+2];
                 pressure[i]=stokes_values[i*NDOF4+3]*stokesreconditioning;
+
+                /*Check solution*/
+                if(isnan(vx[i]))       _error_("NaN found in solution vector");
+                if(isnan(vy[i]))       _error_("NaN found in solution vector");
+                if(isnan(vzstokes[i])) _error_("NaN found in solution vector");
+                if(isnan(pressure[i])) _error_("NaN found in solution vector");
         }
 
@@ -4006 +4020 @@
                 vx[i]=values[i*NDOF2+0];
                 vy[i]=values[i*NDOF2+1];
+
+                /*Check solution*/
+                if(isnan(vx[i])) _error_("NaN found in solution vector");
+                if(isnan(vy[i])) _error_("NaN found in solution vector");
         }
 
@@ -4092 +4110 @@
                 vzstokes[i]=stokes_values[i*NDOF4+2];
                 pressure[i]=stokes_values[i*NDOF4+3]*stokesreconditioning;
+
+                /*Check solution*/
+                if(isnan(vx[i]))       _error_("NaN found in solution vector");
+                if(isnan(vy[i]))       _error_("NaN found in solution vector");
+                if(isnan(vzstokes[i])) _error_("NaN found in solution vector");
+                if(isnan(pressure[i])) _error_("NaN found in solution vector");
         }
 
@@ -4164 +4188 @@
                 vx[i]=values[i*NDOF2+0];
                 vy[i]=values[i*NDOF2+1];
+
+                /*Check solution*/
+                if(isnan(vx[i])) _error_("NaN found in solution vector");
+                if(isnan(vy[i])) _error_("NaN found in solution vector");
         }
 
@@ -4242 +4270 @@
         /*Use the dof list to index into the solution vector vz: */
         for(i=0;i<numdof;i++) values[i]=solution[doflist[i]];
-        for(i=0;i<NUMVERTICES;i++) vz[i]=values[i*NDOF1+0];
+        for(i=0;i<NUMVERTICES;i++){
+                vz[i]=values[i*NDOF1+0];
+
+                /*Check solution*/
+                if(isnan(vz[i])) _error_("NaN found in solution vector");
+        }
 
         /*Get Vx and Vy*/
@@ -4350 +4383 @@
                 vz[i]=values[i*NDOF4+2];
                 pressure[i]=values[i*NDOF4+3];
+
+                /*Check solution*/
+                if(isnan(vx[i]))       _error_("NaN found in solution vector");
+                if(isnan(vy[i]))       _error_("NaN found in solution vector");
+                if(isnan(vz[i]))       _error_("NaN found in solution vector");
+                if(isnan(pressure[i])) _error_("NaN found in solution vector");
         }
 
@@ -4400 +4439 @@
                 lambdaz[i]=values[i*NDOF4+2];
                 lambdap[i]=values[i*NDOF4+3];
+
+                /*Check solution*/
+                if(isnan(lambdax[i])) _error_("NaN found in solution vector");
+                if(isnan(lambday[i])) _error_("NaN found in solution vector");
+                if(isnan(lambdaz[i])) _error_("NaN found in solution vector");
+                if(isnan(lambdap[i])) _error_("NaN found in solution vector");
         }
 
@@ -4433 +4478 @@
                 lambdax[i]=values[i*NDOF2+0];
                 lambday[i]=values[i*NDOF2+1];
+
+                /*Check solution*/
+                if(isnan(lambdax[i]))       _error_("NaN found in solution vector");
+                if(isnan(lambday[i]))       _error_("NaN found in solution vector");
         }
 
@@ -4459 +4508 @@
 
         /*Use the dof list to index into the solution vector: */
-        for(i=0;i<numdof;i++) values[i]=solution[doflist[i]];
+        for(i=0;i<numdof;i++){
+                values[i]=solution[doflist[i]];
+
+                /*Check solution*/
+                if(isnan(values[i])) _error_("NaN found in solution vector");
+                if(values[i]<0)      _error_("temperature < 0°K found in solution vector");
+                if(values[i]>275)    _error_("temperature > 275°K found in solution vector (Paterson's rheology associated is negative)");
+        }
 
         this->inputs->GetParameterValue(&converged,ConvergedEnum);
@@ -4491 +4547 @@
 
         /*Use the dof list to index into the solution vector: */
-        for(int i=0;i<numdof;i++) values[i]=solution[doflist[i]];
+        for(int i=0;i<numdof;i++){
+                values[i]=solution[doflist[i]];
+                if(isnan(values[i])) _error_("NaN found in solution vector");
+        }
 
         /*Add input to the element: */
@@ -4520 +4579 @@
                 values[i]         =solution[doflist[i]];
                 values[i+numdof2d]=values[i];
+                if(isnan(values[i])) _error_("NaN found in solution vector");
         }
 

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -3722 +3722 @@
 
         /*Ok, we have vx and vy in values, fill in vx and vy arrays: */
-        for(i=0;i<numdof;i++) lambda[i]=values[i];
+        for(i=0;i<numdof;i++){
+                lambda[i]=values[i];
+                if(isnan(lambda[i])) _error_("NaN found in solution vector");
+        }
 
         /*Add vx and vy as inputs to the tria element: */
@@ -3752 +3755 @@
                 lambdax[i]=values[i*NDOF2+0];
                 lambday[i]=values[i*NDOF2+1];
+
+                /*Check solution*/
+                if(isnan(lambdax[i])) _error_("NaN found in solution vector");
+                if(isnan(lambday[i])) _error_("NaN found in solution vector");
         }
 
@@ -3789 +3796 @@
                 vx[i]=values[i*NDOF2+0];
                 vy[i]=values[i*NDOF2+1];
+
+                /*Check solution*/
+                if(isnan(vx[i])) _error_("NaN found in solution vector");
+                if(isnan(vy[i])) _error_("NaN found in solution vector");
         }
 
@@ -3848 +3859 @@
                 vx[i]=values[i*NDOF2+0];
                 vy[i]=values[i*NDOF2+1];
+
+                /*Check solution*/
+                if(isnan(vx[i])) _error_("NaN found in solution vector");
+                if(isnan(vy[i])) _error_("NaN found in solution vector");
         }
 
@@ -3901 +3916 @@
 
         /*Use the dof list to index into the solution vector: */
-        for(int i=0;i<numdof;i++) values[i]=solution[doflist[i]];
+        for(int i=0;i<numdof;i++){
+                values[i]=solution[doflist[i]];
+                if(isnan(values[i])) _error_("NaN found in solution vector");
+        }
 
         /*Add input to the element: */