Mercurial > repos > public > sbplib

changeset 1133:92dc0a3b5d5d feature/laplace_curvilinear_test

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Generalize multiblock.evalOn() to work for a mix of function handles and grid functions
author Martin Almquist <malmquist@stanford.edu>
date Mon, 27 May 2019 16:52:28 -0700
parents 375f73edbbd4
children 7259b3f3e227
files +multiblock/evalOn.m
diffstat 1 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/+multiblock/evalOn.m	Mon May 27 16:34:38 2019 -0700
+++ b/+multiblock/evalOn.m	Mon May 27 16:52:28 2019 -0700
@@ -15,11 +15,19 @@
 
     if isempty(t)
         for i = 1:nBlocks
-            gf{i} = grid.evalOn(grids{i}, f{i});
+            if isa(f{i}, 'function_handle')
+                gf{i} = grid.evalOn(grids{i}, f{i});
+            else
+                gf{i} = f{i};
+            end
         end
     else
         for i = 1:nBlocks
-            gf{i} = grid.evalOn(grids{i}, @(varargin)f{i}(t,varargin{:}));
+            if isa(f{i}, 'function_handle')
+                gf{i} = grid.evalOn(grids{i}, @(varargin)f{i}(t,varargin{:}));
+            else
+                gf{i} = f{i};
+            end
         end
     end