Refactoring.

trilinos · Apr 2, 2020 · be512fd · be512fd
1 parent 87b8bcf
commit be512fd
Showing 1 changed file with 11 additions and 17 deletions.
diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_IntegratedLegendreBasis_HGRAD_TET.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_IntegratedLegendreBasis_HGRAD_TET.hpp
@@ -287,17 +287,21 @@ namespace Intrepid2
             }
 
             const int edgeOrdinal = face_ordinal_of_first_edge[faceOrdinal];
-            for (int i=2; i<polyOrder_; i++)
+            int localFaceBasisOrdinal = 0;
+            for (int totalPolyOrder=3; totalPolyOrder<=polyOrder_; totalPolyOrder++)
             {
-              const int edgeBasisOrdinal = edgeOrdinal*num1DEdgeFunctions + i-2 + numVertices;
-              const auto & edgeValue = output_(edgeBasisOrdinal,pointOrdinal);
-              const int alphaOrdinal = i-2;
-
-              for (int j=1; i+j <= polyOrder_; j++)
+              for (int i=2; i<totalPolyOrder; i++)
               {
+                const int edgeBasisOrdinal = edgeOrdinal*num1DEdgeFunctions + i-2 + numVertices;
+                const auto & edgeValue = output_(edgeBasisOrdinal,pointOrdinal);
+                const int alphaOrdinal = i-2;
+
+                const int j = totalPolyOrder - i;
                 const auto & jacobiValue = jacobi_values1_at_point(alphaOrdinal,j);
-                const int fieldOrdinal = fieldOrdinalOffset + localTetFaceBasisOrdinalESEAS(polyOrder_,i,j);
+                const int fieldOrdinal = fieldOrdinalOffset + localFaceBasisOrdinal;
                 output_(fieldOrdinal,pointOrdinal) = edgeValue * jacobiValue;
+
+                localFaceBasisOrdinal++;
               }
             }
             fieldOrdinalOffset += numFaceBasisFunctionsPerFace;
@@ -456,16 +460,6 @@ namespace Intrepid2
 
             const int edgeOrdinal = face_ordinal_of_first_edge[faceOrdinal];
             int localFaceOrdinal = 0;
-            {
-//              const int min_j  = 1;
-//              const int min_i  = 2;
-//              const int min_ij = min_i + min_j;
-//              const int max_ij = polyOrder;
-//              for (int totalPolyOrder=min_ij; totalPolyOrder <= max_ij; totalPolyOrder++)
-//              {
-//                for (int ii=min_i; ii<=totalPolyOrder-min_j; ii++)
-//                {
-            }
             for (int totalPolyOrder=3; totalPolyOrder<=polyOrder_; totalPolyOrder++)
             {
               for (int i=2; i<totalPolyOrder; i++)