changeset 878:51cc7b05b4ab bcSetupExperiment

Fix bugs in forcingSetup and verifyFormat
author Jonatan Werpers <jonatan@werpers.com>
date Fri, 02 Nov 2018 11:11:50 +0100
parents 7ceaea27d944
children f6a8e6cc7408
files +scheme/+bc/forcingSetup.m +scheme/+bc/verifyFormat.m
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/+scheme/+bc/forcingSetup.m	Thu Nov 01 16:01:33 2018 +0100
+++ b/+scheme/+bc/forcingSetup.m	Fri Nov 02 11:11:50 2018 +0100
@@ -31,17 +31,19 @@
 % Go through a cell array of boundary condition specifications and return cell arrays
 % of structs for grid and symbolic data.
 function [gridData, symbolicData] = parseAndSortData(bcs, penalties, diffOp)
+    gridData = {};
+    symbolicData = {};
     for i = 1:length(bcs)
-        [ok, isSymbolic, data] = parseData(bcs{i}, penalties{i}, diffOp.grid)
+        [ok, isSymbolic, data] = parseData(bcs{i}, penalties{i}, diffOp.grid);
 
         if ~ok
             continue % There was no data
         end
 
         if isSymbolic
-            gridData{end+1} = data;
+            symbolicData{end+1} = data;
         else
-            symbolicData{end+1} = data;
+            gridData{end+1} = data;
         end
     end
 end
@@ -68,6 +70,6 @@
         % Grid data
         isSymbolic = false;
         dataStruct.penalty = penalty;
-        dataStruct.func = bcs{i}.data;
+        dataStruct.func = bc.data;
     end
 end
--- a/+scheme/+bc/verifyFormat.m	Thu Nov 01 16:01:33 2018 +0100
+++ b/+scheme/+bc/verifyFormat.m	Fri Nov 02 11:11:50 2018 +0100
@@ -25,7 +25,7 @@
         if nargin(bcs{i}.data) == 1
             % Grid data (only function of time)
             % Assert that the data has the correct dimension
-            assertSize(bcs{i}.data(0), 1, size(b));
+            assertSize(bcs{i}.data(0), 1, size(b,1));
         end
     end
 end