Panzer: Fixing integration values side qp construction

packages/panzer/adapters-stk/test/panzer_workset_builder/CMakeLists.txt

@@ -54,3 +54,10 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST(
   COMM serial mpi
   NUM_MPI_PROCS 1
   )
+
+TRIBITS_ADD_EXECUTABLE_AND_TEST(
+  check_sorted_face_quads
+  SOURCES check_sorted_face_quads.cpp ${UNIT_TEST_DRIVER}
+  COMM serial mpi
+  NUM_MPI_PROCS 1
+  )

packages/panzer/adapters-stk/test/panzer_workset_builder/check_sorted_face_quads.cpp

@@ -0,0 +1,246 @@
+// @HEADER
+// ***********************************************************************
+//
+//           Panzer: A partial differential equation assembly
+//       engine for strongly coupled complex multiphysics systems
+//                 Copyright (2011) Sandia Corporation
+//
+// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// the U.S. Government retains certain rights in this software.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Questions? Contact Roger P. Pawlowski ([email protected]) and
+// Eric C. Cyr ([email protected])
+// ***********************************************************************
+// @HEADER
+//
+
+#include <iomanip>
+
+#include <Teuchos_ConfigDefs.hpp>
+#include <Teuchos_UnitTestHarness.hpp>
+#include <Teuchos_RCP.hpp>
+#include <Teuchos_TimeMonitor.hpp>
+
+using Teuchos::RCP;
+using Teuchos::rcp;
+
+#include "Teuchos_DefaultComm.hpp"
+#include "Teuchos_GlobalMPISession.hpp"
+
+#include "Panzer_STK_Version.hpp"
+#include "PanzerAdaptersSTK_config.hpp"
+
+#include "Panzer_WorksetContainer.hpp"
+#include "Panzer_WorksetDescriptor.hpp"
+#include "Panzer_WorksetNeeds.hpp"
+#include "Panzer_IntrepidBasisFactory.hpp"
+#include "Panzer_IntegrationDescriptor.hpp"
+#include "Panzer_DOFManager.hpp"
+#include "Panzer_SubcellConnectivity.hpp"
+
+
+#include "Panzer_STK_Interface.hpp"
+#include "Panzer_STK_SquareQuadMeshFactory.hpp"
+#include "Panzer_STKConnManager.hpp"
+#include "Panzer_STK_WorksetFactory.hpp"
+
+namespace panzer {
+
+  TEUCHOS_UNIT_TEST(check_sorted_face_quads, basic)
+  {
+    using Teuchos::RCP;
+    using Teuchos::rcp;
+
+    typedef Intrepid2::Basis<PHX::Device::execution_space,double,double> IntrepidBasis;
+
+    std::string element_block = "eblock-0_0";
+    std::string sideset = "left";
+
+    RCP<Teuchos::ParameterList> pl = rcp(new Teuchos::ParameterList);
+    pl->set<int>   ("X Blocks",     1);
+    pl->set<int>   ("X Elements", 128);
+    pl->set<double>("X0",         0.0);   
+    pl->set<double>("Xf",         2.5);
+    pl->set<int>   ("X Procs",      1);  
+    pl->set<int>   ("Y Blocks",     1);
+    pl->set<int>   ("Y Elements",   2);
+    pl->set<double>("Y0",           0);
+    pl->set<double>("Yf",     1.11804);
+    pl->set<int>   ("Y Procs",      1);
+    pl->sublist("Periodic BCs");
+    pl->sublist("Periodic BCs").set<std::string>("Periodic Condition 1","y-all 1e-8: left;right");
+    pl->sublist("Periodic BCs").set<std::string>("Periodic Condition 2","x-all 1e-8: top;bottom");
+    pl->sublist("Periodic BCs").set<int>("Count",2);
+
+    panzer_stk::SquareQuadMeshFactory factory;
+    factory.setParameterList(pl);
+    RCP<panzer_stk::STK_Interface> mesh = factory.buildMesh(MPI_COMM_WORLD);
+    RCP<const Teuchos::MpiComm<int> > tComm = Teuchos::rcp(new Teuchos::MpiComm<int>(MPI_COMM_WORLD));
+
+    // build DOF Manager (with a single HDiv basis)
+    /////////////////////////////////////////////////////////////
+
+    // build the connection manager 
+    const RCP<panzer::ConnManager<int,panzer::Ordinal64> > 
+      conn_manager = rcp(new panzer_stk::STKConnManager<panzer::Ordinal64>(mesh));
+
+    RCP<panzer::DOFManager<int,panzer::Ordinal64> > dof_manager
+        = rcp(new panzer::DOFManager<int,panzer::Ordinal64>(conn_manager,MPI_COMM_WORLD));
+
+    // build an intrepid basis and a related field pattern for seeding the DOFManager
+    {
+       RCP<IntrepidBasis> intrepid_basis
+           = panzer::createIntrepid2Basis<PHX::Device::execution_space,double,double>("HGrad",1,
+                                                                                      *mesh->getCellTopology(element_block));
+      RCP<panzer::Intrepid2FieldPattern> field_pattern = rcp(new panzer::Intrepid2FieldPattern(intrepid_basis));
+
+      dof_manager->addField(element_block, "T", field_pattern);
+    }
+    dof_manager->buildGlobalUnknowns();
+
+    // build WorksetContainer
+    //////////////////////////////////////////////////////////////
+
+    panzer::IntegrationDescriptor sid(3, panzer::IntegrationDescriptor::SURFACE);
+    panzer::BasisDescriptor bd(2, "HGrad");
+    std::map<std::string, panzer::WorksetNeeds> wkstRequirements;
+    wkstRequirements[element_block].addIntegrator(sid);
+    wkstRequirements[element_block].addBasis(bd);
+
+    RCP<panzer_stk::WorksetFactory> wkstFactory 
+       = rcp(new panzer_stk::WorksetFactory(mesh)); // build STK workset factory
+    RCP<panzer::WorksetContainer> wkstContainer     // attach it to a workset container (uses lazy evaluation)
+       = rcp(new panzer::WorksetContainer(wkstFactory,wkstRequirements));
+
+    wkstContainer->setGlobalIndexer(dof_manager);
+
+    panzer::WorksetDescriptor workset_descriptor(element_block, panzer::WorksetSizeType::ALL_ELEMENTS, true,false);
+
+    auto worksets = wkstContainer->getWorksets(workset_descriptor);
+
+    TEST_ASSERT(worksets->size()==1);
+
+    auto & workset = (*worksets)[0];
+    auto rot_matrices = workset.getIntegrationValues(sid).surface_rotation_matrices;
+    auto normals = workset.getIntegrationValues(sid).surface_normals;
+    auto ip_coordinates = workset.getIntegrationValues(sid).ip_coordinates;
+
+    const panzer::SubcellConnectivity & face_connectivity = workset.getFaceConnectivity();
+
+
+    const int num_points = normals.extent(1);
+    const int num_faces = face_connectivity.numSubcells();
+    const int num_faces_per_cell = face_connectivity.numSubcellsOnCell(0);
+    const int num_points_per_face = num_points / num_faces_per_cell;
+
+    TEST_EQUALITY(num_faces,512); // 128 * 2 vertical edges (2 removed by periodicity)
+                                  // 128 * 2 horizontal edges (128 removed by periodicty)
+    TEST_EQUALITY(num_faces_per_cell,4);
+    TEST_EQUALITY(num_points,2*4);
+
+    for(int face=0; face<num_faces; ++face) {
+      int cell_l = face_connectivity.cellForSubcell(face,0);
+      int cell_r = face_connectivity.cellForSubcell(face,1);
+
+      int local_face_l = face_connectivity.localSubcellForSubcell(face,0);
+      int local_face_r = face_connectivity.localSubcellForSubcell(face,1);
+
+      out << "Face " << face << ": "
+          << "Left "  << cell_l << " ( " << local_face_l << " ), "
+          << "Right " << cell_r << " ( " << local_face_r << " )" << std::endl;
+    }
+
+    out << "Num Dim = " << normals.extent(2) << std::endl;
+
+    // test a periodic horizontal pair
+    for(int point=0;point<num_points_per_face;point++) {
+      int local_face_l = 3;
+      int local_face_r = 1;
+      int cell_l = 0;
+      int cell_r = 127;
+      int point_l = local_face_l * num_points_per_face + point;
+      int point_r = local_face_r * num_points_per_face + point;
+
+      out << std::endl;
+      out << std::scientific;
+      out << std::setprecision(16) << "LEFT Normal = [ " << normals(cell_l,point_l,0) << ", "
+                                                         << normals(cell_l,point_l,1) << " ]" << std::endl;
+      out << std::setprecision(16) << "RGHT Normal = [ " << normals(cell_r,point_r,0) << ", "
+                                                         << normals(cell_r,point_r,1) << " ]" << std::endl;
+
+      out << std::endl;
+      out << std::setprecision(16) << "LEFT Coords = [ " << ip_coordinates(cell_l,point_l,0) << ", "
+                                                         << ip_coordinates(cell_l,point_l,1) << " ]" << std::endl;
+      out << std::setprecision(16) << "RGHT Coords = [ " << ip_coordinates(cell_r,point_r,0) << ", "
+                                                         << ip_coordinates(cell_r,point_r,1) << " ]" << std::endl;
+
+      TEST_ASSERT(std::fabs(ip_coordinates(cell_l,point_l,0) - 0.0) < 1.0e-14);
+      TEST_ASSERT(std::fabs(ip_coordinates(cell_r,point_r,0) - 2.5) < 1.0e-14);
+      TEST_ASSERT(std::fabs(ip_coordinates(cell_l,point_l,1) - ip_coordinates(cell_r,point_r,1)) < 1.0e-14);
+
+      out << "LEFT rotation" << std::endl;
+      out << std::setprecision(16) 
+          << "  " << rot_matrices(cell_l,point_l,0,0) << ", " << rot_matrices(cell_l,point_l,0,1) << "  " << rot_matrices(cell_l,point_l,0,2) << std::endl
+          << "  " << rot_matrices(cell_l,point_l,1,0) << ", " << rot_matrices(cell_l,point_l,1,1) << "  " << rot_matrices(cell_l,point_l,1,2) << std::endl
+          << "  " << rot_matrices(cell_l,point_l,2,0) << ", " << rot_matrices(cell_l,point_l,2,1) << "  " << rot_matrices(cell_l,point_l,2,2) << std::endl;
+    }
+
+    // test an interior horizontal pair
+    for(int point=0;point<num_points_per_face;point++) {
+      int local_face_l = 1;
+      int local_face_r = 3;
+      int cell_l = 0;
+      int cell_r = 1;
+      int point_l = local_face_l * num_points_per_face + point;
+      int point_r = local_face_r * num_points_per_face + point;
+
+      out << std::endl;
+      out << std::scientific;
+      out << std::setprecision(16) << "LEFT Normal = [ " << normals(cell_l,point_l,0) << ", "
+                                                         << normals(cell_l,point_l,1) << " ]" << std::endl;
+      out << std::setprecision(16) << "RGHT Normal = [ " << normals(cell_r,point_r,0) << ", "
+                                                         << normals(cell_r,point_r,1) << " ]" << std::endl;
+
+      out << std::endl;
+      out << std::setprecision(16) << "LEFT Coords = [ " << ip_coordinates(cell_l,point_l,0) << ", "
+                                                         << ip_coordinates(cell_l,point_l,1) << " ]" << std::endl;
+      out << std::setprecision(16) << "RGHT Coords = [ " << ip_coordinates(cell_r,point_r,0) << ", "
+                                                         << ip_coordinates(cell_r,point_r,1) << " ]" << std::endl;
+
+      TEST_ASSERT(std::fabs(ip_coordinates(cell_l,point_l,1) - ip_coordinates(cell_r,point_r,1)) < 1.0e-14);
+
+      out << "LEFT rotation" << std::endl;
+      out << std::setprecision(16) 
+          << "  " << rot_matrices(cell_l,point_l,0,0) << ", " << rot_matrices(cell_l,point_l,0,1) << "  " << rot_matrices(cell_l,point_l,0,2) << std::endl
+          << "  " << rot_matrices(cell_l,point_l,1,0) << ", " << rot_matrices(cell_l,point_l,1,1) << "  " << rot_matrices(cell_l,point_l,1,2) << std::endl
+          << "  " << rot_matrices(cell_l,point_l,2,0) << ", " << rot_matrices(cell_l,point_l,2,1) << "  " << rot_matrices(cell_l,point_l,2,2) << std::endl;
+    }
+  } 
+} // end namespace panzer

packages/panzer/core/src/CMakeLists.txt

@@ -5,6 +5,7 @@
 #
 # B) Define the header and source files (and directories)
 #
+#
 
 SET(HEADERS "")
 SET(SOURCES "")

packages/panzer/core/src/Panzer_UtilityAlgs.cpp

@@ -0,0 +1,30 @@
+#include "Panzer_UtilityAlgs.hpp"
+
+namespace panzer{
+
+void reorder(std::vector<int> & order,std::function<void(int,int)> swapper) 
+{
+  // each entry has to be sorted
+  for(std::size_t i=0;i<order.size();i++) { 
+
+    // a, b, c
+    // 2, 0, 1
+
+    // here we are following a linked list until
+    // the entry is correct
+    while(order[i]!=i) {
+      int nearIndex = order[i];         // 2 : 1
+      int farIndex  = order[nearIndex]; // 1 : 0
+
+      // handle the user defined swap of indices
+      swapper(nearIndex,farIndex);       // a, c, b : c, a, b
+
+      order[order[i]] = nearIndex;      // 
+      order[i]        = farIndex;       // 1, 0, 2 : 0, 1, 2
+    }
+  }
+
+  // at the end of this, order vector will be sorted
+}
+
+} // end namespace panzer

packages/panzer/core/src/Panzer_UtilityAlgs.hpp

@@ -0,0 +1,22 @@
+#ifndef __Panzer_UtilityAlgs_hpp__
+#define __Panzer_UtilityAlgs_hpp__
+
+#include <vector>
+#include <functional>
+
+namespace panzer{
+
+/**
+ * \brief Using a functor, reorder an array using a order vector.
+ *
+ * \param[in,out] order Vector that describes the desired order. 
+ *                      Note on output, this array will be sorted.
+ * \param[in] swapper Functor that swaps entries in the array to be
+ *                    sorted. Data being swapped must be captured
+ *                    by the functor.
+ */
+void reorder(std::vector<int> & order,std::function<void(int,int)> swapper);
+
+}
+
+#endif

packages/panzer/core/test/CMakeLists.txt

@@ -24,3 +24,9 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST(
   NUM_MPI_PROCS 1
   )
 
+TRIBITS_ADD_EXECUTABLE_AND_TEST(
+  utility_algs 
+  SOURCES utility_algs.cpp ${UNIT_TEST_DRIVER}
+  NUM_MPI_PROCS 1
+  )
+