Commit ffd26d7d authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#882 - #887 Keep replacing Private namespaces, mostly in Utilities/ThirdParty.

parent da28b9cc
This diff is collapsed.
......@@ -133,7 +133,7 @@ namespace HappyHeart
}; //struct DirichletBoundaryCondition
} //namespace InputParameter
} // namespace InputParameter
} // namespace HappyHeart
......
......@@ -35,7 +35,7 @@ namespace HappyHeart
}
} //namespace InputParameter
} // namespace InputParameter
} // namespace HappyHeart
......
......@@ -216,13 +216,13 @@ namespace HappyHeart
}
} //namespace DirichletBoundaryConditionNS
} // namespace DirichletBoundaryConditionNS
} //namespace Private
} // namespace Private
} //namespace InputParameter
} // namespace InputParameter
} // namespace HappyHeart
......@@ -335,13 +335,13 @@ namespace HappyHeart
} //namespace DirichletBoundaryConditionNS
} // namespace DirichletBoundaryConditionNS
} //namespace Private
} // namespace Private
} //namespace InputParameter
} // namespace InputParameter
} // namespace HappyHeart
......
......@@ -133,7 +133,7 @@ namespace HappyHeart
}; // struct Fiber
} //namespace InputParameter
} // namespace InputParameter
} // namespace HappyHeart
......
......@@ -45,7 +45,7 @@ namespace HappyHeart
} //namespace InputParameter
} // namespace InputParameter
} // namespace HappyHeart
......
......@@ -134,10 +134,10 @@ namespace HappyHeart
} //namespace FiberNS
} // namespace FiberNS
} //namespace InputParameter
} // namespace InputParameter
} // namespace HappyHeart
......@@ -218,10 +218,10 @@ namespace HappyHeart
} //namespace FiberNS
} // namespace FiberNS
} //namespace InputParameter
} // namespace InputParameter
} // namespace HappyHeart
......
......@@ -36,7 +36,7 @@ namespace HappyHeart
}
const Wrappers::Mpi& GetMpi(const GodOfDof& god_of_dof)
const ::HappyHeart::Wrappers::Mpi& GetMpi(const GodOfDof& god_of_dof)
{
return god_of_dof.MpiHappyHeart();
}
......
......@@ -81,7 +81,7 @@ namespace HappyHeart
*
* \return Wrappers::Mpi object associated to the \a god_of_dof.
*/
const Wrappers::Mpi& GetMpi(const GodOfDof& god_of_dof);
const ::HappyHeart::Wrappers::Mpi& GetMpi(const GodOfDof& god_of_dof);
} // namespace FEltSpaceNS
......
......@@ -53,7 +53,7 @@ namespace HappyHeart
*/
Impl::InternalStorage& AddOrFetchDomainStorage(const LocalFEltSpacePerRefLocalFEltSpace& full_content,
const Domain& domain,
const Wrappers::Mpi& mpi,
const ::HappyHeart::Wrappers::Mpi& mpi,
std::mutex& mutex,
std::unordered_map<unsigned int, Impl::InternalStorage>& storage_per_domain);
......@@ -71,7 +71,7 @@ namespace HappyHeart
} // namespace anonymous
Storage::Storage(const Wrappers::Mpi& mpi,
Storage::Storage(const ::HappyHeart::Wrappers::Mpi& mpi,
LocalFEltSpacePerRefLocalFEltSpace&& felt_list_per_type)
: ::HappyHeart::Crtp::HappyHeartMpi<Storage>(mpi),
internal_storage_(Impl::InternalStorage(mpi, std::move(felt_list_per_type)))
......@@ -105,7 +105,7 @@ namespace HappyHeart
Impl::InternalStorage& AddOrFetchDomainStorage(const LocalFEltSpacePerRefLocalFEltSpace& full_content,
const Domain& domain,
const Wrappers::Mpi& mpi,
const ::HappyHeart::Wrappers::Mpi& mpi,
std::mutex& mutex,
std::unordered_map<unsigned int, Impl::InternalStorage>& storage_per_domain)
{
......
......@@ -97,7 +97,7 @@ namespace HappyHeart
* computed by FEltSpace::SetFEltList(), which is the method in charge of building current object
* to store and give quick access to relevant finite element data.
*/
explicit Storage(const Wrappers::Mpi& mpi,
explicit Storage(const ::HappyHeart::Wrappers::Mpi& mpi,
LocalFEltSpacePerRefLocalFEltSpace&& local_felt_space_list_per_type);
//! Destructor.
......
......@@ -34,7 +34,7 @@ namespace HappyHeart
InternalStorage
::InternalStorage(const Wrappers::Mpi& mpi,
::InternalStorage(const ::HappyHeart::Wrappers::Mpi& mpi,
LocalFEltSpacePerRefLocalFEltSpace&& felt_list_per_ref_felt_space)
: ::HappyHeart::Crtp::HappyHeartMpi<InternalStorage>(mpi),
felt_list_per_ref_felt_space_(std::move(felt_list_per_ref_felt_space))
......
......@@ -88,7 +88,7 @@ namespace HappyHeart
* \param[in] felt_list_per_ref_felt_space Finite element list per reference finite element space.
* It's just stored in the current class; it is actually computed elsewhere.
*/
explicit InternalStorage(const Wrappers::Mpi& mpi,
explicit InternalStorage(const ::HappyHeart::Wrappers::Mpi& mpi,
LocalFEltSpacePerRefLocalFEltSpace&& felt_list_per_ref_felt_space);
//! Destructor.
......
......@@ -134,7 +134,8 @@ namespace HappyHeart
}
}
matrix_pattern_ = std::make_unique<Wrappers::Petsc::MatrixPattern>(content_for_each_local_row);
matrix_pattern_ =
std::make_unique<::HappyHeart::Wrappers::Petsc::MatrixPattern>(content_for_each_local_row);
}
......
......@@ -133,7 +133,7 @@ namespace HappyHeart
const NumberingSubset& GetColumnNumberingSubset() const;
//! Get the pattern to feed to Petsc.
const Wrappers::Petsc::MatrixPattern& GetPattern() const;
const ::HappyHeart::Wrappers::Petsc::MatrixPattern& GetPattern() const;
private:
......@@ -149,7 +149,7 @@ namespace HappyHeart
const NumberingSubset::const_shared_ptr column_numbering_subset_ = nullptr;
//! Objects that stores effectively the pattern.
Wrappers::Petsc::MatrixPattern::const_unique_ptr matrix_pattern_ = nullptr;
::HappyHeart::Wrappers::Petsc::MatrixPattern::const_unique_ptr matrix_pattern_ = nullptr;
......
......@@ -38,7 +38,7 @@ namespace HappyHeart
}
inline const Wrappers::Petsc::MatrixPattern& MatrixPattern::GetPattern() const
inline const ::HappyHeart::Wrappers::Petsc::MatrixPattern& MatrixPattern::GetPattern() const
{
assert(!(!matrix_pattern_));
return *matrix_pattern_;
......
......@@ -131,8 +131,9 @@ namespace HappyHeart
assert(Ncoord == mesh.Ncoord());
const auto& coords_list = mesh.GetCoordsList();
Wrappers::Petsc::AccessVectorContent<Utilities::Access::read_only> vector_content(displacement,
__FILE__, __LINE__);
::HappyHeart::Wrappers::Petsc
::AccessVectorContent<Utilities::Access::read_only> vector_content(displacement,
__FILE__, __LINE__);
for (auto coord_index = 0ul; coord_index < Ncoord; ++coord_index)
{
......
......@@ -86,7 +86,7 @@ namespace HappyHeart
*
*/
void ParmetisPartitioning(const std::vector<unsigned int>& euclidian_partition,
const Wrappers::Mpi& mpi,
const ::HappyHeart::Wrappers::Mpi& mpi,
Utilities::CSRPattern<parmetis_int>&& node_bearer_csr_pattern,
NodeBearer::vector_shared_ptr& node_bearer_list);
......@@ -110,7 +110,7 @@ namespace HappyHeart
void PreparePartition(const Wrappers::Mpi& mpi,
void PreparePartition(const ::HappyHeart::Wrappers::Mpi& mpi,
const FEltSpace::vector_unique_ptr& felt_space_list,
NodeBearer::vector_shared_ptr& node_bearer_list)
{
......@@ -215,16 +215,16 @@ namespace HappyHeart
void ParmetisPartitioning(const std::vector<unsigned int>& euclidian_partition,
const Wrappers::Mpi& mpi,
const ::HappyHeart::Wrappers::Mpi& mpi,
Utilities::CSRPattern<parmetis_int>&& csr_node_bearer_pattern_for_parmetis,
NodeBearer::vector_shared_ptr& node_bearer_list)
{
// Call to Parmetis.
auto&& parmetis_numbering =
Wrappers::Parmetis::CreateNewPartitioning(euclidian_partition,
csr_node_bearer_pattern_for_parmetis.NonCstiCSR(),
csr_node_bearer_pattern_for_parmetis.NonCstjCSR(),
mpi);
::HappyHeart::Wrappers::Parmetis::CreateNewPartitioning(euclidian_partition,
csr_node_bearer_pattern_for_parmetis.NonCstiCSR(),
csr_node_bearer_pattern_for_parmetis.NonCstjCSR(),
mpi);
// Report for each node_bearer the processor in charge.
const std::size_t Nnode_bearer = node_bearer_list.size();
......
Supports Markdown
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