diff --git a/.coverage b/.coverage index a9320ef354670acb84953dfaf7fc2b2f67903333..f50d7eead9a1e192f1d3388d0616e50d9d8c294c 100644 Binary files a/.coverage and b/.coverage differ diff --git a/coverage.xml b/coverage.xml index 43946851ee4b397af5acbec809d92a6001249ec3..3d7d1a1faa92f3dcb8b55704cb34f8f8505d4d02 100644 --- a/coverage.xml +++ b/coverage.xml @@ -1,9 +1,9 @@ <?xml version="1.0" ?> -<coverage version="7.6.11" timestamp="1739271601600" lines-valid="591" lines-covered="560" line-rate="0.9475" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0"> +<coverage version="7.6.11" timestamp="1739272050600" lines-valid="591" lines-covered="560" line-rate="0.9475" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0"> <!-- Generated by coverage.py: https://coverage.readthedocs.io/en/7.6.11 --> <!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd --> <sources> - <source>/Users/janhabscheid/Documents/git/fxdgm/fxdgm</source> + <source>/Users/janhabscheid/Documents/git/fxdgm-testing/fxdgm</source> </sources> <packages> <package name="." line-rate="0.9475" branch-rate="0" complexity="0"> diff --git a/fxdgm/Eq02.py b/fxdgm/Eq02.py index 15f96f44e393e36fe193625f4ab8d91b3af0f1e4..b006ed30b3dc3e429869cf2d16d59ba54dac39f7 100644 --- a/fxdgm/Eq02.py +++ b/fxdgm/Eq02.py @@ -242,47 +242,47 @@ def solve_System_2eq(phi_left:float, phi_right:float, p_right:float, z_A:float, return y_A_vals, y_C_vals, phi_vals, p_vals, x_vals -# if __name__ == '__main__': -# # Define the parameters -# phi_left = 5.0 -# phi_right = 0.0 -# p_right = 0.0 -# y_A_R = 1/3 -# y_C_R = 1/3 -# z_A = -1.0 -# z_C = 1.0 -# K = 'incompressible' -# Lambda2 = 8.553e-6 -# a2 = 7.5412e-4 -# number_cells = 1024 -# relax_param = .1 -# rtol = 1e-4 -# max_iter = 500 +if __name__ == '__main__': # pragma: no cover # dont cover main in coverage + # Define the parameters + phi_left = 5.0 + phi_right = 0.0 + p_right = 0.0 + y_A_R = 1/3 + y_C_R = 1/3 + z_A = -1.0 + z_C = 1.0 + K = 'incompressible' + Lambda2 = 8.553e-6 + a2 = 7.5412e-4 + number_cells = 1024 + relax_param = .1 + rtol = 1e-4 + max_iter = 500 -# # Solve the system -# y_A, y_C, phi, p, x = solve_System_2eq(phi_left, phi_right, p_right, z_A, z_C, y_A_R, y_C_R, K, Lambda2, a2, number_cells, relax_param=relax_param, x0=0, x1=1, refinement_style='uniform', return_type='Vector', max_iter=max_iter, rtol=rtol) + # Solve the system + y_A, y_C, phi, p, x = solve_System_2eq(phi_left, phi_right, p_right, z_A, z_C, y_A_R, y_C_R, K, Lambda2, a2, number_cells, relax_param=relax_param, x0=0, x1=1, refinement_style='uniform', return_type='Vector', max_iter=max_iter, rtol=rtol) -# # Plot the solution -# plt.plot(x, phi) -# plt.xlim(0,0.05) -# plt.grid() -# plt.xlabel('x [-]') -# plt.ylabel('$\\varphi$ [-]') -# plt.show() + # Plot the solution + plt.plot(x, phi) + plt.xlim(0,0.05) + plt.grid() + plt.xlabel('x [-]') + plt.ylabel('$\\varphi$ [-]') + plt.show() -# plt.plot(x, y_A, '--', color='tab:blue', label='$y_A$') -# plt.plot(x, y_C, '-', color='tab:blue', label='$y_C$') -# plt.plot(x, 1 - y_A - y_C, ':', color='tab:blue', label='$y_S$') -# plt.xlim(0,0.05) -# plt.legend() -# plt.grid() -# plt.xlabel('x [-]') -# plt.ylabel('$y_\\alpha$ [-]') -# plt.show() + plt.plot(x, y_A, '--', color='tab:blue', label='$y_A$') + plt.plot(x, y_C, '-', color='tab:blue', label='$y_C$') + plt.plot(x, 1 - y_A - y_C, ':', color='tab:blue', label='$y_S$') + plt.xlim(0,0.05) + plt.legend() + plt.grid() + plt.xlabel('x [-]') + plt.ylabel('$y_\\alpha$ [-]') + plt.show() -# plt.plot(x, p) -# plt.xlim(0,0.05) -# plt.grid() -# plt.xlabel('x [-]') -# plt.ylabel('$p$ [-]') -# plt.show() + plt.plot(x, p) + plt.xlim(0,0.05) + plt.grid() + plt.xlabel('x [-]') + plt.ylabel('$p$ [-]') + plt.show()