Attention une mise à jour du service Gitlab va être effectuée le mardi 30 novembre entre 17h30 et 18h00. Cette mise à jour va générer une interruption du service dont nous ne maîtrisons pas complètement la durée mais qui ne devrait pas excéder quelques minutes. Cette mise à jour intermédiaire en version 14.0.12 nous permettra de rapidement pouvoir mettre à votre disposition une version plus récente.

Commit 6b64730b authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#1443 Remove loads of debug print lines.

parent 00751417
......@@ -91,7 +91,6 @@ namespace MoReFEM
switch(mpi_scale)
{
case MpiScale::program_wise:
std::cout << "======================= Local2GlobalStorage" << std::endl;
local_2_global_array.push_back(static_cast<PetscInt>(dof.GetProgramWiseIndex(numbering_subset)));
break;
......
......@@ -158,7 +158,6 @@ namespace MoReFEM
if (dof.IsInNumberingSubset(numbering_subset))
{
std::cout << "======================= AllocateGlobalVector" << std::endl;
ghosted_dof_index_list.push_back(static_cast<PetscInt>(dof.GetProgramWiseIndex(numbering_subset)));
}
}
......
......@@ -185,10 +185,6 @@ namespace MoReFEM
const auto& node_bearer_list = GetProcessorWiseNodeBearerList();
const auto& numbering_subset_list = GetNumberingSubsetList();
std::cout << "================= matrix_pattern_per_numbering_subset_ =================" << std::endl;
std::cout << mpi.GetRankPreffix() << " " << felt_space_list.size() << "\t" << node_bearer_list.size()
<< "\t" << numbering_subset_list.size() << std::endl;
matrix_pattern_per_numbering_subset_ =
Internal::FEltSpaceNS::ComputeMatrixPattern::Perform(rank,
felt_space_list,
......@@ -629,7 +625,6 @@ namespace MoReFEM
const auto& dof_ptr = dof_list[i];
assert(!(!dof_ptr));
std::cout << "======================= PrintDofInformation" << std::endl;
out << dof_ptr->GetProgramWiseIndex(numbering_subset) << ';';
out << dof_ptr->GetProcessorWiseOrGhostIndex(numbering_subset) << ';';
out << nature << ';';
......
......@@ -111,7 +111,6 @@ namespace MoReFEM
void GodOfDof::FromPreprocessedInit(const MoReFEMDataT& morefem_data,
DoConsiderProcessorWiseLocal2Global do_consider_proc_wise_local_2_global)
{
// \todo #1443 To implement!
static_cast<void>(morefem_data);
static_cast<void>(do_consider_proc_wise_local_2_global);
......@@ -158,7 +157,7 @@ namespace MoReFEM
}
// \todo #1443 Ignored in first approach, but make sure to call it as well once rirst draft works.
// \todo #1443 Ignored in first approach, but make sure to call it as well once first draft works.
template<class InputDataT>
void GodOfDof::Init2(const InputDataT& input_data)
{
......
......@@ -47,13 +47,11 @@ namespace MoReFEM
{
NodeBearer::vector_shared_ptr empty;
std::cout << "RNK " << mpi_rank << "\tComputeMatrixPattern 0" << std::endl;
auto connectivity = ComputeNodeBearerConnectivity(felt_space_list,
mpi_rank,
node_bearer_list.size(),
KeepSelfConnexion::yes);
std::cout << "RNK " << mpi_rank << "\tComputeMatrixPattern 10" << std::endl;
MatrixPattern::vector_const_unique_ptr ret;
assert(std::none_of(numbering_subset_list.cbegin(), numbering_subset_list.cend(),
......@@ -62,7 +60,6 @@ namespace MoReFEM
#ifndef NDEBUG
std::vector<std::pair<unsigned int, unsigned int>> already_seen;
#endif // NDEBUG
std::cout << "RNK " << mpi_rank << "\tComputeMatrixPattern 20" << std::endl;
for (const auto& row_numbering_subset_ptr : numbering_subset_list)
{
......@@ -77,26 +74,16 @@ namespace MoReFEM
already_seen.push_back(new_pair);
#endif // NDEBUG
std::cout << "RNK " << mpi_rank << "\tComputeMatrixPattern 25 - "
<< row_numbering_subset_ptr->GetUniqueId() << " " << col_numbering_subset_ptr->GetUniqueId()
<< std::endl;
auto&& matrix_pattern_ptr = std::make_unique<MatrixPattern>(row_numbering_subset_ptr,
col_numbering_subset_ptr,
connectivity,
node_bearer_list,
Ndof_holder);
std::cout << "RNK " << mpi_rank << "\tComputeMatrixPattern 28 - "
<< row_numbering_subset_ptr->GetUniqueId() << " " << col_numbering_subset_ptr->GetUniqueId()
<< std::endl;
ret.push_back(std::move(matrix_pattern_ptr));
}
}
std::cout << "RNK " << mpi_rank << "\tComputeMatrixPattern 30" << std::endl;
return ret;
}
......
......@@ -146,9 +146,6 @@ namespace MoReFEM
it,
end);
std::cout << "CURRENT ITERATOR POS = " << (it - dof_index_list.cbegin()) << std::endl;
std::cout << "END ITERATOR POS = " << (end - dof_index_list.cbegin()) << std::endl;
assert(it == end && "The data in the prepartition data file should cover exactly the number of "
"reconstructed dofs in the numbering subset.");
}
......@@ -163,7 +160,6 @@ namespace MoReFEM
{
static_cast<void>(dof_index_end);
std::cout << "LS SIZE = " << dof_list.size() << std::endl;
for (const auto& dof_ptr : dof_list)
{
assert(!(!dof_ptr));
......@@ -171,7 +167,6 @@ namespace MoReFEM
if (dof.IsInNumberingSubset(numbering_subset))
{
std::cout << "DOES IT HAPPEN?" << std::endl;
assert(dof_index_it != dof_index_end);
dof.SetProgramWiseIndex(numbering_subset, *dof_index_it);
++dof_index_it;
......
......@@ -104,8 +104,6 @@ namespace MoReFEM
decltype(auto) program_wise_index_per_numbering_subset =
dof.GetProgramWiseIndexPerNumberingSubset();
std::cout << "SIZE ======== " << program_wise_index_per_numbering_subset.size() << std::endl;
const auto it = std::find_if(program_wise_index_per_numbering_subset.cbegin(),
program_wise_index_per_numbering_subset.cend(),
[numbering_subset_id](const auto& pair)
......
......@@ -300,8 +300,6 @@ namespace MoReFEM
// ===============================================================================
decltype(auto) numbering_subset_list = GetNumberingSubsetList();
std::cout << " *-********************* TWO STEPS 50" << std::endl;
// Compute the number of program- and processor- wise dofs.
using type = Internal::FEltSpaceNS::NdofHolder;
......@@ -311,9 +309,7 @@ namespace MoReFEM
GetMpi().GetRank<int>(),
std::make_optional(prepartitioned_data_file_content.Nprogram_wise_dof),
std::make_optional(prepartitioned_data_file_content.Nprogram_wise_dof_per_numbering_subset));
std::cout << " *-********************* TWO STEPS 70" << std::endl;
std::cout << " *-********************* TWO STEPS 80" << std::endl;
ComputeProcessorWiseAndGhostDofIndex();
Internal::FEltSpaceNS::AssignNumberingSubsetDofIndexForPrepartitionedData::Do(god_of_dof_prepartitioned_data,
GetProcessorWiseDofList(),
......@@ -340,11 +336,6 @@ std::cout << " *-********************* TWO STEPS 70" << std::endl;
felt_space.ComputeDofList(dof_unique_id_list);
}
std::cout << "================= matrix_pattern_per_numbering_subset_ =================" << std::endl;
std::cout << GetMpi().GetRankPreffix() << " " << felt_space_list.size() << "\t" << GetProcessorWiseNodeBearerList().size()
<< "\t" << numbering_subset_list.size() << std::endl;
// matrix_pattern_per_numbering_subset_ =
// Internal::FEltSpaceNS::ComputeMatrixPattern::Perform(GetMpi().GetRank<unsigned int>(),
// felt_space_list,
......
......@@ -13,7 +13,6 @@
#include <algorithm>
#include <iostream> // TMP #1443
#include "FiniteElement/Nodes_and_dofs/Dof.hpp"
#include "FiniteElement/Nodes_and_dofs/Node.hpp"
......
......@@ -253,21 +253,10 @@ namespace MoReFEM::TestNS::LoadPrepartitionedGodOfDofNS
if (original_dof.IsInNumberingSubset(numbering_subset))
{
BOOST_CHECK(reconstructed_dof.IsInNumberingSubset(numbering_subset));
if (!reconstructed_dof.IsInNumberingSubset(numbering_subset))
{
std::cout << "WRONG!" << std::endl;
continue;
}
std::cout << "Orig proc " << original_dof.GetProcessorWiseOrGhostIndex(numbering_subset) << std::endl;
std::cout << "Recons proc = " << reconstructed_dof.GetProcessorWiseOrGhostIndex(numbering_subset) << std::endl;
BOOST_CHECK_EQUAL(original_dof.GetProcessorWiseOrGhostIndex(numbering_subset),
reconstructed_dof.GetProcessorWiseOrGhostIndex(numbering_subset));
std::cout << "Orig = " << original_dof.GetProgramWiseIndex(numbering_subset) << std::endl;
std::cout << "Recons = " << reconstructed_dof.GetProgramWiseIndex(numbering_subset) << std::endl;
BOOST_CHECK_EQUAL(original_dof.GetProgramWiseIndex(numbering_subset),
reconstructed_dof.GetProgramWiseIndex(numbering_subset));
}
......
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