Mercurial > repos > public > sbplib

changeset 787:fef739088f20 bcSetupExperiment

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move more stuff into verifyFormat
author Jonatan Werpers <jonatan@werpers.com>
date Tue, 24 Jul 2018 16:27:36 -0700
parents 18ce4b1ab3e1
children b3ea4cccaf15
files +scheme/bcSetup.m
diffstat 1 files changed, 13 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
diff -r 18ce4b1ab3e1 -r fef739088f20 +scheme/bcSetup.m
--- a/+scheme/bcSetup.m	Tue Jul 24 16:12:39 2018 -0700
+++ b/+scheme/bcSetup.m	Tue Jul 24 16:27:36 2018 -0700
@@ -16,7 +16,7 @@
     assertType(bcs, 'cell');
     assert(S_sign == 1 || S_sign == -1, 'S_sign must be either 1 or -1');
 
-    verifyBcFormat(bcs);
+    verifyBcFormat(bcs, diffOp);
 
     % Setup storage arrays
     closure = spzeros(size(diffOp));
@@ -41,8 +41,6 @@
 
         if nargin(bcs{i}.data) == 1
             % Grid data
-            boundarySize = [size(diffOp.grid.getBoundary(bcs{i}.boundary),1),1];
-            assertSize(bcs{i}.data(0), boundarySize); % Eval for t = 0 and make sure the function returns a grid vector of the correct size.
             gridDataPenalties{end+1} = penalty;
             gridDataFunctions{end+1} = bcs{i}.data;
         elseif nargin(bcs{i}.data) == 1+dim
@@ -51,8 +49,6 @@
             symbolicDataPenalties{end+1} = penalty;
             symbolicDataFunctions{end+1} = bcs{i}.data;
             symbolicDataCoords{end+1} = num2cell(coord ,1);
-        else
-            error('sbplib:scheme:bcSetup:DataWrongNumberOfArguments', 'bcs{%d}.data has the wrong number of input arguments. Must be either only time or time and space.', i);
         end
     end
 
@@ -73,7 +69,7 @@
     S = @S_fun;
 end
 
-function verifyBcFormat(bcs)
+function verifyBcFormat(bcs, diffOp)
     for i = 1:length(bcs)
         assertType(bcs{i}, 'struct');
         assertStructFields(bcs{i}, {'type', 'boundary'});
@@ -85,5 +81,16 @@
         if ~isa(bcs{i}.data, 'function_handle')
             error('bcs{%d}.data should be a function of time or a function of time and space',i);
         end
+
+        b = diffOp.grid.getBoundary(bc.boundart);
+
+        dim = size(b,2);
+
+        if nargin(bc.data) == 1
+            % Grid data (only function of time)
+            assertSize(bc.data(0), 1, size(b));
+        elseif nargin(bc.data) ~= 1+dim
+           error('sbplib:scheme:bcSetup:DataWrongNumberOfArguments', 'bcs{%d}.data has the wrong number of input arguments. Must be either only time or time and space.', i);
+        end
     end
 end