[FIX] Proto: Compile errors after node_idx change

coolfluid · Mar 16, 2014 · aa5f6e1 · aa5f6e1
1 parent 0c98557
commit aa5f6e1
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/cf3/solver/actions/Proto/DirichletBC.hpp b/cf3/solver/actions/Proto/DirichletBC.hpp
@@ -68,7 +68,7 @@ struct DirichletBCSetter :
         lss,
         state,
         data.var_data(boost::proto::value(boost::proto::child_c<1>(expr))).value(), // old value
-        boost::proto::value( boost::proto::child_c<0>(expr) ).node_to_lss(data.node_idx),
+        boost::proto::value( boost::proto::child_c<0>(expr) ).node_to_lss(data.node_idx()),
         data.var_data(boost::proto::value(boost::proto::child_c<1>(expr))).offset
       );
     }
@@ -96,7 +96,7 @@ struct DirichletBCComponentSetter :
         lss,
         state,
         data.var_data(boost::proto::value(boost::proto::left(boost::proto::child_c<1>(expr)))).value()[vec_component], // old value
-        boost::proto::value( boost::proto::child_c<0>(expr) ).node_to_lss(data.node_idx),
+        boost::proto::value( boost::proto::child_c<0>(expr) ).node_to_lss(data.node_idx()),
         data.var_data(boost::proto::value(boost::proto::left(boost::proto::child_c<1>(expr)))).offset + vec_component
       );
     }

diff --git a/cf3/solver/actions/Proto/RHSVector.hpp b/cf3/solver/actions/Proto/RHSVector.hpp
@@ -52,7 +52,7 @@ struct GetRHSVector :
     ) const
     {
       math::LSS::Vector& rhs = expr.rhs();
-      const int node_idx = expr.node_to_lss(data.node_idx);
+      const int node_idx = expr.node_to_lss(data.node_idx());
       if(node_idx < 0)
         throw common::SetupError(FromHere(), "RHS access error: attempt to use node that is not in the LSS");
       const Uint sys_idx = node_idx*data.var_data(state).nb_dofs + data.var_data(state).offset;

diff --git a/cf3/solver/actions/Proto/SetRHS.hpp b/cf3/solver/actions/Proto/SetRHS.hpp
@@ -35,7 +35,7 @@ struct SetRHSSetter :
               , typename impl::data_param data
     ) const
     {
-      const int node_idx = boost::proto::value( boost::proto::child_c<0>(expr) ).node_to_lss(data.node_idx);
+      const int node_idx = boost::proto::value( boost::proto::child_c<0>(expr) ).node_to_lss(data.node_idx());
       if(node_idx < 0)
         return;
       const Uint sys_idx = node_idx*data.var_data(boost::proto::value(boost::proto::child_c<1>(expr))).nb_dofs + data.var_data(boost::proto::value(boost::proto::child_c<1>(expr))).offset;

diff --git a/cf3/solver/actions/Proto/SetSolution.hpp b/cf3/solver/actions/Proto/SetSolution.hpp
@@ -36,7 +36,7 @@ struct SetSolutionSetter :
               , typename impl::data_param data
     ) const
     {
-      const int node_idx = boost::proto::value( boost::proto::child_c<0>(expr) ).node_to_lss(data.node_idx);
+      const int node_idx = boost::proto::value( boost::proto::child_c<0>(expr) ).node_to_lss(data.node_idx());
       if(node_idx < 0)
         return;
       typedef boost::mpl::int_< VarDataType<typename VarChild<ExprT, 1>::type, DataT>::type::dimension > DimT;

diff --git a/cf3/solver/actions/Proto/SolutionVector.hpp b/cf3/solver/actions/Proto/SolutionVector.hpp
@@ -59,7 +59,7 @@ struct GetSolutionVector :
     ) const
     {
       math::LSS::Vector& sol = expr.solution();
-      const int node_idx = expr.node_to_lss(data.node_idx);
+      const int node_idx = expr.node_to_lss(data.node_idx());
       if(node_idx < 0)
         throw common::SetupError(FromHere(), "Error accessing solution: attempt to use node that is not in the LSS");
       const Uint sys_idx = node_idx*data.var_data(state).nb_dofs + data.var_data(state).offset;