Skip to content
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

Jump to bottom

Pamgen: block length nonneg #13466

Merged
merged 6 commits into from
Sep 23, 2024
Merged

Pamgen: block length nonneg #13466

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf922e7
Merge Pull Request #13363 from trilinos/Trilinos/master_merge_2024081…
trilinos-autotester Aug 17, 2024
2ad2602
Merge Pull Request #13388 from trilinos/Trilinos/master_merge_2024082…
trilinos-autotester Aug 24, 2024
b40a3bc
Merge Pull Request #13418 from trilinos/Trilinos/master_merge_2024083…
trilinos-autotester Aug 31, 2024
b895aa6
Merge Pull Request #13432 from trilinos/Trilinos/master_merge_2024090…
trilinos-autotester Sep 7, 2024
fb7ce0a
Fix from Hensinger: Prevent negative block size/length
DrBooom Sep 20, 2024
9f18ff8
Header
DrBooom Sep 23, 2024
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: 21 additions & 3 deletions packages/pamgen/src/parse_routines.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,13 @@ namespace PAMGEN_NEVADA {
ss << "Zblock index out of range, should run from 1 to " << Inline_Mesh_Desc::im_static_storage->inline_b[2] << ".";
token_stream->Semantics_Error(ss.str());
}
Inline_Mesh_Desc::im_static_storage->block_dist[cubit_axis][block_index] = token_stream->Parse_Real();
Real val = token_stream->Parse_Real();
if(val <= 0.){
std::stringstream ss;
ss << "Block size must be positive." << Inline_Mesh_Desc::im_static_storage->inline_b[2] << ".";
token_stream->Semantics_Error(ss.str());
}
Inline_Mesh_Desc::im_static_storage->block_dist[cubit_axis][block_index] = val;
break;}
case P_RBLOCK:{
block_index = token_stream->Parse_Integer()-1;
Expand All @@ -670,7 +676,13 @@ namespace PAMGEN_NEVADA {
ss << "Rblock/Xblock index out of range, should run from 1 to " << Inline_Mesh_Desc::im_static_storage->inline_b[0] << ".";
token_stream->Semantics_Error(ss.str());
}
Inline_Mesh_Desc::im_static_storage->block_dist[cubit_axis][block_index] = token_stream->Parse_Real();
Real val = token_stream->Parse_Real();
if(val <= 0.){
std::stringstream ss;
ss << "Block size must be positive." << Inline_Mesh_Desc::im_static_storage->inline_b[2] << ".";
token_stream->Semantics_Error(ss.str());
}
Inline_Mesh_Desc::im_static_storage->block_dist[cubit_axis][block_index] = val;
break;}
case P_ABLOCK:{
block_index = token_stream->Parse_Integer()-1;
Expand All @@ -679,7 +691,13 @@ namespace PAMGEN_NEVADA {
ss << "Ablock/Yblock index out of range, should run from 1 to " << Inline_Mesh_Desc::im_static_storage->inline_b[1] << ".";
token_stream->Semantics_Error(ss.str());
}
Inline_Mesh_Desc::im_static_storage->block_dist[cubit_axis][block_index] = token_stream->Parse_Real();
Real val = token_stream->Parse_Real();
if(val <= 0.){
std::stringstream ss;
ss << "Block size must be positive." << Inline_Mesh_Desc::im_static_storage->inline_b[2] << ".";
token_stream->Semantics_Error(ss.str());
}
Inline_Mesh_Desc::im_static_storage->block_dist[cubit_axis][block_index] = val;
break;}


Expand Down
Loading