Skip to content

Commit

Permalink
Merge commit '1aba7ed4924b07da0f87d989f72ace489e94b6aa'
Browse files Browse the repository at this point in the history
  • Loading branch information
moosetest committed Sep 14, 2023
2 parents 4c050db + 1aba7ed commit cbc569c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion moose
Submodule moose updated 43 files
+8 −2 modules/contact/include/userobjects/PenaltyFrictionUserObject.h
+21 −2 modules/contact/include/userobjects/PenaltyWeightedGapUserObject.h
+48 −4 modules/contact/src/actions/ContactAction.C
+87 −14 modules/contact/src/userobjects/PenaltyFrictionUserObject.C
+100 −15 modules/contact/src/userobjects/PenaltyWeightedGapUserObject.C
+446 −0 modules/contact/test/tests/3d-mortar-contact/frictional-mortar-3d-al.i
+1 −1 modules/contact/test/tests/3d-mortar-contact/frictional-mortar-3d-penalty.i
+ − modules/contact/test/tests/3d-mortar-contact/gold/frictional-mortar-3d-al_out.e
+ − modules/contact/test/tests/3d-mortar-contact/gold/frictional-mortar-3d-penalty_out.e
+14 −0 modules/contact/test/tests/3d-mortar-contact/tests
+2 −2 modules/contact/test/tests/pdass_problems/cylinder_friction_penalty.i
+1 −1 modules/contact/test/tests/pdass_problems/cylinder_friction_penalty_frictional_al.i
+2 −0 modules/contact/test/tests/pdass_problems/cylinder_friction_penalty_frictional_al_action.i
+283 −0 modules/contact/test/tests/pdass_problems/cylinder_friction_penalty_frictional_al_action_amg_bussetta_simple.i
+289 −0 modules/contact/test/tests/pdass_problems/cylinder_friction_penalty_frictional_al_action_amg_tight.i
+1 −0 ...s/pdass_problems/cylinder_friction_penalty_frictional_al_action_amg_tight_vectorpp_output_surface_FINAL.csv
+5 −5 modules/contact/test/tests/pdass_problems/cylinder_friction_penalty_frictional_al_tight_slip.i
+1 −0 modules/contact/test/tests/pdass_problems/cylinder_friction_penalty_normal_al_backup.i
+479 −479 modules/contact/test/tests/pdass_problems/gold/cylinder_friction_penalty_adaptivity_surface_FINAL.csv
+101 −101 modules/contact/test/tests/pdass_problems/gold/cylinder_friction_penalty_check_cont_press_FINAL.csv
+15 −15 modules/contact/test/tests/pdass_problems/gold/cylinder_friction_penalty_check_friction_FINAL.csv
+119 −119 modules/contact/test/tests/pdass_problems/gold/cylinder_friction_penalty_check_x_disp_FINAL.csv
+119 −119 modules/contact/test/tests/pdass_problems/gold/cylinder_friction_penalty_check_y_disp_FINAL.csv
+82 −0 ...s/gold/cylinder_friction_penalty_frictional_al_action_amg_bussetta_simple_vectorpp_output_surface_FINAL.csv
+82 −0 ...ss_problems/gold/cylinder_friction_penalty_frictional_al_action_amg_tight_vectorpp_output_surface_FINAL.csv
+79 −79 ...ts/pdass_problems/gold/cylinder_friction_penalty_frictional_al_action_amg_vectorpp_output_surface_FINAL.csv
+242 −242 ...ts/pdass_problems/gold/cylinder_friction_penalty_frictional_al_tight_slip_vectorpp_output_surface_FINAL.csv
+239 −239 ...ct/test/tests/pdass_problems/gold/cylinder_friction_penalty_frictional_al_vectorpp_output_surface_FINAL.csv
+54 −11 modules/contact/test/tests/pdass_problems/tests
+31 −0 modules/stochastic_tools/doc/content/source/reporters/BiFidelityActiveLearningGPDecision.md
+23 −17 modules/stochastic_tools/include/reporters/ActiveLearningGPDecision.h
+2 −1 modules/stochastic_tools/include/reporters/ActiveLearningReporterBase.h
+71 −0 modules/stochastic_tools/include/reporters/BiFidelityActiveLearningGPDecision.h
+91 −0 modules/stochastic_tools/src/reporters/BiFidelityActiveLearningGPDecision.C
+0 −2 modules/stochastic_tools/src/surrogates/ActiveLearningGaussianProcess.C
+2 −1 modules/stochastic_tools/src/utils/GaussianProcessHandler.C
+0 −7 modules/stochastic_tools/test/tests/reporters/ActiveLearningGP/tests
+1,351 −0 modules/stochastic_tools/test/tests/reporters/BFActiveLearning/gold/multiple_proc_multiple_row_ufunction.json
+518 −0 modules/stochastic_tools/test/tests/reporters/BFActiveLearning/gold/single_proc_single_row_ufunction.json
+145 −0 modules/stochastic_tools/test/tests/reporters/BFActiveLearning/main_adam.i
+72 −0 modules/stochastic_tools/test/tests/reporters/BFActiveLearning/sub.i
+72 −0 modules/stochastic_tools/test/tests/reporters/BFActiveLearning/sub_lf.i
+24 −0 modules/stochastic_tools/test/tests/reporters/BFActiveLearning/tests

0 comments on commit cbc569c

Please sign in to comment.