Skip to content

[Core] Use ParallelUtilities::IsInParallel() instead of legacy OpenMPUtils in DataValueContainer #14009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+13 −11
Open

[Core] Use ParallelUtilities::IsInParallel() instead of legacy OpenMPUtils in DataValueContainer #14009

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7677b03
Minor clean up
loumalouomega Nov 27, 2025
99eb83b
Use `ParallelUtilities::GetNumThreads()` instead of legacy OpenMPUtils
loumalouomega Nov 27, 2025
5840b47
Create I`sInParallel`
loumalouomega Nov 27, 2025
baed6f8
Using `IsInParallel`
loumalouomega Nov 27, 2025
8595154
Comments
loumalouomega Nov 28, 2025
28ad868
Bool
loumalouomega Nov 28, 2025
867d667
Merge branch 'master' into core/minor-datavaluecontainer-update
loumalouomega Dec 1, 2025
b7738c5
Hardcoded it
loumalouomega Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions kratos/containers/data_value_container.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
#include "includes/kratos_components.h"
#include "includes/exception.h"

#ifdef KRATOS_DEBUG
#include "utilities/openmp_utils.h"
#endif

namespace Kratos
{

Expand Down Expand Up @@ -89,6 +85,7 @@ class KRATOS_API(KRATOS_CORE) DataValueContainer
/// Default constructor.
DataValueContainer() noexcept = default;

/// Move constructor.
DataValueContainer(DataValueContainer&&) noexcept = default;

/// Copy constructor.
Expand Down Expand Up @@ -236,7 +233,11 @@ class KRATOS_API(KRATOS_CORE) DataValueContainer
return mData.end();
}

DataValueContainer& operator=(DataValueContainer&&) noexcept = default;
/**
* @brief Move assignment operator
* @param[in] rOther The temporary or explicitly moved DataValueContainer object to transfer resources from.
*/
DataValueContainer& operator=(DataValueContainer&& rOther) noexcept = default;

/**
* @brief Assignment operator for copying data from another DataValueContainer.
Expand All @@ -261,13 +262,13 @@ class KRATOS_API(KRATOS_CORE) DataValueContainer
{
typename ContainerType::iterator i;

if ((i = std::find_if(mData.begin(), mData.end(), IndexCheck(rThisVariable.SourceKey()))) != mData.end())
if ((i = std::find_if(mData.begin(), mData.end(), IndexCheck(rThisVariable.SourceKey()))) != mData.end()) {
return *(static_cast<TDataType*>(i->second) + rThisVariable.GetComponentIndex());
}

#ifdef KRATOS_DEBUG
if(OpenMPUtils::IsInParallel() != 0)
KRATOS_ERROR << "attempting to do a GetValue for: " << rThisVariable << " unfortunately the variable is not in the database and the operations is not threadsafe (this function is being called from within a parallel region)" << std::endl;
#endif
#ifdef KRATOS_SMP_OPENMP
KRATOS_DEBUG_ERROR_IF(static_cast<bool>(omp_in_parallel())) << "Attempting to do a GetValue for: " << rThisVariable << " unfortunately the variable is not in the database and the operations is not threadsafe (this function is being called from within a parallel region)" << std::endl;
#endif

auto p_source_variable = &rThisVariable.GetSourceVariable();
mData.push_back(ValueType(p_source_variable,p_source_variable->Clone(p_source_variable->pZero())));
Expand All @@ -287,8 +288,9 @@ class KRATOS_API(KRATOS_CORE) DataValueContainer
{
typename ContainerType::const_iterator i;

if ((i = std::find_if(mData.begin(), mData.end(), IndexCheck(rThisVariable.SourceKey()))) != mData.end())
if ((i = std::find_if(mData.begin(), mData.end(), IndexCheck(rThisVariable.SourceKey()))) != mData.end()) {
return *(static_cast<const TDataType*>(i->second) + rThisVariable.GetComponentIndex());
}

return rThisVariable.Zero();
}
Expand Down
Loading