Mercurial > repos > public > sbplib

changeset 392:30ff8879162e feature/beams

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Better input parsing for multiblock DiffOp.
author Jonatan Werpers <jonatan@werpers.com>
date Thu, 12 Jan 2017 17:17:58 +0100
parents 1afd33f719df
children 67ca8964f03c
files +multiblock/DiffOp.m
diffstat 1 files changed, 15 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/+multiblock/DiffOp.m	Thu Jan 12 15:51:24 2017 +0100
+++ b/+multiblock/DiffOp.m	Thu Jan 12 17:17:58 2017 +0100
@@ -94,11 +94,23 @@
 
                 if isempty(doParam)
                     getParam = @(i){};
-                elseif iscell(doParam) && length(doParam) == grid.nBlocks()
+                    return
+                end
+
+                if ~iscell(doParam)
+                    getParam = @(i)doParam;
+                    return
+                end
+
+                % doParam is a non-empty cell-array
+
+                if length(doParam) == grid.nBlocks() && all(cellfun(@iscell, doParam))
+                    % doParam is a cell-array of cell-arrays
                     getParam = @(i)doParam{i};
-                else
-                    getParam = @(i)doParam;
+                    return
                 end
+
+                getParam = @(i)doParam;
             end
         end