diff --git a/doc/workshop/optimizer/Inputs/1_grad_desc.xml b/doc/workshop/optimizer/Inputs/1_grad_desc.xml index 1cb8dda6dc..979000072e 100755 --- a/doc/workshop/optimizer/Inputs/1_grad_desc.xml +++ b/doc/workshop/optimizer/Inputs/1_grad_desc.xml @@ -14,7 +14,7 @@ - opter + opter placeholder projectile search_path diff --git a/ravenframework/Models/Model.py b/ravenframework/Models/Model.py index 6b98d9e974..9c21a22aa4 100644 --- a/ravenframework/Models/Model.py +++ b/ravenframework/Models/Model.py @@ -131,11 +131,9 @@ class cls. validateDict['Optimizer'][0]['class' ] ='Optimizers' validateDict['Optimizer'][0]['required' ] = False validateDict['Optimizer'][0]['multiplicity'] = 1 - validateDict['Optimizer'][0]['type'] = ['SPSA', - 'FiniteDifference', - 'ConjugateGradient', - 'SimulatedAnnealing', + validateDict['Optimizer'][0]['type'] = ['GradientDescent', 'GeneticAlgorithm', + 'SimulatedAnnealing', 'BayesianOptimizer'] @classmethod diff --git a/tests/framework/CodeInterfaceTests/RAVEN/optimizer.xml b/tests/framework/CodeInterfaceTests/RAVEN/optimizer.xml index 8e991f0690..5b7fd1e793 100644 --- a/tests/framework/CodeInterfaceTests/RAVEN/optimizer.xml +++ b/tests/framework/CodeInterfaceTests/RAVEN/optimizer.xml @@ -26,7 +26,7 @@ inner_input raven - opter + opter opt_export outer_samples diff --git a/tests/framework/Optimizers/GradientDescent/1_variable_gradient.xml b/tests/framework/Optimizers/GradientDescent/1_variable_gradient.xml index 8beb6c7e14..eef1c75d6b 100644 --- a/tests/framework/Optimizers/GradientDescent/1_variable_gradient.xml +++ b/tests/framework/Optimizers/GradientDescent/1_variable_gradient.xml @@ -26,21 +26,21 @@ dummyIN beale - opter_fd + opter_fd opt_export_fd optOut_fd dummyIN beale - opter_cd + opter_cd opt_export_cd optOut_cd dummyIN beale - opter_spsa + opter_spsa opt_export_spsa optOut_spsa diff --git a/tests/framework/Optimizers/GradientDescent/basic.xml b/tests/framework/Optimizers/GradientDescent/basic.xml index 6caf812336..df6fbcf40f 100644 --- a/tests/framework/Optimizers/GradientDescent/basic.xml +++ b/tests/framework/Optimizers/GradientDescent/basic.xml @@ -27,7 +27,7 @@ dummyIN beale - opter + opter opt_export optOut opt_export diff --git a/tests/framework/Optimizers/GradientDescent/central_diff.xml b/tests/framework/Optimizers/GradientDescent/central_diff.xml index ab50936692..ff65af55e3 100644 --- a/tests/framework/Optimizers/GradientDescent/central_diff.xml +++ b/tests/framework/Optimizers/GradientDescent/central_diff.xml @@ -23,7 +23,7 @@ placeholder beale - opter + opter opt_export optOut opt_export diff --git a/tests/framework/Optimizers/GradientDescent/constrain_boundary.xml b/tests/framework/Optimizers/GradientDescent/constrain_boundary.xml index 008e809b61..c520933233 100644 --- a/tests/framework/Optimizers/GradientDescent/constrain_boundary.xml +++ b/tests/framework/Optimizers/GradientDescent/constrain_boundary.xml @@ -25,7 +25,7 @@ placeholder slant - opter + opter opt_export optOut diff --git a/tests/framework/Optimizers/GradientDescent/constrain_function.xml b/tests/framework/Optimizers/GradientDescent/constrain_function.xml index f2f1a4f0ab..671d4ddd9f 100644 --- a/tests/framework/Optimizers/GradientDescent/constrain_function.xml +++ b/tests/framework/Optimizers/GradientDescent/constrain_function.xml @@ -25,7 +25,7 @@ placeholder goal - opter + opter opt_export optOut diff --git a/tests/framework/Optimizers/GradientDescent/converge_gradient.xml b/tests/framework/Optimizers/GradientDescent/converge_gradient.xml index 3aab5c5df8..aa5d1ef041 100644 --- a/tests/framework/Optimizers/GradientDescent/converge_gradient.xml +++ b/tests/framework/Optimizers/GradientDescent/converge_gradient.xml @@ -24,7 +24,7 @@ placeholder beale - opter + opter opt_export optOut diff --git a/tests/framework/Optimizers/GradientDescent/converge_objective.xml b/tests/framework/Optimizers/GradientDescent/converge_objective.xml index 84542b017d..250de97202 100644 --- a/tests/framework/Optimizers/GradientDescent/converge_objective.xml +++ b/tests/framework/Optimizers/GradientDescent/converge_objective.xml @@ -24,7 +24,7 @@ placeholder beale - opter + opter opt_export optOut diff --git a/tests/framework/Optimizers/GradientDescent/converge_stepsize.xml b/tests/framework/Optimizers/GradientDescent/converge_stepsize.xml index b013d1c20f..95e7234c3a 100644 --- a/tests/framework/Optimizers/GradientDescent/converge_stepsize.xml +++ b/tests/framework/Optimizers/GradientDescent/converge_stepsize.xml @@ -24,7 +24,7 @@ placeholder beale - opter + opter opt_export optOut diff --git a/tests/framework/Optimizers/GradientDescent/fd_conjgrad.xml b/tests/framework/Optimizers/GradientDescent/fd_conjgrad.xml index 6fa8ef5c15..2bc69f5883 100644 --- a/tests/framework/Optimizers/GradientDescent/fd_conjgrad.xml +++ b/tests/framework/Optimizers/GradientDescent/fd_conjgrad.xml @@ -23,7 +23,7 @@ dummyIN beale - opter + opter opt_export optOut opt_export diff --git a/tests/framework/Optimizers/GradientDescent/init_sampler.xml b/tests/framework/Optimizers/GradientDescent/init_sampler.xml index 652eb6f3d4..44ebb46266 100644 --- a/tests/framework/Optimizers/GradientDescent/init_sampler.xml +++ b/tests/framework/Optimizers/GradientDescent/init_sampler.xml @@ -23,7 +23,7 @@ placeholder beale - opter + opter opt_export optOut opt_export diff --git a/tests/framework/Optimizers/GradientDescent/initial_step.xml b/tests/framework/Optimizers/GradientDescent/initial_step.xml index 3207f07949..fcea923b73 100644 --- a/tests/framework/Optimizers/GradientDescent/initial_step.xml +++ b/tests/framework/Optimizers/GradientDescent/initial_step.xml @@ -26,7 +26,7 @@ dummyIN beale - opter + opter opt_export optOut opt_export diff --git a/tests/framework/Optimizers/GradientDescent/max.xml b/tests/framework/Optimizers/GradientDescent/max.xml index 92ef3d7665..83bfcc0053 100644 --- a/tests/framework/Optimizers/GradientDescent/max.xml +++ b/tests/framework/Optimizers/GradientDescent/max.xml @@ -23,7 +23,7 @@ dummyIN beale - opter + opter opt_export optOut opt_export diff --git a/tests/framework/Optimizers/GradientDescent/minimal.xml b/tests/framework/Optimizers/GradientDescent/minimal.xml index 6d5a54d182..828b42ad83 100644 --- a/tests/framework/Optimizers/GradientDescent/minimal.xml +++ b/tests/framework/Optimizers/GradientDescent/minimal.xml @@ -24,7 +24,7 @@ dummyIN beale - opter + opter opt_export optOut diff --git a/tests/framework/Optimizers/GradientDescent/multitraj.xml b/tests/framework/Optimizers/GradientDescent/multitraj.xml index 1ae0578215..dbfa92fdb9 100644 --- a/tests/framework/Optimizers/GradientDescent/multitraj.xml +++ b/tests/framework/Optimizers/GradientDescent/multitraj.xml @@ -23,7 +23,7 @@ dummyIN beale - opter + opter opt_export optOut diff --git a/tests/framework/Optimizers/GradientDescent/spsa.xml b/tests/framework/Optimizers/GradientDescent/spsa.xml index 568e60bfc4..7547267050 100644 --- a/tests/framework/Optimizers/GradientDescent/spsa.xml +++ b/tests/framework/Optimizers/GradientDescent/spsa.xml @@ -23,7 +23,7 @@ placeholder beale - opter + opter opt_export optOut opt_export diff --git a/tests/framework/Optimizers/GradientDescent/stuck_corner.xml b/tests/framework/Optimizers/GradientDescent/stuck_corner.xml index e0500e3a8e..793a862d71 100644 --- a/tests/framework/Optimizers/GradientDescent/stuck_corner.xml +++ b/tests/framework/Optimizers/GradientDescent/stuck_corner.xml @@ -23,7 +23,7 @@ placeholder goal - opter + opter opt_export optOut opt_export diff --git a/tests/framework/Optimizers/GradientDescent/valley.xml b/tests/framework/Optimizers/GradientDescent/valley.xml index e07272ab4b..4455cb5608 100644 --- a/tests/framework/Optimizers/GradientDescent/valley.xml +++ b/tests/framework/Optimizers/GradientDescent/valley.xml @@ -24,7 +24,7 @@ placeholder valley - opter + opter opt_export optOut diff --git a/tests/framework/Optimizers/GradientDescent/write_final.xml b/tests/framework/Optimizers/GradientDescent/write_final.xml index efcdb94ce5..20f209d78f 100644 --- a/tests/framework/Optimizers/GradientDescent/write_final.xml +++ b/tests/framework/Optimizers/GradientDescent/write_final.xml @@ -23,7 +23,7 @@ dummyIN beale - opter + opter opt_export optOut diff --git a/tests/framework/ensembleModelTests/test_ensemble_model_linear_internal_parallel_with_optimizer.xml b/tests/framework/ensembleModelTests/test_ensemble_model_linear_internal_parallel_with_optimizer.xml index 90b59a3dc7..cfe7aa7bcc 100644 --- a/tests/framework/ensembleModelTests/test_ensemble_model_linear_internal_parallel_with_optimizer.xml +++ b/tests/framework/ensembleModelTests/test_ensemble_model_linear_internal_parallel_with_optimizer.xml @@ -95,7 +95,7 @@ inputHolder heatTransferEnsembleModel - opt_smp + opt_smp optData metaModelOutputTest optOutput diff --git a/tests/framework/user_guide/optimizing/constrain.xml b/tests/framework/user_guide/optimizing/constrain.xml index b0d0cdaf80..c164739f70 100644 --- a/tests/framework/user_guide/optimizing/constrain.xml +++ b/tests/framework/user_guide/optimizing/constrain.xml @@ -23,7 +23,7 @@ placeholder beale - opter + opter opt_export optOut diff --git a/tests/framework/user_guide/optimizing/multiple_trajectories.xml b/tests/framework/user_guide/optimizing/multiple_trajectories.xml index c5d6fd2fc2..761f379bbf 100644 --- a/tests/framework/user_guide/optimizing/multiple_trajectories.xml +++ b/tests/framework/user_guide/optimizing/multiple_trajectories.xml @@ -22,7 +22,7 @@ placeholder beale - opter + opter opt_export optOut diff --git a/tests/framework/user_guide/optimizing/simple.xml b/tests/framework/user_guide/optimizing/simple.xml index 5083d8e4a2..aba2ba74b2 100644 --- a/tests/framework/user_guide/optimizing/simple.xml +++ b/tests/framework/user_guide/optimizing/simple.xml @@ -22,7 +22,7 @@ placeholder beale - opter + opter opt_export optOut diff --git a/tests/framework/user_guide/optimizing/step_size.xml b/tests/framework/user_guide/optimizing/step_size.xml index 2be83a189b..6a8516e0d4 100644 --- a/tests/framework/user_guide/optimizing/step_size.xml +++ b/tests/framework/user_guide/optimizing/step_size.xml @@ -22,7 +22,7 @@ placeholder beale - opter + opter opt_export optOut