From 580fa6cb2a4df1a33ddccd3073dfd8bf3c694f07 Mon Sep 17 00:00:00 2001 From: Daniel Schwen Date: Thu, 18 Aug 2022 15:03:40 -0600 Subject: [PATCH] Fix tests (#21885) --- .../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 +++++++++---------- 13 files changed, 12 insertions(+), 12 deletions(-) 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/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;