From e5419c5a9013535bed2426d808916cb605d2d202 Mon Sep 17 00:00:00 2001 From: Daniel Schwen Date: Thu, 18 Aug 2022 15:03:40 -0600 Subject: [PATCH] Fix tests (#21885) --- modules/combined/src/base/CombinedApp.C | 7 +++--- .../combined/test/src/base/CombinedTestApp.C | 8 ++++--- .../adjoint.i | 0 .../forward.i | 0 .../master_out_OptimizationReporter_0001.csv | 0 .../master.i | 0 .../tests | 0 .../adjoint.i | 0 .../forward.i | 0 .../main_out_OptimizationReporter_0001.csv | 0 .../homogeneous_forward.i | 0 .../main.i | 0 .../simulation.i | 0 .../tests | 0 .../objective_minimize_mechanics}/forward.i | 0 .../gold/csvdiff.cmp | 0 .../master_out_OptimizationReporter_0001.csv | 0 .../objective_minimize_mechanics}/master.i | 0 .../tests/objective_minimize_mechanics}/tests | 0 .../optimizationreporters/ObjectiveMinimize.C | 24 +++++++++---------- 20 files changed, 21 insertions(+), 18 deletions(-) rename modules/{optimization/test/tests/optimizationreporter/objective_gradient_minimize/mechanics => combined/test/tests/objective_gradient_minimize_mechanics}/adjoint.i (100%) rename modules/{optimization/test/tests/optimizationreporter/objective_gradient_minimize/mechanics => combined/test/tests/objective_gradient_minimize_mechanics}/forward.i (100%) rename modules/{optimization/test/tests/optimizationreporter/objective_gradient_minimize/mechanics => combined/test/tests/objective_gradient_minimize_mechanics}/gold/master_out_OptimizationReporter_0001.csv (100%) rename modules/{optimization/test/tests/optimizationreporter/objective_gradient_minimize/mechanics => combined/test/tests/objective_gradient_minimize_mechanics}/master.i (100%) rename modules/{optimization/test/tests/optimizationreporter/objective_gradient_minimize/mechanics => combined/test/tests/objective_gradient_minimize_mechanics}/tests (100%) rename modules/{optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear => combined/test/tests/objective_gradient_minimize_nonlinear}/adjoint.i (100%) rename modules/{optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear => combined/test/tests/objective_gradient_minimize_nonlinear}/forward.i (100%) rename modules/{optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear => combined/test/tests/objective_gradient_minimize_nonlinear}/gold/main_out_OptimizationReporter_0001.csv (100%) rename modules/{optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear => combined/test/tests/objective_gradient_minimize_nonlinear}/homogeneous_forward.i (100%) rename modules/{optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear => combined/test/tests/objective_gradient_minimize_nonlinear}/main.i (100%) rename modules/{optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear => combined/test/tests/objective_gradient_minimize_nonlinear}/simulation.i (100%) rename modules/{optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear => combined/test/tests/objective_gradient_minimize_nonlinear}/tests (100%) rename modules/{optimization/test/tests/optimizationreporter/objective_minimize/mechanics => combined/test/tests/objective_minimize_mechanics}/forward.i (100%) rename modules/{optimization/test/tests/optimizationreporter/objective_minimize/mechanics => combined/test/tests/objective_minimize_mechanics}/gold/csvdiff.cmp (100%) rename modules/{optimization/test/tests/optimizationreporter/objective_minimize/mechanics => combined/test/tests/objective_minimize_mechanics}/gold/master_out_OptimizationReporter_0001.csv (100%) rename modules/{optimization/test/tests/optimizationreporter/objective_minimize/mechanics => combined/test/tests/objective_minimize_mechanics}/master.i (100%) rename modules/{optimization/test/tests/optimizationreporter/objective_minimize/mechanics => combined/test/tests/objective_minimize_mechanics}/tests (100%) diff --git a/modules/combined/src/base/CombinedApp.C b/modules/combined/src/base/CombinedApp.C index 93ae99d4ff47..1f743e32aab0 100644 --- 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,6 +25,8 @@ #include "LevelSetApp.h" #include "MiscApp.h" #include "NavierStokesApp.h" +#include "OptimizationApp.h" +#include "PeridynamicsApp.h" #include "PhaseFieldApp.h" #include "PorousFlowApp.h" #include "RayTracingApp.h" @@ -31,11 +34,9 @@ #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 index 194b7422880f..9354edd2898a 100644 --- 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/modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/mechanics/adjoint.i b/modules/combined/test/tests/objective_gradient_minimize_mechanics/adjoint.i similarity index 100% rename from modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/mechanics/adjoint.i rename to modules/combined/test/tests/objective_gradient_minimize_mechanics/adjoint.i diff --git a/modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/mechanics/forward.i b/modules/combined/test/tests/objective_gradient_minimize_mechanics/forward.i similarity index 100% rename from modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/mechanics/forward.i rename to modules/combined/test/tests/objective_gradient_minimize_mechanics/forward.i diff --git a/modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/mechanics/gold/master_out_OptimizationReporter_0001.csv b/modules/combined/test/tests/objective_gradient_minimize_mechanics/gold/master_out_OptimizationReporter_0001.csv similarity index 100% rename from modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/mechanics/gold/master_out_OptimizationReporter_0001.csv rename to modules/combined/test/tests/objective_gradient_minimize_mechanics/gold/master_out_OptimizationReporter_0001.csv diff --git a/modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/mechanics/master.i b/modules/combined/test/tests/objective_gradient_minimize_mechanics/master.i similarity index 100% rename from modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/mechanics/master.i rename to modules/combined/test/tests/objective_gradient_minimize_mechanics/master.i diff --git a/modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/mechanics/tests b/modules/combined/test/tests/objective_gradient_minimize_mechanics/tests similarity index 100% rename from modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/mechanics/tests rename to modules/combined/test/tests/objective_gradient_minimize_mechanics/tests diff --git a/modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear/adjoint.i b/modules/combined/test/tests/objective_gradient_minimize_nonlinear/adjoint.i similarity index 100% rename from modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear/adjoint.i rename to modules/combined/test/tests/objective_gradient_minimize_nonlinear/adjoint.i diff --git a/modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear/forward.i b/modules/combined/test/tests/objective_gradient_minimize_nonlinear/forward.i similarity index 100% rename from modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear/forward.i rename to modules/combined/test/tests/objective_gradient_minimize_nonlinear/forward.i diff --git a/modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear/gold/main_out_OptimizationReporter_0001.csv b/modules/combined/test/tests/objective_gradient_minimize_nonlinear/gold/main_out_OptimizationReporter_0001.csv similarity index 100% rename from modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear/gold/main_out_OptimizationReporter_0001.csv rename to modules/combined/test/tests/objective_gradient_minimize_nonlinear/gold/main_out_OptimizationReporter_0001.csv diff --git a/modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear/homogeneous_forward.i b/modules/combined/test/tests/objective_gradient_minimize_nonlinear/homogeneous_forward.i similarity index 100% rename from modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear/homogeneous_forward.i rename to modules/combined/test/tests/objective_gradient_minimize_nonlinear/homogeneous_forward.i diff --git a/modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear/main.i b/modules/combined/test/tests/objective_gradient_minimize_nonlinear/main.i similarity index 100% rename from modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear/main.i rename to modules/combined/test/tests/objective_gradient_minimize_nonlinear/main.i diff --git a/modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear/simulation.i b/modules/combined/test/tests/objective_gradient_minimize_nonlinear/simulation.i similarity index 100% rename from modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear/simulation.i rename to modules/combined/test/tests/objective_gradient_minimize_nonlinear/simulation.i diff --git a/modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear/tests b/modules/combined/test/tests/objective_gradient_minimize_nonlinear/tests similarity index 100% rename from modules/optimization/test/tests/optimizationreporter/objective_gradient_minimize/nonlinear/tests rename to modules/combined/test/tests/objective_gradient_minimize_nonlinear/tests diff --git a/modules/optimization/test/tests/optimizationreporter/objective_minimize/mechanics/forward.i b/modules/combined/test/tests/objective_minimize_mechanics/forward.i similarity index 100% rename from modules/optimization/test/tests/optimizationreporter/objective_minimize/mechanics/forward.i rename to modules/combined/test/tests/objective_minimize_mechanics/forward.i diff --git a/modules/optimization/test/tests/optimizationreporter/objective_minimize/mechanics/gold/csvdiff.cmp b/modules/combined/test/tests/objective_minimize_mechanics/gold/csvdiff.cmp similarity index 100% rename from modules/optimization/test/tests/optimizationreporter/objective_minimize/mechanics/gold/csvdiff.cmp rename to modules/combined/test/tests/objective_minimize_mechanics/gold/csvdiff.cmp diff --git a/modules/optimization/test/tests/optimizationreporter/objective_minimize/mechanics/gold/master_out_OptimizationReporter_0001.csv b/modules/combined/test/tests/objective_minimize_mechanics/gold/master_out_OptimizationReporter_0001.csv similarity index 100% rename from modules/optimization/test/tests/optimizationreporter/objective_minimize/mechanics/gold/master_out_OptimizationReporter_0001.csv rename to modules/combined/test/tests/objective_minimize_mechanics/gold/master_out_OptimizationReporter_0001.csv diff --git a/modules/optimization/test/tests/optimizationreporter/objective_minimize/mechanics/master.i b/modules/combined/test/tests/objective_minimize_mechanics/master.i similarity index 100% rename from modules/optimization/test/tests/optimizationreporter/objective_minimize/mechanics/master.i rename to modules/combined/test/tests/objective_minimize_mechanics/master.i diff --git a/modules/optimization/test/tests/optimizationreporter/objective_minimize/mechanics/tests b/modules/combined/test/tests/objective_minimize_mechanics/tests similarity index 100% rename from modules/optimization/test/tests/optimizationreporter/objective_minimize/mechanics/tests rename to modules/combined/test/tests/objective_minimize_mechanics/tests diff --git a/modules/optimization/src/optimizationreporters/ObjectiveMinimize.C b/modules/optimization/src/optimizationreporters/ObjectiveMinimize.C index a973c632f680..d3cd7e4a56e0 100644 --- a/modules/optimization/src/optimizationreporters/ObjectiveMinimize.C +++ b/modules/optimization/src/optimizationreporters/ObjectiveMinimize.C @@ -49,24 +49,24 @@ ObjectiveMinimize::updateParameters(const libMesh::PetscVector & 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;