Merge Pull Request #13466 from DrBooom/Trilinos/cbl_pamgen_block_leng…

…th_nonneg Automatically Merged using Trilinos Pull Request AutoTester PR Title: b'Pamgen: block length nonneg' PR Author: DrBooom
trilinos · Sep 23, 2024 · 4098d16 · 4098d16
2 parents 9d1d85c + 9f18ff8
commit 4098d16
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/packages/pamgen/src/parse_routines.C b/packages/pamgen/src/parse_routines.C
@@ -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;
@@ -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;
@@ -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;}