Adjust control flow to check empty vectors (#3988)

idaholab · Oct 6, 2014 · 041ef39 · 041ef39
1 parent 0c66414
commit 041ef39
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/framework/include/utils/InputParameters.h b/framework/include/utils/InputParameters.h
@@ -564,13 +564,19 @@ InputParameters::rangeCheck(const std::string & full_name, const std::string & s
 
   // iterate over all vector values (maybe ;)
   bool need_to_iterate = false;
-  for (unsigned int i = 0; i < value.size(); i++)
-  {
+  unsigned int i = 0;
+  do {
     // set parameters
     for (unsigned int j = 0; j < vars.size(); j++)
     {
       if (vars[j] == short_name)
       {
+        if (value.size() == 0)
+        {
+          oss << "Range checking empty vector: " << _range_functions[short_name] << '\n';
+          return;
+        }
+
         parbuf[j] = value[i];
         need_to_iterate = true;
       }
@@ -619,8 +625,8 @@ InputParameters::rangeCheck(const std::string & full_name, const std::string & s
         oss << "\t Component: " << i << '\n';
     }
 
-    if (!need_to_iterate) break;
-  }
+
+  } while (need_to_iterate && ++i < value.size());
 }
 
 template <typename T, typename UP_T>

diff --git a/test/src/materials/VecRangeCheckMaterial.C b/test/src/materials/VecRangeCheckMaterial.C
@@ -12,6 +12,7 @@ InputParameters validParams<VecRangeCheckMaterial>()
   params.addRequiredRangeCheckedParam<std::vector<int> >("ivg", "ivg_0 > ivg_1", "Int vector where component 0 is bigger than component 1");
   params.addRequiredRangeCheckedParam<std::vector<Real> >("rvg", "rvg_0 > rvg_1", "Real vector where component 0 is bigger than component 1");
   params.addRequiredRangeCheckedParam<std::vector<Real> >("rvl", "rvl_10 > 0", "Testing if component 10 is positive (usually we should have a size check here as well)");
+  params.addRequiredRangeCheckedParam<std::vector<Real> >("rve", "rve_size = 0 | rve_size = 3", "Vector with either 0 or 3 components");
   return params;
 }
 

diff --git a/test/tests/parser/vector_range_checking/all_pass.i b/test/tests/parser/vector_range_checking/all_pass.i
@@ -15,6 +15,7 @@
     ivg = '2 1'
     rvg = '2.0 1.0'
     rvl = '0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3'
+    rve = ''
   [../]
 []
 

diff --git a/test/tests/parser/vector_range_checking/tests b/test/tests/parser/vector_range_checking/tests
@@ -47,4 +47,10 @@
     expect_err = "Error parsing expression: rvl_10 > 0\nOut of range variable rvl_10"
     cli_args = Materials/vecrangecheck/rvl="1.0 2.0"
   [../]
+  [./checkempty]
+    type = 'RunException'
+    input = 'all_pass.i'
+    expect_err = "Range checking empty vector: rvp > 0"
+    cli_args = Materials/vecrangecheck/rvp=""
+  [../]
 []