Changeset 16421

Timestamp:

10/16/13 08:03:50 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplifying InputUpdateFromSolution

File:

• issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -4403 +4403 @@
         /*Initialize values*/
         IssmDouble* values   = xNew<IssmDouble>(vnumdof+pnumdof);
-        IssmDouble* vvalues  = xNew<IssmDouble>(vnumdof);
-        IssmDouble* pvalues  = xNew<IssmDouble>(pnumdof);
         IssmDouble* vx       = xNew<IssmDouble>(vnumnodes);
         IssmDouble* vy       = xNew<IssmDouble>(vnumnodes);
@@ -4425 +4423 @@
         TransformSolutionCoord(&values[0],nodes,vnumnodes+pnumdof,cs_list);
 
-        /*Use the dof list to index into the solution vector: */
-        for(i=0;i<vnumdof;i++) vvalues[i]=values[i];
-        for(i=0;i<pnumdof;i++) pvalues[i]=values[vnumdof+i];
-
         /*Ok, we have vx and vy in values, fill in all arrays: */
         for(i=0;i<vnumnodes;i++){
-                vx[i] = vvalues[i*NDOF2+0];
-                vy[i] = vvalues[i*NDOF2+1];
+                vx[i] = values[i*NDOF2+0];
+                vy[i] = values[i*NDOF2+1];
                 if(xIsNan<IssmDouble>(vx[i])) _error_("NaN found in solution vector");
                 if(xIsNan<IssmDouble>(vy[i])) _error_("NaN found in solution vector");
         }
         for(i=0;i<pnumnodes;i++){
-                pressure[i] = pvalues[i];
+                pressure[i] = values[vnumdof+i];
                 if(xIsNan<IssmDouble>(pressure[i])) _error_("NaN found in solution vector");
         }
@@ -4443 +4437 @@
         /*Recondition pressure and compute vel: */
         this->parameters->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum);
-        for(i=0;i<pnumnodes;i++) pressure[i]=pressure[i]*FSreconditioning;
-        for(i=0;i<vnumnodes;i++) vel[i]=sqrt(vx[i]*vx[i] + vy[i]*vy[i]);
+        for(i=0;i<pnumnodes;i++) pressure[i] = pressure[i]*FSreconditioning;
+        for(i=0;i<vnumnodes;i++) vel[i]      = sqrt(vx[i]*vx[i] + vy[i]*vy[i]);
 
         /*Now, we have to move the previous inputs  to old 
@@ -4464 +4458 @@
         xDelete<IssmDouble>(vx);
         xDelete<IssmDouble>(values);
-        xDelete<IssmDouble>(vvalues);
-        xDelete<IssmDouble>(pvalues);
         xDelete<int>(vdoflist);
         xDelete<int>(pdoflist);