diff --git a/geiger/results/mortardfm/mortardfm_geiger_conductive_x_eq_0.5.csv b/geiger/results/mortardfm/mortardfm_geiger_conductive_x_eq_0.5.csv index 62b6d566e1abf0b3e597e5bad9b6f984256e547f..b6549f1ed1cb351eb4041a2360e03c62ff13bcd9 100644 --- a/geiger/results/mortardfm/mortardfm_geiger_conductive_x_eq_0.5.csv +++ b/geiger/results/mortardfm/mortardfm_geiger_conductive_x_eq_0.5.csv @@ -1,35 +1,35 @@ -Pressure,"vtkValidPointMask","arc_length","Points:0","Points:1","Points:2" -1.184346 1.0000 0.5000 0.0000 0.0000 -1.184346 1.0000 0.5000 0.0714 0.0000 -1.183238 1.0000 0.5000 0.0714 0.0000 -1.183238 1.0000 0.5000 0.1429 0.0000 -1.181073 1.0000 0.5000 0.1429 0.0000 -1.181073 1.0000 0.5000 0.2143 0.0000 -1.177913 1.0000 0.5000 0.2143 0.0000 -1.177913 1.0000 0.5000 0.2857 0.0000 -1.173843 1.0000 0.5000 0.2857 0.0000 -1.173843 1.0000 0.5000 0.3571 0.0000 -1.169035 1.0000 0.5000 0.3571 0.0000 -1.169035 1.0000 0.5000 0.4286 0.0000 -1.163601 1.0000 0.5000 0.4286 0.0000 -1.163601 1.0000 0.5000 0.5000 0.0000 -1.157237 1.0000 0.5000 0.5000 0.0000 -1.157237 1.0000 0.5000 0.5417 0.0000 -1.150205 1.0000 0.5000 0.5417 0.0000 -1.150205 1.0000 0.5000 0.5833 0.0000 -1.142747 1.0000 0.5000 0.5833 0.0000 -1.142747 1.0000 0.5000 0.6250 0.0000 -1.138346 1.0000 0.5000 0.6250 0.0000 -1.138346 1.0000 0.5000 0.6667 0.0000 -1.136937 1.0000 0.5000 0.6667 0.0000 -1.136937 1.0000 0.5000 0.7083 0.0000 -1.134720 1.0000 0.5000 0.7083 0.0000 -1.134720 1.0000 0.5000 0.7500 0.0000 -1.136277 1.0000 0.5000 0.7500 0.0000 -1.136277 1.0000 0.5000 0.8125 0.0000 -1.140905 1.0000 0.5000 0.8125 0.0000 -1.140905 1.0000 0.5000 0.8750 0.0000 -1.143926 1.0000 0.5000 0.8750 0.0000 -1.143926 1.0000 0.5000 0.9375 0.0000 -1.145416 1.0000 0.5000 0.9375 0.0000 -1.145416 1.0000 0.5000 1.0000 0.0000 +Pressure,"vtkValidPointMask","Points:0","Points:1","Points:2" +1.184346,1.0000,0.5000,0.0000,0.0000 +1.184346,1.0000,0.5000,0.0714,0.0000 +1.183238,1.0000,0.5000,0.0714,0.0000 +1.183238,1.0000,0.5000,0.1429,0.0000 +1.181073,1.0000,0.5000,0.1429,0.0000 +1.181073,1.0000,0.5000,0.2143,0.0000 +1.177913,1.0000,0.5000,0.2143,0.0000 +1.177913,1.0000,0.5000,0.2857,0.0000 +1.173843,1.0000,0.5000,0.2857,0.0000 +1.173843,1.0000,0.5000,0.3571,0.0000 +1.169035,1.0000,0.5000,0.3571,0.0000 +1.169035,1.0000,0.5000,0.4286,0.0000 +1.163601,1.0000,0.5000,0.4286,0.0000 +1.163601,1.0000,0.5000,0.5000,0.0000 +1.157237,1.0000,0.5000,0.5000,0.0000 +1.157237,1.0000,0.5000,0.5417,0.0000 +1.150205,1.0000,0.5000,0.5417,0.0000 +1.150205,1.0000,0.5000,0.5833,0.0000 +1.142747,1.0000,0.5000,0.5833,0.0000 +1.142747,1.0000,0.5000,0.6250,0.0000 +1.138346,1.0000,0.5000,0.6250,0.0000 +1.138346,1.0000,0.5000,0.6667,0.0000 +1.136937,1.0000,0.5000,0.6667,0.0000 +1.136937,1.0000,0.5000,0.7083,0.0000 +1.134720,1.0000,0.5000,0.7083,0.0000 +1.134720,1.0000,0.5000,0.7500,0.0000 +1.136277,1.0000,0.5000,0.7500,0.0000 +1.136277,1.0000,0.5000,0.8125,0.0000 +1.140905,1.0000,0.5000,0.8125,0.0000 +1.140905,1.0000,0.5000,0.8750,0.0000 +1.143926,1.0000,0.5000,0.8750,0.0000 +1.143926,1.0000,0.5000,0.9375,0.0000 +1.145416,1.0000,0.5000,0.9375,0.0000 +1.145416,1.0000,0.5000,1.0000,0.0000 diff --git a/geiger/results/plot_blocking_diag.m b/geiger/results/plot_blocking_diag.m index 641fb1ca4e1cf2fd0d065507b7c311512cb272af..274ac05db6ab177e5fbf862aed811c8bdac8a887 100644 --- a/geiger/results/plot_blocking_diag.m +++ b/geiger/results/plot_blocking_diag.m @@ -32,10 +32,8 @@ d_xfem_fine = csvread('dxfem/dxfem_geiger_blocking_0_0.1_to_0.9_1.csv', 1, 0); plot(d_xfem_fine(:, 3), d_xfem_fine(:, 1), 'Color', 'm', 'LineWidth', 1); % format the plot -xlabel('arc length [m]', 'FontSize', 12, 'FontWeight', 'bold', 'Color', 'k'); -ylabel('h [m]', 'FontSize', 12, 'FontWeight', 'bold', 'Color', 'k'); +xlabel('arc length', 'FontSize', 12, 'FontWeight', 'bold', 'Color', 'k'); +ylabel('pressure', 'FontSize', 12, 'FontWeight', 'bold', 'Color', 'k'); +xlim([0 1.2728]); set(gca, 'FontSize', 12); -legend('reference', 'Box-DFM', 'CC-DFM', 'EDFM', 'Mortar-DFM', 'P-XFEM', 'D-XFEM', 'location', 'northeastoutside'); - -%plot2svg('hydrocoin_paper.svg'); - +legend('reference', 'Box-DFM', 'CC-DFM', 'EDFM', 'mortar-DFM', 'P-XFEM', 'D-XFEM', 'location', 'northeastoutside'); diff --git a/geiger/results/plot_conductive_x.m b/geiger/results/plot_conductive_x.m new file mode 100644 index 0000000000000000000000000000000000000000..9ca9393b6e85cfdc523ac298b9dcea8ee5916c3a --- /dev/null +++ b/geiger/results/plot_conductive_x.m @@ -0,0 +1,39 @@ +close all; +clear all; +clc; +hold on; + +% equi-dimensional MFD +mfd = csvread('mfd/mfd_geiger_conductive_x_eq_0.5.csv', 1, 0); +plot(mfd(:, 6), mfd(:, 1), 'Color', 'k', 'LineWidth', 1); + +% Box-DFM +dfm = csvread('boxdfm/boxdfm_geiger_conductive_x_eq_0.5.csv', 1, 0); +plot(dfm(:, 14), dfm(:, 4), 'Color', 'g', 'LineWidth', 1); + +% CC-DFM +ccdfm = csvread('ccdfm/ccdfm_geiger_conductive_x_eq_0.5.csv', 1, 0); +plot(ccdfm(:, 4), ccdfm(:, 1), 'Color', 'c', 'LineWidth', 1); + +% EDFM +edfm = csvread('edfm/edfm_geiger_conductive_x_eq_0.5.csv', 1, 0); +plot(edfm(:, 5), edfm(:, 1), 'Color', 'r', 'LineWidth', 1); + +% Mortar-DFM +mortar = csvread('mortardfm/mortardfm_geiger_conductive_x_eq_0.5.csv', 1, 0); +plot(mortar(:, 4), mortar(:, 1), 'Color', [1 0.7 0], 'LineWidth', 1); + +% P-XFEM +p_xfem = csvread('pxfem/pxfem_geiger_conductive_x_eq_0.5.csv', 1, 0); +plot(p_xfem(:, 3), p_xfem(:, 1), 'Color', 'b', 'LineWidth', 1); + +% D-XFEM +d_xfem_fine = csvread('dxfem/dxfem_geiger_conductive_x_eq_0.5.csv', 1, 0); +[blabla,I]=sort(d_xfem_fine(:, 3)); +plot(d_xfem_fine(I, 3), d_xfem_fine(I, 1), 'Color', 'm', 'LineWidth', 1); + +% format the plot +xlabel('arc length', 'FontSize', 12, 'FontWeight', 'bold', 'Color', 'k'); +ylabel('pressure', 'FontSize', 12, 'FontWeight', 'bold', 'Color', 'k'); +set(gca, 'FontSize', 12); +legend('reference', 'Box-DFM', 'CC-DFM', 'EDFM', 'mortar-DFM', 'P-XFEM', 'D-XFEM'); diff --git a/geiger/results/plot_conductive_y.m b/geiger/results/plot_conductive_y.m new file mode 100644 index 0000000000000000000000000000000000000000..52df1def9ea966fc8269b8b929ce92434a19c78c --- /dev/null +++ b/geiger/results/plot_conductive_y.m @@ -0,0 +1,39 @@ +close all; +clear all; +clc; +hold on; + +% equi-dimensional MFD +mfd = csvread('mfd/mfd_geiger_conductive_y_eq_0.7.csv', 1, 0); +plot(mfd(:, 6), mfd(:, 1), 'Color', 'k', 'LineWidth', 1); + +% Box-DFM +dfm = csvread('boxdfm/boxdfm_geiger_conductive_y_eq_0.7.csv', 1, 0); +plot(dfm(:, 14), dfm(:, 4), 'Color', 'g', 'LineWidth', 1); + +% CC-DFM +ccdfm = csvread('ccdfm/ccdfm_geiger_conductive_y_eq_0.7.csv', 1, 0); +plot(ccdfm(:, 4), ccdfm(:, 1), 'Color', 'c', 'LineWidth', 1); + +% EDFM +edfm = csvread('edfm/edfm_geiger_conductive_y_eq_0.7.csv', 1, 0); +plot(edfm(:, 4), edfm(:, 1), 'Color', 'r', 'LineWidth', 1); + +% Mortar-DFM +mortar = csvread('mortardfm/mortardfm_geiger_conductive_y_eq_0.7.csv', 1, 0); +plot(mortar(:, 4), mortar(:, 1), 'Color', [1 0.7 0], 'LineWidth', 1); + +% P-XFEM +p_xfem = csvread('pxfem/pxfem_geiger_conductive_y_eq_0.7.csv', 1, 0); +plot(p_xfem(:, 3), p_xfem(:, 1), 'Color', 'b', 'LineWidth', 1); + +% D-XFEM +d_xfem_fine = csvread('dxfem/dxfem_geiger_conductive_y_eq_0.7.csv', 1, 0); +plot(d_xfem_fine(:, 3), d_xfem_fine(:, 1), 'Color', 'm', 'LineWidth', 1); + +% format the plot +ylim([1 1.51]); +xlabel('arc length', 'FontSize', 12, 'FontWeight', 'bold', 'Color', 'k'); +ylabel('pressure', 'FontSize', 12, 'FontWeight', 'bold', 'Color', 'k'); +set(gca, 'FontSize', 12); +legend('reference', 'Box-DFM', 'CC-DFM', 'EDFM', 'mortar-DFM', 'P-XFEM', 'D-XFEM'); diff --git a/hydrocoin/results/plot_depth_200.m b/hydrocoin/results/plot_depth_200.m index 28067e082369bfb621b483581c9d42b1488e3e6a..a4f3b700930fcf80c471fb0159b772a226ab62aa 100644 --- a/hydrocoin/results/plot_depth_200.m +++ b/hydrocoin/results/plot_depth_200.m @@ -39,10 +39,8 @@ d_xfem_fine(:, 3) = d_xfem_fine(:, 3)/1000.0; plot(d_xfem_fine(:, 3), d_xfem_fine(:, 1), 'Color', 'm', 'LineWidth', 1); % format the plot -xlabel('x [km]', 'FontSize', 12, 'FontWeight', 'bold', 'Color', 'k'); -ylabel('h [m]', 'FontSize', 12, 'FontWeight', 'bold', 'Color', 'k'); +xlabel('arc length [km]', 'FontSize', 12, 'FontWeight', 'bold', 'Color', 'k'); +ylabel('piezometric head [m]', 'FontSize', 12, 'FontWeight', 'bold', 'Color', 'k'); set(gca, 'FontSize', 12); xlim([0 1.6]); -legend('reference', 'Box-DFM', 'CC-DFM', 'EDFM', 'Mortar-DFM', 'P-XFEM', 'D-XFEM', 'location', 'northeastoutside'); - -%plot2svg('hydrocoin_paper.svg'); +legend('reference', 'Box-DFM', 'CC-DFM', 'EDFM', 'mortar-DFM', 'P-XFEM', 'D-XFEM', 'location', 'northeastoutside'); diff --git a/real/results/plot_depth_500.m b/real/results/plot_depth_500.m index f8a6ba1d63ac7f8de8a1ce7521c4555adb65aad6..823c7c0341c94f1520b2a0145b130771510484fa 100644 --- a/real/results/plot_depth_500.m +++ b/real/results/plot_depth_500.m @@ -20,7 +20,7 @@ mortar = csvread('mortardfm/mortardfm_real_y500.csv', 1, 0); plot(mortar(:, 4), mortar(:, 1), 'Linestyle', '-', 'Color', [1 0.7 0], 'LineWidth', 1); % format the plot -xlabel('x [m]', 'FontSize', 12, 'FontWeight', 'bold', 'Color', 'k'); -ylabel('h [m]', 'FontSize', 12, 'FontWeight', 'bold', 'Color', 'k'); +xlabel('arc length [m]', 'FontSize', 12, 'FontWeight', 'bold', 'Color', 'k'); +ylabel('pressure [Pa]', 'FontSize', 12, 'FontWeight', 'bold', 'Color', 'k'); set(gca, 'FontSize', 12); -legend('Box-DFM', 'CC-DFM', 'EDFM', 'Mortar-DFM' ); +legend('Box-DFM', 'CC-DFM', 'EDFM', 'mortar-DFM', 'Location', 'SouthWest'); diff --git a/real/results/plot_x625.m b/real/results/plot_x625.m index 5f969fb0d48857ea2f024f3f078fc053d9c848c7..f221b3d69b2acb0d6a5e147ec302d445eb417fb7 100644 --- a/real/results/plot_x625.m +++ b/real/results/plot_x625.m @@ -20,7 +20,7 @@ mortar = csvread('mortardfm/mortardfm_real_x625.csv', 1, 0); plot(mortar(:, 5), mortar(:, 1), 'Linestyle', '-', 'Color', [1 0.7 0], 'LineWidth', 1); % format the plot -xlabel('x [m]', 'FontSize', 12, 'FontWeight', 'bold', 'Color', 'k'); -ylabel('h [m]', 'FontSize', 12, 'FontWeight', 'bold', 'Color', 'k'); +xlabel('arc length [m]', 'FontSize', 12, 'FontWeight', 'bold', 'Color', 'k'); +ylabel('pressure [Pa]', 'FontSize', 12, 'FontWeight', 'bold', 'Color', 'k'); set(gca, 'FontSize', 12); -legend('Box-DFM', 'CC-DFM', 'EDFM', 'Mortar-DFM' ); +legend('Box-DFM', 'CC-DFM', 'EDFM', 'mortar-DFM', 'Location', 'SouthWest');