diff --git a/test/tests/ver-1fa/comparison_ver-1fa.py b/test/tests/ver-1fa/comparison_ver-1fa.py index 50b90035..6a169f9e 100644 --- a/test/tests/ver-1fa/comparison_ver-1fa.py +++ b/test/tests/ver-1fa/comparison_ver-1fa.py @@ -19,7 +19,7 @@ analytical_temp = Ts + Q*L**2 * (1- analytical_x**2/L**2) / (2*k) ax.scatter(analytical_x,analytical_temp,label=r"Analytical",c='k', marker='^') -tmap_sol = pd.read_csv("./gold/u_vs_x.csv") +tmap_sol = pd.read_csv("./gold/ver-1fa_out_line_0011.csv") tmap_x = tmap_sol['id'] tmap_temp = tmap_sol['temp'] ax.plot(tmap_x,tmap_temp,label=r"TMAP8",c='tab:gray') diff --git a/test/tests/ver-1fa/gold/u_vs_x.csv b/test/tests/ver-1fa/gold/ver-1fa_out_line_0011.csv similarity index 100% rename from test/tests/ver-1fa/gold/u_vs_x.csv rename to test/tests/ver-1fa/gold/ver-1fa_out_line_0011.csv diff --git a/test/tests/ver-1fa/tests b/test/tests/ver-1fa/tests index b1d0f19e..e59eee55 100644 --- a/test/tests/ver-1fa/tests +++ b/test/tests/ver-1fa/tests @@ -1,11 +1,26 @@ [Tests] design = 'HeatConduction.md HeatConductionTimeDerivative.md HeatSource.md' issues = '#12' - [heat_conduction_generation] + [ver-1fa] type = Exodiff input = ver-1fa.i exodiff = ver-1fa_out.e requirement = 'The system shall be able to model heat conduction in a slab that has heat generation' verification = 'ver-1fa.md' [] + [ver-1fa_lineplot] + type = CSVDiff + input = ver-1fa.i + should_execute = False # this test relies on the output files from ver-1fa, so it shouldn't be run twice + csvdiff = ver-1fa_out_line_0011.csv + requirement = 'The system shall be able to model heat conduction in a slab that has heat generation to generate CSV data for use in comparisons with the analytic solution for the profile concentration.' + prereq = ver-1fa + [] + [ver-1fa_comparison] + type = RunCommand + command = 'python3 comparison_ver-1fa.py' + requirement = 'The system shall be able to generate comparison plots between the analytical solution and simulated solution of verification case 1fa, to model heat conduction in a slab that has heat generation.' + prereq = ver-1fa + required_python_packages = 'matplotlib numpy pandas os git' + [] [] diff --git a/test/tests/ver-1fa/ver-1fa.i b/test/tests/ver-1fa/ver-1fa.i index e331ae11..22327b74 100644 --- a/test/tests/ver-1fa/ver-1fa.i +++ b/test/tests/ver-1fa/ver-1fa.i @@ -67,9 +67,9 @@ [Executioner] type = Transient scheme = bdf2 - solve_type = PJFNK - petsc_options_iname = '-pc_type -ksp_grmres_restart -sub_ksp_type -sub_pc_type -pc_asm_overlap' - petsc_options_value = 'asm 101 preonly ilu 1' + solve_type = NEWTON + petsc_options_iname = '-pc_type' + petsc_options_value = 'lu' nl_rel_tol = 1e-8 nl_abs_tol = 1e-10 l_tol = 1e-4 @@ -92,5 +92,5 @@ [Outputs] execute_on = FINAL exodus = true - csv = false + csv = true []