Merge branch 'lr/revision' of https://github.com/PTsolvers/PseudoTransientStokes.jl into lr/revision

Author: luraess

scripts/stokes_3D/Stokes3D_ve_multixpu.jl

@@ -264,11 +264,11 @@ end
     if (me==0) @printf("Total iters = %d (%d steps), time = %1.3e sec (@ T_eff = %1.2f GB/s) \n", ittot, nt, wtime, round(T_eff, sigdigits=2)) end
     # Visualisation
     if do_viz || do_save_viz
-        Pt_inn .= inn(Pt);   gather!(Pt_inn, Pt_v)
-        Vz_inn .= av_zi(Vz); gather!(Vz_inn, Vz_v)
-        Rz_inn .= av_za(Rz); gather!(Rz_inn, Rz_v)
-        Mus_inn.= inn(Mus);  gather!(Mus_inn, Mus_v)
-        τxz_inn.= av_xza(τxz); gather!(τxz_inn, τxz_v)
+        Pt_inn .= Array(inn(Pt));   gather!(Pt_inn, Pt_v)
+        Vz_inn .= Array(av_zi(Vz)); gather!(Vz_inn, Vz_v)
+        Rz_inn .= Array(av_za(Rz)); gather!(Rz_inn, Rz_v)
+        Mus_inn.= Array(inn(Mus));  gather!(Mus_inn, Mus_v)
+        τxz_inn.= Array(av_xza(τxz)); gather!(τxz_inn, τxz_v)
         if me==0 && do_viz
             p1 = heatmap(Xi_g, Zi_g, Pt_v[:,y_sl,:]', aspect_ratio=1, xlims=(Xi_g[1],Xi_g[end]), zlims=(Zi_g[1],Zi_g[end]), c=:viridis, title="Pressure")
             p2 = heatmap(Xi_g, Zi_g, Vz_v[:,y_sl,:]', aspect_ratio=1, xlims=(Xi_g[1],Xi_g[end]), zlims=(Zi_g[1],Zi_g[end]), c=:viridis, title="Vz")

scripts/stokes_3D/Stokes3D_ve_multixpu_perf.jl

@@ -264,11 +264,11 @@ end
     if (me==0) @printf("Total iters = %d (%d steps), time = %1.3e sec (@ T_eff = %1.2f GB/s) \n", ittot, nt, wtime, round(T_eff, sigdigits=3)) end
     # Visualisation
     if do_viz || do_save_viz
-        Pt_inn .= inn(Pt);   gather!(Pt_inn, Pt_v)
-        Vz_inn .= av_zi(Vz); gather!(Vz_inn, Vz_v)
-        Rz_inn .= av_za(Rz); gather!(Rz_inn, Rz_v)
-        Mus_inn.= inn(Mus);  gather!(Mus_inn, Mus_v)
-        τxz_inn.= av_xza(τxz); gather!(τxz_inn, τxz_v)
+        Pt_inn .= Array(inn(Pt));   gather!(Pt_inn, Pt_v)
+        Vz_inn .= Array(av_zi(Vz)); gather!(Vz_inn, Vz_v)
+        Rz_inn .= Array(av_za(Rz)); gather!(Rz_inn, Rz_v)
+        Mus_inn.= Array(inn(Mus));  gather!(Mus_inn, Mus_v)
+        τxz_inn.= Array(av_xza(τxz)); gather!(τxz_inn, τxz_v)
         if me==0 && do_viz
             p1 = heatmap(Xi_g, Zi_g, Pt_v[:,y_sl,:]', aspect_ratio=1, xlims=(Xi_g[1],Xi_g[end]), zlims=(Zi_g[1],Zi_g[end]), c=:viridis, title="Pressure")
             p2 = heatmap(Xi_g, Zi_g, Vz_v[:,y_sl,:]', aspect_ratio=1, xlims=(Xi_g[1],Xi_g[end]), zlims=(Zi_g[1],Zi_g[end]), c=:viridis, title="Vz")

scripts/stokes_3D/previous_damp/Stokes3D0_multixpu.jl

@@ -225,9 +225,9 @@ end
     if (me==0) @printf("Total steps = %d, err = %1.3e, time = %1.3e sec (@ T_eff = %1.2f GB/s) \n", iter, err, wtime, round(T_eff, sigdigits=2)) end
     # Visualisation
     if do_viz
-        Pt_inn .= inn(Pt);   gather!(Pt_inn, Pt_v)
-        Vz_inn .= av_zi(Vz); gather!(Vz_inn, Vz_v)
-        Rz_inn .= av_za(Rz); gather!(Rz_inn, Rz_v)
+        Pt_inn .= Array(inn(Pt));   gather!(Pt_inn, Pt_v)
+        Vz_inn .= Array(av_zi(Vz)); gather!(Vz_inn, Vz_v)
+        Rz_inn .= Array(av_za(Rz)); gather!(Rz_inn, Rz_v)
         if (me==0)
             p1 = heatmap(Xi_g, Zi_g, Pt_v[:,y_sl,:]', aspect_ratio=1, xlims=(Xi_g[1],Xi_g[end]), zlims=(Zi_g[1],Zi_g[end]), c=:viridis, title="Pressure")
             p2 = heatmap(Xi_g, Zi_g, Vz_v[:,y_sl,:]', aspect_ratio=1, xlims=(Xi_g[1],Xi_g[end]), zlims=(Zi_g[1],Zi_g[end]), c=:viridis, title="Vz")

visu/fig_stokes_systematics_aspect_ratio.png

@@ -0,0 +1,38 @@
+clear;load('roma.mat')
+%setup
+fs = 10;                           % font size
+% figure parameters
+nt       = 5;
+sims     = {'aspect_ratio'};
+fact     = [0.6, 0.5, 0.4, 0.3, 0.2, 0.1];
+subs     = [1 2 4 8];                       % number of grid subdivisions
+resol    = [127, 255, 511, 1023, 2047];
+% vis
+for ifig = 1:numel(sims)
+    figure(ifig);clf
+    set(gcf,'Units','centimeters','Position',[(5+13*(ifig-1)) 2 8 18],'PaperUnits','centimeters','PaperPosition',[0 0 8 18]);
+    data   = readmatrix(sprintf('../output/out_Stokes2D_ve_%s_param.txt',sims{ifig}));
+%     data   = data(:,2:end);
+    sz     = [numel(fact),numel(subs),numel(resol)];
+    nx     = reshape(data(:,1),sz);
+    ny     = reshape(data(:,2),sz);
+    nsub   = reshape(data(:,3),sz);
+    nfact  = reshape(data(:,4),sz);
+    iters  = reshape(data(:,5),sz);
+    error  = reshape(data(:,7),sz);
+    tiledlayout(numel(resol),1,'TileSpacing','compact','Padding','normal')
+    for iSub = 1:numel(resol)
+        nexttile
+        plot(min(iters(:,:,iSub))./nt./min(nx(:,:,iSub)),'-o','LineWidth',1.6,'MarkerSize',3)
+        xlim([0.9 4.1]); ylim([6 20]);
+        yticks([8 12 16]); yticklabels([8 12 16])
+        if iSub == numel(resol);xticks(1:4);xticklabels(subs);xlabel('\bfaspect ratio (lx/ly)');else; xticklabels([]); end
+        text(0.02,0.88,['\bf(' char('a'+iSub-1) ')'],'Units','normalized','FontName','Courier')
+        text(0.63,0.88,['\bfny = ' num2str(resol(iSub))],'Units','normalized','FontName','Courier')
+        set(gca,'FontName','Courier','FontSize',fs,'YDir','normal','XAxisLocation','bottom','LineWidth',0.8)
+        if iSub == 3; ylabel('\bfiter_{tot}/nt/nx'); end
+        drawnow
+    end
+    % save figure
+    print('-dpng',sprintf('fig_stokes_systematics_%s.png',sims{ifig}),'-r300')
+end