From 4bd60a692991e2b78fa5b1b6d4b3459680e86584 Mon Sep 17 00:00:00 2001 From: Michael Stumpf Date: Mon, 3 Dec 2018 15:32:13 +0100 Subject: [PATCH] early matlab support: addParameter to addParamValue --- matlab/@ini/ini.m | 2 +- matlab/@ucf/ucf.m | 12 ++++++------ matlab/read_field_chunk_ucf.m | 12 ++++++------ matlab/read_field_complete_ucf.m | 8 ++++---- matlab/read_grid_ucf.m | 6 +++--- matlab/read_parameters_ucf.m | 4 ++-- matlab/read_particle_balancing_ucf.m | 6 +++--- matlab/read_particles_ucf.m | 10 +++++----- matlab/read_procgrid_ucf.m | 6 +++--- matlab/read_scal_chunk_ucf.m | 12 ++++++------ matlab/read_scal_complete_ucf.m | 8 ++++---- matlab/read_statistics_channel_scal_ucf.m | 4 ++-- matlab/read_statistics_channel_ucf.m | 4 ++-- matlab/read_uvwp_chunk_ucf.m | 12 ++++++------ matlab/read_uvwp_complete_ucf.m | 8 ++++---- matlab/write_particles_ucf.m | 6 +++--- matlab/write_scal_chunk_ucf.m | 8 ++++---- matlab/write_scal_complete_ucf.m | 6 +++--- matlab/write_uvwp_chunk_ucf.m | 8 ++++---- matlab/write_uvwp_complete_ucf.m | 6 +++--- matlab/write_uvwp_newmesh_ucf.m | 8 ++++---- 21 files changed, 78 insertions(+), 78 deletions(-) diff --git a/matlab/@ini/ini.m b/matlab/@ini/ini.m index 1ba013b..906aa77 100644 --- a/matlab/@ini/ini.m +++ b/matlab/@ini/ini.m @@ -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(); diff --git a/matlab/@ucf/ucf.m b/matlab/@ucf/ucf.m index b31c9cf..1958113 100644 --- a/matlab/@ucf/ucf.m +++ b/matlab/@ucf/ucf.m @@ -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; diff --git a/matlab/read_field_chunk_ucf.m b/matlab/read_field_chunk_ucf.m index 4b70d39..00dc264 100644 --- a/matlab/read_field_chunk_ucf.m +++ b/matlab/read_field_chunk_ucf.m @@ -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; diff --git a/matlab/read_field_complete_ucf.m b/matlab/read_field_complete_ucf.m index 892c571..7019a62 100644 --- a/matlab/read_field_complete_ucf.m +++ b/matlab/read_field_complete_ucf.m @@ -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; diff --git a/matlab/read_grid_ucf.m b/matlab/read_grid_ucf.m index 3385fcb..442f6bc 100644 --- a/matlab/read_grid_ucf.m +++ b/matlab/read_grid_ucf.m @@ -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 diff --git a/matlab/read_parameters_ucf.m b/matlab/read_parameters_ucf.m index 93192b7..514f720 100644 --- a/matlab/read_parameters_ucf.m +++ b/matlab/read_parameters_ucf.m @@ -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); diff --git a/matlab/read_particle_balancing_ucf.m b/matlab/read_particle_balancing_ucf.m index bda3f6c..20786a9 100644 --- a/matlab/read_particle_balancing_ucf.m +++ b/matlab/read_particle_balancing_ucf.m @@ -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; diff --git a/matlab/read_particles_ucf.m b/matlab/read_particles_ucf.m index be92a15..24acc41 100644 --- a/matlab/read_particles_ucf.m +++ b/matlab/read_particles_ucf.m @@ -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; diff --git a/matlab/read_procgrid_ucf.m b/matlab/read_procgrid_ucf.m index f1bea70..b7467c8 100644 --- a/matlab/read_procgrid_ucf.m +++ b/matlab/read_procgrid_ucf.m @@ -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 diff --git a/matlab/read_scal_chunk_ucf.m b/matlab/read_scal_chunk_ucf.m index 03d5fb4..d3320bd 100644 --- a/matlab/read_scal_chunk_ucf.m +++ b/matlab/read_scal_chunk_ucf.m @@ -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; diff --git a/matlab/read_scal_complete_ucf.m b/matlab/read_scal_complete_ucf.m index 0021635..6fa44c7 100644 --- a/matlab/read_scal_complete_ucf.m +++ b/matlab/read_scal_complete_ucf.m @@ -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; diff --git a/matlab/read_statistics_channel_scal_ucf.m b/matlab/read_statistics_channel_scal_ucf.m index acef424..4e7860a 100644 --- a/matlab/read_statistics_channel_scal_ucf.m +++ b/matlab/read_statistics_channel_scal_ucf.m @@ -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 diff --git a/matlab/read_statistics_channel_ucf.m b/matlab/read_statistics_channel_ucf.m index 68f9a75..9b31864 100644 --- a/matlab/read_statistics_channel_ucf.m +++ b/matlab/read_statistics_channel_ucf.m @@ -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 diff --git a/matlab/read_uvwp_chunk_ucf.m b/matlab/read_uvwp_chunk_ucf.m index b4be245..f9a3370 100644 --- a/matlab/read_uvwp_chunk_ucf.m +++ b/matlab/read_uvwp_chunk_ucf.m @@ -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; diff --git a/matlab/read_uvwp_complete_ucf.m b/matlab/read_uvwp_complete_ucf.m index 6faa95c..970119d 100644 --- a/matlab/read_uvwp_complete_ucf.m +++ b/matlab/read_uvwp_complete_ucf.m @@ -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; diff --git a/matlab/write_particles_ucf.m b/matlab/write_particles_ucf.m index 758ce01..f7c5596 100644 --- a/matlab/write_particles_ucf.m +++ b/matlab/write_particles_ucf.m @@ -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); diff --git a/matlab/write_scal_chunk_ucf.m b/matlab/write_scal_chunk_ucf.m index b1fcf65..e034b79 100644 --- a/matlab/write_scal_chunk_ucf.m +++ b/matlab/write_scal_chunk_ucf.m @@ -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 diff --git a/matlab/write_scal_complete_ucf.m b/matlab/write_scal_complete_ucf.m index b98d18d..90fdf41 100644 --- a/matlab/write_scal_complete_ucf.m +++ b/matlab/write_scal_complete_ucf.m @@ -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 diff --git a/matlab/write_uvwp_chunk_ucf.m b/matlab/write_uvwp_chunk_ucf.m index 89bfec9..c60e589 100644 --- a/matlab/write_uvwp_chunk_ucf.m +++ b/matlab/write_uvwp_chunk_ucf.m @@ -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 diff --git a/matlab/write_uvwp_complete_ucf.m b/matlab/write_uvwp_complete_ucf.m index 3e13967..0a6a9e1 100644 --- a/matlab/write_uvwp_complete_ucf.m +++ b/matlab/write_uvwp_complete_ucf.m @@ -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 diff --git a/matlab/write_uvwp_newmesh_ucf.m b/matlab/write_uvwp_newmesh_ucf.m index 9fbb634..543ab19 100644 --- a/matlab/write_uvwp_newmesh_ucf.m +++ b/matlab/write_uvwp_newmesh_ucf.m @@ -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