Commit 2ce4219c authored by Kirill Nikitin's avatar Kirill Nikitin

Bug fixed for Enumerate functions.

parent 80e5817d
......@@ -127,7 +127,8 @@ int main(int argc,char ** argv)
if( m->GetProcessorRank() == 0 ) std::cout << "Exchange ghost: " << Timer()-ttt << std::endl;
ttt = Timer();
Solver S(Solver::INNER_ILU2); // Specify the linear solver to ASM+ILU2+BiCGStab one
Solver S(Solver::INNER_ILU2); // Specify the linear solver to ASM+ILU2+BiCGStab one
S.SetParameterReal("absolute_tolerance",1e-8);
Solver::Matrix A; // Declare the matrix of the linear system to be solved
Solver::Vector x,b; // Declare the solution and the right-hand side vectors
......
......@@ -308,9 +308,9 @@ namespace INMOST
#endif//USE_MPI
shift += start;
for(const HandleType * it = set; it != set+n; ++it)
if( GetStatus(*it) != Element::Owned && (define_sparse || HaveData(*it,num_tag))) Integer(*it,num_tag) = shift++;
if( GetStatus(*it) == Element::Owned && (define_sparse || HaveData(*it,num_tag))) Integer(*it,num_tag) = shift++;
for(const HandleType * it = set; it != set+n; ++it)
if( GetStatus(*it) != Element::Shared && (define_sparse || HaveData(*it,num_tag))) Integer(*it,num_tag) = shift++;
if( GetStatus(*it) == Element::Shared && (define_sparse || HaveData(*it,num_tag))) Integer(*it,num_tag) = shift++;
ExchangeData(num_tag,mask,0);
ret = shift;
#if defined(USE_MPI)
......@@ -332,10 +332,10 @@ namespace INMOST
#endif//USE_MPI
shift += start;
for(Mesh::iteratorElement it = BeginElement(mask); it != EndElement(); it++)
if( it->GetStatus() != Element::Owned && (define_sparse || it->HaveData(num_tag)) )
if( it->GetStatus() == Element::Owned && (define_sparse || it->HaveData(num_tag)) )
it->Integer(num_tag) = shift++;
for(Mesh::iteratorElement it = BeginElement(mask); it != EndElement(); it++)
if( it->GetStatus() != Element::Shared && (define_sparse || it->HaveData(num_tag)) )
if( it->GetStatus() == Element::Shared && (define_sparse || it->HaveData(num_tag)) )
it->Integer(num_tag) = shift++;
ExchangeData(num_tag,mask,0);
ret = shift;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment