Merge branch 'cvfem-basis-coordinates' into develop

* cvfem-basis-coordinates: Modify the code to get the nodal coordinates for the sg cvfem discretization when using the "Basis" of "cvfem". Modify the code to get the nodal coordinates for the sg cvfem discretization when using the "Basis" of "cvfem". Modify the code to get the nodal coordinates for the sg cvfem discretization when using the "Basis" of "cvfem".
tcad-charon · Jun 5, 2019 · 8380623 · 8380623
2 parents d1a6821 + de51af6
commit 8380623
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 40 deletions.
diff --git a/packages/panzer/disc-fe/src/Panzer_BasisValues2.hpp b/packages/panzer/disc-fe/src/Panzer_BasisValues2.hpp
@@ -100,6 +100,16 @@ namespace panzer {
                           const PHX::MDField<Scalar,Cell,IP,void,void,void,void,void,void> & jac_det,
                           const PHX::MDField<Scalar,Cell,IP,Dim,Dim,void,void,void,void> & jac_inv);
 
+
+    void evaluateValuesCV(const PHX::MDField<Scalar,Cell,IP,Dim,void,void,void,void,void> & cell_cub_points,
+                          const PHX::MDField<Scalar,Cell,IP,Dim,Dim,void,void,void,void> & jac,
+                          const PHX::MDField<Scalar,Cell,IP,void,void,void,void,void,void> & jac_det,
+                          const PHX::MDField<Scalar,Cell,IP,Dim,Dim,void,void,void,void> & jac_inv,
+                          const PHX::MDField<Scalar,Cell,NODE,Dim> & vertex_coordinates,
+                          bool use_vertex_coordinates=true,
+                          const int in_num_cells = -1);
+
+
     void evaluateValues(const PHX::MDField<Scalar,Cell,IP,Dim,void,void,void,void,void> & cub_points,
                         const PHX::MDField<Scalar,Cell,IP,Dim,Dim,void,void,void,void> & jac,
                         const PHX::MDField<Scalar,Cell,IP,void,void,void,void,void,void> & jac_det,

diff --git a/packages/panzer/disc-fe/src/Panzer_BasisValues2_impl.hpp b/packages/panzer/disc-fe/src/Panzer_BasisValues2_impl.hpp
@@ -779,54 +779,29 @@ evaluateValues_HDiv(const PHX::MDField<Scalar,Cell,IP,Dim,void,void,void,void,vo
 
 }
 
+template <typename Scalar>
+void panzer::BasisValues2<Scalar>::
+evaluateValuesCV(const PHX::MDField<Scalar,Cell,IP,Dim,void,void,void,void,void> & cub_points,
+                 const PHX::MDField<Scalar,Cell,IP,Dim,Dim,void,void,void,void> & jac,
+                 const PHX::MDField<Scalar,Cell,IP,void,void,void,void,void,void> & jac_det,
+                 const PHX::MDField<Scalar,Cell,IP,Dim,Dim,void,void,void,void> & jac_inv)
+{
 
+  PHX::MDField<Scalar,Cell,NODE,Dim> vertex_coordinates;
+  const int in_num_cells = jac.extent(0);
+  evaluateValuesCV(cub_points,jac,jac_det,jac_inv,vertex_coordinates,false,in_num_cells);
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+}
 
 template <typename Scalar>
 void panzer::BasisValues2<Scalar>::
 evaluateValuesCV(const PHX::MDField<Scalar,Cell,IP,Dim,void,void,void,void,void> & cell_cub_points,
                  const PHX::MDField<Scalar,Cell,IP,Dim,Dim,void,void,void,void> & jac,
                  const PHX::MDField<Scalar,Cell,IP,void,void,void,void,void,void> & jac_det,
-                 const PHX::MDField<Scalar,Cell,IP,Dim,Dim,void,void,void,void> & jac_inv)
+                 const PHX::MDField<Scalar,Cell,IP,Dim,Dim,void,void,void,void> & jac_inv,
+                 const PHX::MDField<Scalar,Cell,NODE,Dim> & vertex_coordinates,
+                 bool use_vertex_coordinates,
+                 const int in_num_cells)
 {
   MDFieldArrayFactory af("",ddims_,true);
 
@@ -1061,6 +1036,11 @@ evaluateValuesCV(const PHX::MDField<Scalar,Cell,IP,Dim,void,void,void,void,void>
 
   } // cell loop
 
+  if(use_vertex_coordinates) {
+    TEUCHOS_TEST_FOR_EXCEPT_MSG(elmtspace == PureBasis::CONST,"panzer::BasisValues2::evaluateValues : Const basis cannot have basis coordinates.");
+    evaluateBasisCoordinates(vertex_coordinates);
+  }
+
 }
 
 template <typename Scalar>