mwtkrayer
/
ucftools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

early matlab support: addParameter to addParamValue

This commit is contained in:
Michael Stumpf 2018-12-03 15:32:13 +01:00
parent 69d877d498
commit 4bd60a6929
21 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matlab/@ini/ini.m
View File

@ -27,7 +27,7 @@ classdef ini < handle
% Input
% ? verbosity verbose output? (default: no)
par = inputParser;
addOptional(par,'verbosity',0,@isnumeric);
addParamValue(par,'verbosity',0,@isnumeric);
parse(par,varargin{:});
obj.resetPublicProperties();
obj.resetPrivateProperties();

12
matlab/@ucf/ucf.m
View File

@ -86,8 +86,8 @@ classdef ucf < handle
% ? verbosity verbose output? (default: false)
% ? debug debug output? (default: false)
par = inputParser;
addParameter(par,'verbosity',0,@isnumeric);
addParameter(par,'debug',0,@isnumeric);
addParamValue(par,'verbosity',0,@isnumeric);
addParamValue(par,'debug',0,@isnumeric);
parse(par,varargin{:});
obj.resetPublicProperties();
obj.resetPrivateProperties();
@ -212,9 +212,9 @@ classdef ucf < handle
% ? rank proc rank (default: [0,0,0,0])
% ? endian endianess {'n' (dafault),'a','l','s','b'}
par = inputParser;
addParameter(par,'type','field',@ischar);
addParameter(par,'rank',[0,0,0,0],@(x)(isnumeric(x)&&numel(x)==4));
addParameter(par,'endian','n',@ischar);
addParamValue(par,'type','field',@ischar);
addParamValue(par,'rank',[0,0,0,0],@(x)(isnumeric(x)&&numel(x)==4));
addParamValue(par,'endian','n',@ischar);
parse(par,varargin{:});
%
obj.File = file; % add filename as object property
@ -529,7 +529,7 @@ classdef ucf < handle
% Input
% ? istep step index (default: -1, all steps)
par = inputParser;
addParameter(par,'istep',-1,@isnumeric);
addParamValue(par,'istep',-1,@isnumeric);
parse(par,varargin{:});
if par.Results.istep==-1
stime = obj.timeStep;

12
matlab/read_field_chunk_ucf.m
View File

@ -20,12 +20,12 @@ function [data,ib,jb,kb,nxl,nyl,nzl,ighost] = read_field_chunk_ucf(file,field,va
% Parse optional input arguments
par = inputParser;
addParameter(par,'step',1,@isnumeric);
addParameter(par,'ghost',1,@isnumeric);
addParameter(par,'verbosity',0,@isnumeric);
addParameter(par,'debug',0,@isnumeric);
addParameter(par,'tarmode',0,@isnumeric);
addParameter(par,'rank',0,@isnumeric);
addParamValue(par,'step',1,@isnumeric);
addParamValue(par,'ghost',1,@isnumeric);
addParamValue(par,'verbosity',0,@isnumeric);
addParamValue(par,'debug',0,@isnumeric);
addParamValue(par,'tarmode',0,@isnumeric);
addParamValue(par,'rank',0,@isnumeric);
parse(par,varargin{:});
istep = par.Results.step;
keepghost = par.Results.ghost;

8
matlab/read_field_complete_ucf.m
View File

@ -15,10 +15,10 @@ function [q] = read_field_complete_ucf(file,field,varargin)
% Parse optional input arguments
par = inputParser;
addParameter(par,'timestep',1,@isnumeric);
addParameter(par,'verbosity',0,@isnumeric);
addParameter(par,'debug',0,@isnumeric);
addParameter(par,'tarmode',0,@isnumeric);
addParamValue(par,'timestep',1,@isnumeric);
addParamValue(par,'verbosity',0,@isnumeric);
addParamValue(par,'debug',0,@isnumeric);
addParamValue(par,'tarmode',0,@isnumeric);
parse(par,varargin{:});
istep = par.Results.timestep;

6
matlab/read_grid_ucf.m
View File

@ -14,9 +14,9 @@ function [xu,yu,zu,xv,yv,zv,xw,yw,zw,xp,yp,zp] = read_grid_ucf(file,varargin)
% Parse optional input arguments
par = inputParser;
addParameter(par,'verbosity',0,@isnumeric);
addParameter(par,'debug',0,@isnumeric);
addParameter(par,'tarmode',0,@isnumeric);
addParamValue(par,'verbosity',0,@isnumeric);
addParamValue(par,'debug',0,@isnumeric);
addParamValue(par,'tarmode',0,@isnumeric);
parse(par,varargin{:});
% Define sets to be read

4
matlab/read_parameters_ucf.m
View File

@ -11,8 +11,8 @@ function [params] = read_parameters_ucf(file,varargin)
% Parse optional input arguments
par = inputParser;
addParameter(par,'verbosity',0,@isnumeric);
addParameter(par,'tarmode',0,@isnumeric);
addParamValue(par,'verbosity',0,@isnumeric);
addParamValue(par,'tarmode',0,@isnumeric);
parse(par,varargin{:});
% Open file
obj = ini('verbosity',par.Results.verbosity);

6
matlab/read_particle_balancing_ucf.m
View File

@ -13,9 +13,9 @@ function [iproc,nmaster,nslave,stime] = read_particle_balancing_ucf(file,varargi
% Parse optional input arguments
par = inputParser;
addParameter(par,'timestep',1,@isnumeric);
addParameter(par,'verbosity',0,@isnumeric);
addParameter(par,'debug',0,@isnumeric);
addParamValue(par,'timestep',1,@isnumeric);
addParamValue(par,'verbosity',0,@isnumeric);
addParamValue(par,'debug',0,@isnumeric);
parse(par,varargin{:});
istep = par.Results.timestep;

10
matlab/read_particles_ucf.m
View File

@ -19,11 +19,11 @@ function [pp,col,stime] = read_particles_ucf(file,varargin)
% Parse optional input arguments
par = inputParser;
addParameter(par,'step',0,@isnumeric);
addParameter(par,'format','array',@ischar);
addParameter(par,'verbosity',0,@isnumeric);
addParameter(par,'debug',0,@isnumeric);
addParameter(par,'tarmode',0,@isnumeric);
addParamValue(par,'step',0,@isnumeric);
addParamValue(par,'format','array',@ischar);
addParamValue(par,'verbosity',0,@isnumeric);
addParamValue(par,'debug',0,@isnumeric);
addParamValue(par,'tarmode',0,@isnumeric);
parse(par,varargin{:});
istep = par.Results.step;
mlformat = par.Results.format;

6
matlab/read_procgrid_ucf.m
View File

@ -19,9 +19,9 @@ function [ibegu,iendu,jbegu,jendu,kbegu,kendu,...
% Parse optional input arguments
par = inputParser;
addParameter(par,'verbosity',0,@isnumeric);
addParameter(par,'debug',0,@isnumeric);
addParameter(par,'tarmode',0,@isnumeric);
addParamValue(par,'verbosity',0,@isnumeric);
addParamValue(par,'debug',0,@isnumeric);
addParamValue(par,'tarmode',0,@isnumeric);
parse(par,varargin{:});
% Define sets to be read

12
matlab/read_scal_chunk_ucf.m
View File

@ -17,12 +17,12 @@ function [s,ib,jb,kb,nxl,nyl,nzl,ighost] = read_scal_chunk_ucf(file,varargin)
% Parse optional input arguments
par = inputParser;
addParameter(par,'step',1,@isnumeric);
addParameter(par,'ghost',1,@isnumeric);
addParameter(par,'verbosity',0,@isnumeric);
addParameter(par,'debug',0,@isnumeric);
addParameter(par,'tarmode',0,@isnumeric);
addParameter(par,'rank',0,@isnumeric);
addParamValue(par,'step',1,@isnumeric);
addParamValue(par,'ghost',1,@isnumeric);
addParamValue(par,'verbosity',0,@isnumeric);
addParamValue(par,'debug',0,@isnumeric);
addParamValue(par,'tarmode',0,@isnumeric);
addParamValue(par,'rank',0,@isnumeric);
parse(par,varargin{:});
istep = par.Results.step;
keepghost = par.Results.ghost;

8
matlab/read_scal_complete_ucf.m
View File

@ -12,10 +12,10 @@ function [s] = read_scal_complete_ucf(file,varargin)
% Parse optional input arguments
par = inputParser;
addParameter(par,'step',1,@isnumeric);
addParameter(par,'verbosity',0,@isnumeric);
addParameter(par,'debug',0,@isnumeric);
addParameter(par,'tarmode',0,@isnumeric);
addParamValue(par,'step',1,@isnumeric);
addParamValue(par,'verbosity',0,@isnumeric);
addParamValue(par,'debug',0,@isnumeric);
addParamValue(par,'tarmode',0,@isnumeric);
parse(par,varargin{:});
istep = par.Results.step;

4
matlab/read_statistics_channel_scal_ucf.m
View File

@ -2,8 +2,8 @@ function [tbeg,tend,nstat,sm,ss,su,sv] = read_statistics_channel_scal_ucf(file,v
% Parse optional input arguments
par = inputParser;
addParameter(par,'verbosity',0,@isnumeric);
addParameter(par,'debug',0,@isnumeric);
addParamValue(par,'verbosity',0,@isnumeric);
addParamValue(par,'debug',0,@isnumeric);
parse(par,varargin{:});
% Define sets to be read

4
matlab/read_statistics_channel_ucf.m
View File

@ -2,8 +2,8 @@ function [tbeg,tend,nstat,um,uu,vv,ww,uv,uub,uvb,varargout] = read_statistics_ch
% Parse optional input arguments
par = inputParser;
addParameter(par,'verbosity',0,@isnumeric);
addParameter(par,'debug',0,@isnumeric);
addParamValue(par,'verbosity',0,@isnumeric);
addParamValue(par,'debug',0,@isnumeric);
parse(par,varargin{:});
% Define sets to be read

12
matlab/read_uvwp_chunk_ucf.m
View File

@ -23,12 +23,12 @@ function [u,ibu,jbu,kbu,nxul,nyul,nzul,...
% Parse optional input arguments
par = inputParser;
addParameter(par,'step',1,@isnumeric);
addParameter(par,'ghost',1,@isnumeric);
addParameter(par,'verbosity',0,@isnumeric);
addParameter(par,'debug',0,@isnumeric);
addParameter(par,'tarmode',0,@isnumeric);
addParameter(par,'rank',0,@isnumeric);
addParamValue(par,'step',1,@isnumeric);
addParamValue(par,'ghost',1,@isnumeric);
addParamValue(par,'verbosity',0,@isnumeric);
addParamValue(par,'debug',0,@isnumeric);
addParamValue(par,'tarmode',0,@isnumeric);
addParamValue(par,'rank',0,@isnumeric);
parse(par,varargin{:});
istep = par.Results.step;
keepghost = par.Results.ghost;

8
matlab/read_uvwp_complete_ucf.m
View File

@ -12,10 +12,10 @@ function [u,v,w,p] = read_uvwp_complete_ucf(file,varargin)
% Parse optional input arguments
par = inputParser;
addParameter(par,'step',1,@isnumeric);
addParameter(par,'verbosity',0,@isnumeric);
addParameter(par,'debug',0,@isnumeric);
addParameter(par,'tarmode',0,@isnumeric);
addParamValue(par,'step',1,@isnumeric);
addParamValue(par,'verbosity',0,@isnumeric);
addParamValue(par,'debug',0,@isnumeric);
addParamValue(par,'tarmode',0,@isnumeric);
parse(par,varargin{:});
istep = par.Results.timestep;

6
matlab/write_particles_ucf.m
View File

@ -12,9 +12,9 @@ function [] = write_particles_ucf(file,pp,col,time,varargin)
% Parse variable input
par = inputParser;
addParameter(par,'endian','n',@ischar);
addParameter(par,'verbosity',0,@isnumeric);
addParameter(par,'debug',0,@isnumeric);
addParamValue(par,'endian','n',@ischar);
addParamValue(par,'verbosity',0,@isnumeric);
addParamValue(par,'debug',0,@isnumeric);
parse(par,varargin{:});
ncol = size(pp,1);

8
matlab/write_scal_chunk_ucf.m
View File

@ -16,10 +16,10 @@ function [] = write_scal_chunk_ucf(file,s,ib,jb,kb,nx,ny,nz,time,ighost,varargin
% Parse variable input
par = inputParser;
addParameter(par,'rank',[0,0,0,0],@(x)isnumeric(x)&&numel(x)==4);
addParameter(par,'endian','n',@ischar);
addParameter(par,'verbosity',0,@isnumeric);
addParameter(par,'debug',0,@isnumeric);
addParamValue(par,'rank',[0,0,0,0],@(x)isnumeric(x)&&numel(x)==4);
addParamValue(par,'endian','n',@ischar);
addParamValue(par,'verbosity',0,@isnumeric);
addParamValue(par,'debug',0,@isnumeric);
parse(par,varargin{:});
% Determine number of scalar fields

6
matlab/write_scal_complete_ucf.m
View File

@ -14,9 +14,9 @@ function [] = write_scal_complete_ucf(file,s,ibegp,iendp,jbegp,jendp,kbegp,kendp
% Parse variable input
par = inputParser;
addParameter(par,'endian','n',@ischar);
addParameter(par,'verbosity',0,@isnumeric);
addParameter(par,'debug',0,@isnumeric);
addParamValue(par,'endian','n',@ischar);
addParamValue(par,'verbosity',0,@isnumeric);
addParamValue(par,'debug',0,@isnumeric);
parse(par,varargin{:});
% Parse filename

8
matlab/write_uvwp_chunk_ucf.m
View File

@ -26,10 +26,10 @@ function [] = write_uvwp_chunk_ucf(file,...
% Parse variable input
par = inputParser;
addParameter(par,'rank',[0,0,0,0],@(x)isnumeric(x)&&numel(x)==4);
addParameter(par,'endian','n',@ischar);
addParameter(par,'verbosity',0,@isnumeric);
addParameter(par,'debug',0,@isnumeric);
addParamValue(par,'rank',[0,0,0,0],@(x)isnumeric(x)&&numel(x)==4);
addParamValue(par,'endian','n',@ischar);
addParamValue(par,'verbosity',0,@isnumeric);
addParamValue(par,'debug',0,@isnumeric);
parse(par,varargin{:});
% Create file and write to it

6
matlab/write_uvwp_complete_ucf.m
View File

@ -24,9 +24,9 @@ function [] = write_uvwp_complete_ucf(file,...
% Parse variable input
par = inputParser;
addParameter(par,'endian','n',@ischar);
addParameter(par,'verbosity',0,@isnumeric);
addParameter(par,'debug',0,@isnumeric);
addParamValue(par,'endian','n',@ischar);
addParamValue(par,'verbosity',0,@isnumeric);
addParamValue(par,'debug',0,@isnumeric);
parse(par,varargin{:});
% Parse filename

8
matlab/write_uvwp_newmesh_ucf.m
View File

@ -33,10 +33,10 @@ function [] = write_uvwp_newmesh_ucf(file,...
% Parse variable input
par = inputParser;
addParameter(par,'method','cubic',@ischar);
addParameter(par,'endian','n',@ischar);
addParameter(par,'verbosity',0,@isnumeric);
addParameter(par,'debug',0,@isnumeric);
addParamValue(par,'method','cubic',@ischar);
addParamValue(par,'endian','n',@ischar);
addParamValue(par,'verbosity',0,@isnumeric);
addParamValue(par,'debug',0,@isnumeric);
parse(par,varargin{:});
% Parse filename