Fix tests (idaholab#21885)

dschwen · Aug 19, 2022 · e5419c5 · e5419c5
1 parent 264605d
commit e5419c5
Show file tree

Hide file tree

Showing 20 changed files with 21 additions and 18 deletions.
diff --git a/modules/combined/src/base/CombinedApp.C b/modules/combined/src/base/CombinedApp.C
@@ -16,6 +16,7 @@
 #include "ChemicalReactionsApp.h"
 #include "ContactApp.h"
 #include "ElectromagneticsApp.h"
+#include "ExternalPetscSolverApp.h"
 #include "FluidPropertiesApp.h"
 #include "FsiApp.h"
 #include "FunctionalExpansionToolsApp.h"
@@ -24,18 +25,18 @@
 #include "LevelSetApp.h"
 #include "MiscApp.h"
 #include "NavierStokesApp.h"
+#include "OptimizationApp.h"
+#include "PeridynamicsApp.h"
 #include "PhaseFieldApp.h"
 #include "PorousFlowApp.h"
 #include "RayTracingApp.h"
 #include "RdgApp.h"
 #include "ReactorApp.h"
 #include "RichardsApp.h"
 #include "StochasticToolsApp.h"
-#include "PeridynamicsApp.h"
 #include "TensorMechanicsApp.h"
 #include "ThermalHydraulicsApp.h"
 #include "XFEMApp.h"
-#include "ExternalPetscSolverApp.h"
 
 InputParameters
 CombinedApp::validParams()
@@ -81,6 +82,7 @@ CombinedApp::registerAll(Factory & f, ActionFactory & af, Syntax & s)
   LevelSetApp::registerAll(f, af, s);
   MiscApp::registerAll(f, af, s);
   NavierStokesApp::registerAll(f, af, s);
+  OptimizationApp::registerAll(f, af, s);
   PeridynamicsApp::registerAll(f, af, s);
   PhaseFieldApp::registerAll(f, af, s);
   PorousFlowApp::registerAll(f, af, s);
@@ -92,7 +94,6 @@ CombinedApp::registerAll(Factory & f, ActionFactory & af, Syntax & s)
   TensorMechanicsApp::registerAll(f, af, s);
   ThermalHydraulicsApp::registerAll(f, af, s);
   XFEMApp::registerAll(f, af, s);
-  ExternalPetscSolverApp::registerAll(f, af, s);
 }
 
 void

diff --git a/modules/combined/test/src/base/CombinedTestApp.C b/modules/combined/test/src/base/CombinedTestApp.C
@@ -26,15 +26,16 @@
 #include "LevelSetTestApp.h"
 #include "MiscTestApp.h"
 #include "NavierStokesTestApp.h"
+#include "OptimizationTestApp.h"
 #include "PeridynamicsTestApp.h"
 #include "PhaseFieldTestApp.h"
 #include "PorousFlowTestApp.h"
-#include "RayTracingTestApp.h"
-#include "RichardsTestApp.h"
-#include "StochasticToolsTestApp.h"
 #include "PorousFlowTestApp.h"
+#include "RayTracingTestApp.h"
 #include "RdgTestApp.h"
 #include "ReactorTestApp.h"
+#include "RichardsTestApp.h"
+#include "StochasticToolsTestApp.h"
 #include "TensorMechanicsTestApp.h"
 #include "ThermalHydraulicsTestApp.h"
 #include "XFEMTestApp.h"
@@ -77,6 +78,7 @@ CombinedTestApp::registerAll(Factory & f, ActionFactory & af, Syntax & s, bool u
     LevelSetTestApp::registerAll(f, af, s, use_test_objs);
     MiscTestApp::registerAll(f, af, s, use_test_objs);
     NavierStokesTestApp::registerAll(f, af, s, use_test_objs);
+    OptimizationTestApp::registerAll(f, af, s, use_test_objs);
     PeridynamicsTestApp::registerAll(f, af, s, use_test_objs);
     PhaseFieldTestApp::registerAll(f, af, s, use_test_objs);
     PorousFlowTestApp::registerAll(f, af, s, use_test_objs);

diff --git a/...ive_gradient_minimize/mechanics/adjoint.i → ...ive_gradient_minimize_mechanics/adjoint.i b/...ive_gradient_minimize/mechanics/adjoint.i → ...ive_gradient_minimize_mechanics/adjoint.i
diff --git a/...ive_gradient_minimize/mechanics/forward.i → ...ive_gradient_minimize_mechanics/forward.i b/...ive_gradient_minimize/mechanics/forward.i → ...ive_gradient_minimize_mechanics/forward.i
diff --git a/.../master_out_OptimizationReporter_0001.csv → .../master_out_OptimizationReporter_0001.csv b/.../master_out_OptimizationReporter_0001.csv → .../master_out_OptimizationReporter_0001.csv
diff --git a/...tive_gradient_minimize/mechanics/master.i → ...tive_gradient_minimize_mechanics/master.i b/...tive_gradient_minimize/mechanics/master.i → ...tive_gradient_minimize_mechanics/master.i
diff --git a/...jective_gradient_minimize/mechanics/tests → ...jective_gradient_minimize_mechanics/tests b/...jective_gradient_minimize/mechanics/tests → ...jective_gradient_minimize_mechanics/tests
diff --git a/...ive_gradient_minimize/nonlinear/adjoint.i → ...ive_gradient_minimize_nonlinear/adjoint.i b/...ive_gradient_minimize/nonlinear/adjoint.i → ...ive_gradient_minimize_nonlinear/adjoint.i
diff --git a/...ive_gradient_minimize/nonlinear/forward.i → ...ive_gradient_minimize_nonlinear/forward.i b/...ive_gradient_minimize/nonlinear/forward.i → ...ive_gradient_minimize_nonlinear/forward.i
diff --git a/...ld/main_out_OptimizationReporter_0001.csv → ...ld/main_out_OptimizationReporter_0001.csv b/...ld/main_out_OptimizationReporter_0001.csv → ...ld/main_out_OptimizationReporter_0001.csv
diff --git a/..._minimize/nonlinear/homogeneous_forward.i → ..._minimize_nonlinear/homogeneous_forward.i b/..._minimize/nonlinear/homogeneous_forward.i → ..._minimize_nonlinear/homogeneous_forward.i
diff --git a/...ective_gradient_minimize/nonlinear/main.i → ...ective_gradient_minimize_nonlinear/main.i b/...ective_gradient_minimize/nonlinear/main.i → ...ective_gradient_minimize_nonlinear/main.i
diff --git a/..._gradient_minimize/nonlinear/simulation.i → ..._gradient_minimize_nonlinear/simulation.i b/..._gradient_minimize/nonlinear/simulation.i → ..._gradient_minimize_nonlinear/simulation.i
diff --git a/...jective_gradient_minimize/nonlinear/tests → ...jective_gradient_minimize_nonlinear/tests b/...jective_gradient_minimize/nonlinear/tests → ...jective_gradient_minimize_nonlinear/tests
diff --git a/...er/objective_minimize/mechanics/forward.i → ...ts/objective_minimize_mechanics/forward.i b/...er/objective_minimize/mechanics/forward.i → ...ts/objective_minimize_mechanics/forward.i
diff --git a/...ctive_minimize/mechanics/gold/csvdiff.cmp → ...ctive_minimize_mechanics/gold/csvdiff.cmp b/...ctive_minimize/mechanics/gold/csvdiff.cmp → ...ctive_minimize_mechanics/gold/csvdiff.cmp
diff --git a/.../master_out_OptimizationReporter_0001.csv → .../master_out_OptimizationReporter_0001.csv b/.../master_out_OptimizationReporter_0001.csv → .../master_out_OptimizationReporter_0001.csv
diff --git a/...ter/objective_minimize/mechanics/master.i → ...sts/objective_minimize_mechanics/master.i b/...ter/objective_minimize/mechanics/master.i → ...sts/objective_minimize_mechanics/master.i
diff --git a/...porter/objective_minimize/mechanics/tests → .../tests/objective_minimize_mechanics/tests b/...porter/objective_minimize/mechanics/tests → .../tests/objective_minimize_mechanics/tests
diff --git a/modules/optimization/src/optimizationreporters/ObjectiveMinimize.C b/modules/optimization/src/optimizationreporters/ObjectiveMinimize.C
@@ -49,24 +49,24 @@ ObjectiveMinimize::updateParameters(const libMesh::PetscVector<Number> & x)
       Real value_from_tao = x(n);
       if (hasBounds() && value_from_tao < _lower_bounds[n])
       {
-        mooseWarning("Tao Optimization Parameters out of bounds.  System will be solved using the "
-                     "lower bound and the objective will be altered accordingly."
-                     "\nTao Parameter Value = ",
-                     value_from_tao,
-                     ";  lower_bound = ",
-                     _lower_bounds[n]);
+        mooseInfo("Tao Optimization Parameters out of bounds.  System will be solved using the "
+                  "lower bound and the objective will be altered accordingly."
+                  "\nTao Parameter Value = ",
+                  value_from_tao,
+                  ";  lower_bound = ",
+                  _lower_bounds[n]);
         val = _lower_bounds[n];
         Real diff = value_from_tao - _lower_bounds[n];
         _bound_adjustment += diff * diff;
       }
       else if (hasBounds() && value_from_tao > _upper_bounds[n])
       {
-        mooseWarning("Tao Optimization Parameters out of bounds.  System will be solved using the "
-                     "upper bound and the objective will be altered accordingly."
-                     "\nTao Parameter Value = ",
-                     value_from_tao,
-                     ";  upper_bound = ",
-                     _upper_bounds[n]);
+        mooseInfo("Tao Optimization Parameters out of bounds.  System will be solved using the "
+                  "upper bound and the objective will be altered accordingly."
+                  "\nTao Parameter Value = ",
+                  value_from_tao,
+                  ";  upper_bound = ",
+                  _upper_bounds[n]);
         val = _upper_bounds[n];
         Real diff = value_from_tao - _upper_bounds[n];
         _bound_adjustment += diff * diff;