Version which now passes all the library regression tests locally

library/Demos/MultiRegions/Tests/Helmholtz3D_CG_Pyr.tst

@@ -8,10 +8,10 @@
     </files>
     <metrics>
         <metric type="L2" id="1">
-            <value tolerance="1e-12">5.36868e-07</value>
+            <value tolerance="1e-12">5.22808e-07</value>
         </metric>
         <metric type="Linf" id="2">
-            <value tolerance="1e-12">3.78881e-06</value>
+            <value tolerance="1e-12">4.16465e-06</value>
         </metric>
     </metrics>
 </test>

library/Demos/MultiRegions/Tests/Helmholtz3D_CG_Pyr_Deformed.tst

@@ -8,7 +8,7 @@
     </files>
     <metrics>
         <metric type="L2" id="1">
-            <value tolerance="1e-12">4.61818e-05</value>
+            <value tolerance="1e-12">4.1907e-05</value>
         </metric>
         <metric type="Linf" id="2">
             <value tolerance="1e-12">0.000329233</value>

library/LibUtilities/Foundations/Basis.cpp

@@ -619,7 +619,11 @@ namespace Nektar
                             // face 0 
                             for(i = 0; i < numPoints; ++i)
                             {
-                                mode[i] = pow(m_bdata[i],p+q); // [(1-z)/2]^{p+q}
+                                // [(1-z)/2]^{p+q-2} Note in book it
+                                // seems to suggest p+q-1 but that
+                                // does not seem to give complete
+                                // polynomial space for pyramids
+                                mode[i] = pow(m_bdata[i],p+q-2);
                             }
 
                             one_m_z_pow  = mode;
@@ -628,7 +632,7 @@ namespace Nektar
                             // interior 
                             for(int r = 1; r < numModes-max(p,q); ++r)
                             {
-                                Polylib::jacobfd(numPoints,z.data(),mode,NULL,r-1,2*p+2*q-1,1.0);
+                                Polylib::jacobfd(numPoints,z.data(),mode,NULL,r-1,2*p+2*q-3,1.0);
                                 
                                 for(i = 0; i <  numPoints; ++i)
                                 {

library/SpatialDomains/MeshGraph.cpp

@@ -3306,7 +3306,7 @@ namespace Nektar
                             returnval.push_back(bkey);
 
                             const LibUtilities::PointsKey pkey1(nummodes+quadoffset-1, LibUtilities::eGaussRadauMAlpha2Beta0);
-                            LibUtilities::BasisKey bkey1(LibUtilities::eModified_C, nummodes, pkey1);
+                            LibUtilities::BasisKey bkey1(LibUtilities::eModifiedPyr_C, nummodes, pkey1);
                             returnval.push_back(bkey1);
                         }
                         break;

library/SpatialDomains/PyrGeom.cpp

@@ -600,7 +600,7 @@ namespace Nektar
                     if (fabs(elementAaxis_length*faceBaxis_length
                             - fabs(dotproduct1)) > NekConstants::kNekZeroTol)
                     {
-                        cout << "Warning: Prism axes not parallel" << endl;
+                        cout << "Warning: Pyramid axes not parallel" << endl;
                     }
 
                     // if the result is negative, both axis point in reverse
@@ -621,7 +621,7 @@ namespace Nektar
                     if (fabs(elementBaxis_length*faceAaxis_length
                             - fabs(dotproduct2)) > NekConstants::kNekZeroTol)
                     {
-                        cout << "Warning: Prism axes not parallel" << endl;
+                        cout << "Warning: Pyramid axes not parallel" << endl;
                     }
 
                     if( dotproduct2 < 0.0 )
@@ -710,7 +710,7 @@ namespace Nektar
                 LibUtilities::PointsKey(
                     order1+1, LibUtilities::eGaussLobattoLegendre));
             const LibUtilities::BasisKey C(
-                LibUtilities::eModified_C, order2,
+                LibUtilities::eModifiedPyr_C, order2,
                 LibUtilities::PointsKey(
                     order2, LibUtilities::eGaussRadauMAlpha2Beta0));
 

library/StdRegions/StdExpansion3D.cpp

@@ -422,6 +422,7 @@ namespace Nektar
                 }
                 case LibUtilities::eModified_B:
                 case LibUtilities::eModified_C:
+                case LibUtilities::eModifiedPyr_C:
                 {
                     switch (facedir)
                     {
@@ -484,6 +485,7 @@ namespace Nektar
                 case LibUtilities::eOrtho_A:
                 case LibUtilities::eOrtho_B:
                 case LibUtilities::eOrtho_C:
+                case LibUtilities::eOrthoPyr_C:
                 {
                     switch (facedir)
                     {

library/StdRegions/StdPyrExp.h

@@ -98,8 +98,6 @@ namespace Nektar
 
             STD_REGIONS_EXPORT ~StdPyrExp();
 
-            STD_REGIONS_EXPORT int GetTetMode(int I, int J, int K);
-
         protected:
             //---------------------------------------
             // Differentiation/integration Methods
@@ -257,8 +255,7 @@ namespace Nektar
             //---------------------------------------
             // Private helper functions
             //---------------------------------------
-            std::map<Mode, unsigned int, cmpop> m_map;
-            std::map<int, std::map<int, std::map<int, std::pair<int, int> > > > m_idxMap;
+            STD_REGIONS_EXPORT int GetMode(int I, int J, int K);
         };    
         typedef boost::shared_ptr<StdPyrExp> StdPyrExpSharedPtr;
     } //end of namespace