-
Notifications
You must be signed in to change notification settings - Fork 244
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.
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
[MedApp] Trim Whitespace in Group Names #12147
Merged
Merged
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
7bd6cc4
trim whitespace from group names
matekelemen 9df1fc1
trim whitespace and null chars in MED names
matekelemen cff095b
Merge branch 'master' of https://github.com/KratosMultiphysics/Kratos…
matekelemen 71e5877
replace trim function with string utilities
matekelemen 4cad7b5
restore const qualifiers
matekelemen e6c89d8
restore const qualifiers
matekelemen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,6 +22,7 @@ | |
#include "utilities/builtin_timer.h" | ||
#include "utilities/parallel_utilities.h" | ||
#include "utilities/variable_utils.h" | ||
#include "utilities/string_utilities.h" | ||
|
||
namespace Kratos { | ||
|
||
|
@@ -67,13 +68,6 @@ void CheckMEDErrorCode(const int ierr, const std::string& MEDCallName) | |
KRATOS_ERROR_IF(ierr < 0) << MEDCallName << " failed with error code " << ierr << "." << std::endl; | ||
} | ||
|
||
// The names in the MED-file often have trailing null-chars, which need to be removed | ||
// this can otherwise make debugging very tricky | ||
void RemoveTrailingNullChars(std::string& rInput) | ||
{ | ||
rInput.erase(std::find(rInput.begin(), rInput.end(), '\0'), rInput.end()); | ||
} | ||
|
||
template<typename T> | ||
void CheckConnectivitiesSize( | ||
const std::size_t ExpectedSize, | ||
|
@@ -329,8 +323,7 @@ auto GetGroupsByFamily( | |
std::vector<std::string> group_names(num_groups); | ||
// split the goup names | ||
for (int i = 0; i < num_groups; i++) { | ||
group_names[i] = c_group_names.substr(i * MED_LNAME_SIZE, MED_LNAME_SIZE); | ||
RemoveTrailingNullChars(group_names[i]); | ||
group_names[i] = StringUtilities::Trim(c_group_names.substr(i * MED_LNAME_SIZE, MED_LNAME_SIZE), /*RemoveNullChar=*/true); | ||
} | ||
|
||
groups_by_family[family_number] = std::move(group_names); | ||
|
@@ -424,7 +417,7 @@ class MedModelPartIO::MedFileHandler | |
axis_unit.data()); | ||
CheckMEDErrorCode(err, "MEDmeshInfo"); | ||
|
||
RemoveTrailingNullChars(mMeshName); | ||
mMeshName = StringUtilities::Trim(mMeshName, /*RemoveNullChar=*/true); | ||
mDimension = space_dim; | ||
} | ||
|
||
|
@@ -498,13 +491,13 @@ void MedModelPartIO::ReadModelPart(ModelPart& rThisModelPart) | |
const int dimension = mpFileHandler->GetDimension(); | ||
|
||
// read family info => Map from family number to group names aka SubModelPart names | ||
const auto groups_by_fam = GetGroupsByFamily( | ||
auto groups_by_fam = GetGroupsByFamily( | ||
mpFileHandler->GetFileHandle(), | ||
mpFileHandler->GetMeshName()); | ||
|
||
// create SubModelPart hierarchy | ||
for (const auto& r_map : groups_by_fam) { | ||
for (const auto& r_smp_name : r_map.second) { | ||
for (auto& r_map : groups_by_fam) { | ||
for (auto& r_smp_name : r_map.second) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why removing the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Leftovers ... |
||
if (!rThisModelPart.HasSubModelPart(r_smp_name)) { | ||
rThisModelPart.CreateSubModelPart(r_smp_name); | ||
} | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
and this one?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
got it