From 6fd6a830c09a9847692a47177b59d28b8230f89e Mon Sep 17 00:00:00 2001 From: "Michael Stumpf (ifhcluster)" Date: Fri, 29 Mar 2019 12:22:33 +0100 Subject: [PATCH] polished a little --- matlab/precompute_ghosts_uvwp_ucf.m | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/matlab/precompute_ghosts_uvwp_ucf.m b/matlab/precompute_ghosts_uvwp_ucf.m index 5115370..9f45dfd 100644 --- a/matlab/precompute_ghosts_uvwp_ucf.m +++ b/matlab/precompute_ghosts_uvwp_ucf.m @@ -30,21 +30,17 @@ function [] = precompute_ghosts_uvwp_ucf(hucf,dout,nghost,varargin) iseq = par.Results.iseq; % Read info from tar-archive - [xu,yu,zu,xv,yv,zv,xw,yw,zw,xp,yp,zp] = read_grid_ucf(hucf); [ibegu,iendu,jbegu,jendu,kbegu,kendu,... ibegv,iendv,jbegv,jendv,kbegv,kendv,... ibegw,iendw,jbegw,jendw,kbegw,kendw,... ibegp,iendp,jbegp,jendp,kbegp,kendp] = read_procgrid_ucf(hucf); [params] = read_parameters_ucf(hucf); + nxp = params.mesh.nxp; + nyp = params.mesh.nyp; + nzp = params.mesh.nzp; nxprocs = params.parallel.nxprocs; nyprocs = params.parallel.nyprocs; nzprocs = params.parallel.nzprocs; - a = params.geometry.a; - b = params.geometry.b; - c = params.geometry.c; - d = params.geometry.d; - e = params.geometry.e; - f = params.geometry.f; xperiodic = params.geometry.xperiodic; yperiodic = params.geometry.yperiodic; zperiodic = params.geometry.zperiodic; @@ -57,16 +53,16 @@ function [] = precompute_ghosts_uvwp_ucf(hucf,dout,nghost,varargin) % Estimate memory requirement (conservative simplification) if flag_verb - nxl_estm = floor(numel(xp)/nxprocs); - nyl_estm = floor(numel(yp)/nyprocs); - nzl_estm = floor(numel(zp)/nzprocs); + nxl_estm = floor(nxp/nxprocs); + nyl_estm = floor(nyp/nyprocs); + nzl_estm = floor(nzp/nzprocs); imem = 0; for ii=0:nghost-1 imem = imem + 4*8*(... 2*(nxl_estm-ii)*(nyl_estm-ii) + ... 2*(nyl_estm-ii)*(nzl_estm-ii) + ... - 2*(nxl_estm-ii)*(nzl_estm-ii) * ... - (nxprocs*nyprocs*nzprocs)); + 2*(nxl_estm-ii)*(nzl_estm-ii)) * ... + (nxprocs*nyprocs*nzprocs); end fprintf('Estimated memory requirement: %7.0f MiB\n',imem/(1024*1024)); end @@ -77,7 +73,7 @@ function [] = precompute_ghosts_uvwp_ucf(hucf,dout,nghost,varargin) for izproc=0:nzprocs-1 ichunk = ixproc*nyprocs*nzprocs+iyproc*nzprocs+izproc; if flag_verb - fprintf('Processing original chunk %5d\n',ichunk); + fprintf('Reading original chunk %5d\n',ichunk); end [u,ibu,jbu,kbu,nxul,nyul,nzul,... v,ibv,jbv,kbv,nxvl,nyvl,nzvl,...