Merge remote-tracking branch 'origin/devel' · hugary1995/raccoon@6bca2a6

Commit

Merge remote-tracking branch 'origin/devel'

Browse files

hugary1995 committed Oct 27, 2023

2 parents 1d95ae6 + fb739f6 commit 6bca2a6

+1 −1		conda/moose-dev/conda_build_config.yaml
+1 −1		conda/moose-dev/meta.yaml
+1 −1		conda/moose/conda_build_config.yaml
+1 −1		conda/pyhit/conda_build_config.yaml
+1 −1		conda/pyhit/meta.yaml
+1 −1		conda/template/conda_build_config.yaml
+1 −1		conda/wasp/meta.yaml
+1 −1		docker_ci/Dockerfile
+1 −1		framework/contrib/wasp
+11 −3		framework/src/timesteppers/IterationAdaptiveDT.C
+ −		modules/combined/test/tests/adaptive_timestepping/gold/adapt_tstep_function_force_step_out.e
+5 −0		modules/optimization/src/executioners/AdjointSolve.C
+8 −9		modules/optimization/test/tests/optimizationreporter/point_loads/tests
+ −		modules/thermal_hydraulics/joss_paper/demo_dia_T.png
+110 −0		modules/thermal_hydraulics/joss_paper/joss_paper.bib
+288 −0		modules/thermal_hydraulics/joss_paper/joss_paper.md
+116 −19		python/doc/content/python/peacock.md
+6 −0		scripts/tests/versioner_hashes.yaml
+1 −3		test/tests/time_steppers/iteration_adaptive/gold/piecewise_constant_out.csv
+42 −0		unit/src/HitTests.C