Skip to content

Commit

Permalink
Merge pull request #5 from PTsolvers/lr-tests
Browse files Browse the repository at this point in the history 
Update figures for GMD style.
  • Loading branch information
@luraess
luraess authored Dec 5, 2021
2 parents 0f93c73 + f31e72f commit e9f7b0d
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 21 deletions.
Binary file modified visu/fig_final.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified visu/fig_ini.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified visu/fig_parperf3D_all.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed visu/fig_perf23D_diff.png
View file
Binary file not shown.
Binary file modified visu/fig_perf23D_diff_2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified visu/fig_scale123D.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions visu/viz_final.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@
ylabel({'\bf{linear}';'diffusion'}, 'fontsize',FS)
set(gca, 'XTick', [])
set(gca,'fontname','Courier')
text(0.5,0.9,'a)','fontsize',FS+2,'fontname','Courier')
text(0.5,0.9,'(a)','fontsize',FS+2,'fontname','Courier')

sp4 = subplot(334);
plot(xc_1D, H0_1D, xc_1D, linstep_1D, 'linewidth',3), axis square, set(gca, 'fontsize',FS, 'linewidth',1.4)
ylabel({'\bf{linear step}';'diffusion'}, 'fontsize',FS)
set(gca, 'XTick', [])
set(gca,'fontname','Courier')
text(0.5,0.9,'d)','fontsize',FS+2,'fontname','Courier')
text(0.5,0.9,'(d)','fontsize',FS+2,'fontname','Courier')

sp7 = subplot(337);
plot(xc_1D, H0_1D, xc_1D, nonlin_1D, 'linewidth',3), axis square, set(gca, 'fontsize',FS, 'linewidth',1.4)
xlabel('\bf{lx}', 'fontsize',FS)
ylabel({'\bf{nonlinear}';'diffusion'}, 'fontsize',FS)
set(gca,'fontname','Courier')
text(0.5,0.9,'g)','fontsize',FS+2,'fontname','Courier')
text(0.5,0.9,'(g)','fontsize',FS+2,'fontname','Courier')

% 2D
sp2 = subplot(332); imagesc(xc_2D, yc_2D, lin_2D'), axis xy equal tight, set(gca, 'fontsize',FS, 'linewidth',1.3)
Expand All @@ -48,23 +48,23 @@
set(gca,'fontname','Courier')
ylabel('\bf{ly}', 'fontsize',FS)
caxis([0 1])
text(0.5,9,'b)','fontsize',FS+2,'fontname','Courier','Color','w')
text(0.5,9,'(b)','fontsize',FS+2,'fontname','Courier','Color','w')

sp5 = subplot(335); imagesc(xc_2D, yc_2D, linstep_2D'), axis xy equal tight, set(gca, 'fontsize',FS, 'linewidth',1.3)
set(gca, 'XTick', [])
set(gca, 'YTick', [0.1 9.9], 'YTicklabel', [0 10], 'fontsize',FS)
set(gca,'fontname','Courier')
ylabel('\bf{ly}', 'fontsize',FS)
caxis([0 1])
text(0.5,9,'e)','fontsize',FS+2,'fontname','Courier','Color','w')
text(0.5,9,'(e)','fontsize',FS+2,'fontname','Courier','Color','w')

sp8 = subplot(338); imagesc(xc_2D, yc_2D, nonlin_2D'), axis xy equal tight, set(gca, 'fontsize',FS, 'linewidth',1.3)
set(gca, 'XTick', [0.1 9.9], 'XTicklabel', [0 10], 'fontsize',FS)
set(gca, 'YTick', [0.1 9.9], 'YTicklabel', [0 10], 'fontsize',FS)
set(gca,'fontname','Courier')
xlabel('\bf{lx}', 'fontsize',FS), ylabel('\bf{ly}', 'fontsize',FS)
caxis([0 1])
text(0.5,9,'h)','fontsize',FS+2,'fontname','Courier','Color','w')
text(0.5,9,'(h)','fontsize',FS+2,'fontname','Courier','Color','w')

% 3D
tp = {lin_3D, linstep_3D, nonlin_3D};
Expand Down Expand Up @@ -117,11 +117,11 @@
text(340,180,-130,'\bf{H}','fontsize',FS+2,'fontname','Courier')
end
if ip==1
text(350,160,340,'c)','fontsize',FS+2,'fontname','Courier')
text(350,160,350,'(c)','fontsize',FS+2,'fontname','Courier')
elseif ip==2
text(350,160,340,'f)','fontsize',FS+2,'fontname','Courier')
text(350,160,350,'(f)','fontsize',FS+2,'fontname','Courier')
else
text(350,160,340,'i)','fontsize',FS+2,'fontname','Courier')
text(350,160,350,'(i)','fontsize',FS+2,'fontname','Courier')
end

set(gca,'fontname','Courier')
Expand Down Expand Up @@ -151,4 +151,4 @@

fig = gcf;
fig.PaperPositionMode = 'auto';
print('fig_final','-dpng','-r300')
% print('fig_final','-dpng','-r300')
6 changes: 3 additions & 3 deletions visu/viz_ini.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
xlabel('\bf{lx}', 'fontsize',FS)
ylabel('\bf{H_{initial}}', 'fontsize',FS)
set(gca,'fontname','Courier')
text(0.5,0.9,'a)','fontsize',FS+2,'fontname','Courier')
text(0.5,0.9,'(a)','fontsize',FS+2,'fontname','Courier')

sp2 = subplot(132); imagesc(xc_2D, yc_2D, H0_2D'), axis xy equal tight, set(gca, 'fontsize',FS, 'linewidth',1.3)
set(gca, 'XTick', [0.1 9.9], 'XTicklabel', [0 10], 'fontsize',FS)
set(gca, 'YTick', [0.1 9.9], 'YTicklabel', [0 10], 'fontsize',FS)
set(gca,'fontname','Courier')
xlabel('\bf{lx}', 'fontsize',FS)
ylabel('\bf{ly}', 'fontsize',FS)
text(0.5,9,'b)','fontsize',FS+2,'fontname','Courier','Color','w')
text(0.5,9,'(b)','fontsize',FS+2,'fontname','Courier','Color','w')

sp3 = subplot(133);
nx = size(H0_3D,1); ny = size(H0_3D,2); nz = size(H0_3D,3);
Expand Down Expand Up @@ -76,7 +76,7 @@
text(150,315,0,'\bf{ly}','fontsize',FS,'fontname','Courier') %xlabel('lx','fontsize',FS)
text(350,160,0,'\bf{lx}','fontsize',FS,'fontname','Courier') %ylabel('ly','fontsize',FS)
zlabel('\bf{lz}','fontsize',FS)
text(350,160,340,'c)','fontsize',FS+2,'fontname','Courier')
text(350,160,350,'(c)','fontsize',FS+2,'fontname','Courier')

cb = colorbar;
cb.Location = 'southoutside';
Expand Down
10 changes: 5 additions & 5 deletions visu/viz_perf.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
mylimx = [0.8 3.e3];
ylab2 = 0.963;

fig1 = 0;
fig1 = 1;
fig2 = 1;

%%
Expand All @@ -80,7 +80,7 @@
xtickangle(45)
set(gca,'fontname','Courier')
xlabel('\bf{nx}', 'fontsize',FS)
text(40,ylab,'a)','fontsize',FS+2,'fontname','Courier')
text(35,ylab,'(a)','fontsize',FS+2,'fontname','Courier')


sp2 = subplot(122);
Expand All @@ -98,7 +98,7 @@
xtickangle(45)
set(gca,'fontname','Courier')
xlabel('\bf{nx}', 'fontsize',FS)
text(37,ylab,'b)','fontsize',FS+2,'fontname','Courier')
text(33,ylab,'(b)','fontsize',FS+2,'fontname','Courier')

pos1 = get(sp1,'position'); set(sp1,'position',[pos1(1)*0.97 pos1(2)*1.15 pos1(3)*1 pos1(4)*1])
pos2 = get(sp2,'position'); set(sp2,'position',[pos2(1)*0.97 pos2(2)*1.15 pos2(3)*1 pos2(4)*1])
Expand All @@ -124,7 +124,7 @@
xtickangle(45)
set(gca,'fontname','Courier')
xlabel('\bf{P (GPUs)}', 'fontsize',FS)
text(1.3,ylab2,'a)','fontsize',FS+2,'fontname','Courier')
text(1.1,ylab2,'(a)','fontsize',FS+2,'fontname','Courier')

sp2 = subplot(122);
% stokes_3D_mxpu_octo_2(1,:),stokes_3D_mxpu_octo_2(end,:)./stokes_3D_mxpu_octo_2(end,1), '-o', ...
Expand All @@ -140,7 +140,7 @@
xtickangle(45)
set(gca,'fontname','Courier')
xlabel('\bf{P (GPUs)}', 'fontsize',FS)
text(1.3,ylab2,'b)','fontsize',FS+2,'fontname','Courier')
text(1.1,ylab2,'(b)','fontsize',FS+2,'fontname','Courier')

pos1 = get(sp1,'position'); set(sp1,'position',[pos1(1)*1.04 pos1(2)*1.2 pos1(3)*1 pos1(4)*1])
pos2 = get(sp2,'position'); set(sp2,'position',[pos2(1)*0.96 pos2(2)*1.2 pos2(3)*1 pos2(4)*1])
Expand Down
6 changes: 3 additions & 3 deletions visu/viz_scaling.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
xlabel('\bf{nx}', 'fontsize',FS)
title({'linear'; 'diffusion'})
set(gca,'fontname','Courier')
text(85,ylab,'a)','fontsize',FS+2,'fontname','Courier')
text(75,ylab,'(a)','fontsize',FS+2,'fontname','Courier')

sp2 = subplot(132);
st = 2;
Expand All @@ -52,7 +52,7 @@
xtickangle(45)
xlabel('\bf{nx}', 'fontsize',FS)
set(gca,'fontname','Courier')
text(85,ylab,'b)','fontsize',FS+2,'fontname','Courier')
text(75,ylab,'(b)','fontsize',FS+2,'fontname','Courier')

sp3 = subplot(133);
st = 2;
Expand All @@ -67,7 +67,7 @@
xtickangle(45)
xlabel('\bf{nx}', 'fontsize',FS)
set(gca,'fontname','Courier')
text(85,ylab,'c)','fontsize',FS+2,'fontname','Courier')
text(75,ylab,'(c)','fontsize',FS+2,'fontname','Courier')

pos1 = get(sp1,'position'); set(sp1,'position',[pos1(1)*0.9 pos1(2) pos1(3)*1.1 pos1(4)*1.1])
pos2 = get(sp2,'position'); set(sp2,'position',[pos2(1)*0.97 pos2(2) pos2(3)*1.1 pos2(4)*1.1])
Expand Down

0 comments on commit e9f7b0d

Please sign in to comment.