got throught #34 in AAdapt_RC

sandialabs · Jan 30, 2017 · 51e33ef · 51e33ef
1 parent 84c95d7
commit 51e33ef
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/src/adapt/AAdapt_RC_Manager.cpp b/src/adapt/AAdapt_RC_Manager.cpp
@@ -158,7 +158,7 @@ void transformStateArray (const unsigned int wi, const Direction::Enum dir,
 }
 
 class Projector {
-  typedef PHX::MDField<RealType,Cell,Node,QuadPoint> BasisField;
+  typedef PHX::MDField<const RealType,Cell,Node,QuadPoint> BasisField;
   typedef BasisField::size_type size_type;
 
   Teuchos::RCP<const Tpetra_Map> node_map_, ol_node_map_;

diff --git a/src/adapt/AAdapt_RC_Manager.hpp b/src/adapt/AAdapt_RC_Manager.hpp
@@ -121,7 +121,7 @@ class Manager {
   Field::iterator fieldsBegin();
   Field::iterator fieldsEnd();
 
-  typedef PHX::MDField<RealType,Cell,Node,QuadPoint> BasisField;
+  typedef PHX::MDField<const RealType,Cell,Node,QuadPoint> BasisField;
   //! Reader<EvalT> uses these methods to load the data.
   void beginQpInterp();
   void interpQpField(PHX::MDField<RealType>& f, const PHAL::Workset& workset,

diff --git a/src/adapt/AAdapt_RC_Writer.hpp b/src/adapt/AAdapt_RC_Writer.hpp
@@ -59,7 +59,7 @@ class Writer<PHAL::AlbanyTraits::Residual, Traits>
   typedef typename FieldsVector::iterator FieldsIterator;
   Teuchos::RCP<Manager> rc_mgr_;
   FieldsVector fields_;
-  PHX::MDField<RealType,Cell,Node,QuadPoint> bf_, wbf_;
+  PHX::MDField<const RealType,Cell,Node,QuadPoint> bf_, wbf_;
 };
 
 } // namespace rc

diff --git a/src/adapt/AAdapt_RC_Writer_Def.hpp b/src/adapt/AAdapt_RC_Writer_Def.hpp
@@ -31,10 +31,8 @@ Writer (const Teuchos::RCP<Manager>& rc_mgr,
   : rc_mgr_(rc_mgr)
 {
   if (this->rc_mgr_->usingProjection()) {
-    bf_  = PHX::MDField<RealType,Cell,Node,QuadPoint>(
-      "BF", dl->node_qp_scalar);
-    wbf_ = PHX::MDField<RealType,Cell,Node,QuadPoint>(
-      "wBF", dl->node_qp_scalar);
+    bf_  = decltype(bf_)("BF", dl->node_qp_scalar);
+    wbf_ = decltype(wbf_)("wBF", dl->node_qp_scalar);
     this->addDependentField(bf_);
     this->addDependentField(wbf_);
   }