Mercurial > repos > public > sbplib

changeset 870:fb91d12093f8 bcSetupExperiment

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change some naming of functions
author Jonatan Werpers <jonatan@werpers.com>
date Thu, 01 Nov 2018 10:41:36 +0100
parents d356f1a22d4f
children 526b039c0ecc
files +scheme/+bc/bcClosureSetup.m +scheme/+bc/bcForcingSetup.m +scheme/+bc/closureSetup.m +scheme/+bc/forcingSetup.m +scheme/bcSetup.m
diffstat 5 files changed, 85 insertions(+), 85 deletions(-) [+]
line wrap: on
line diff
--- a/+scheme/+bc/bcClosureSetup.m	Fri Sep 07 09:19:03 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-function [closure, penalties] = bcClosureSetup(diffOp, bcs)
-    assertType(bcs, 'cell');
-
-    % Setup storage arrays
-    closure = spzeros(size(diffOp));
-    penalties = cell(1, length(bcs));
-
-    % Collect closures and penalties
-    for i = 1:length(bcs)
-        [localClosure, penalties{i}] = diffOp.boundary_condition(bcs{i}.boundary, bcs{i}.type);
-        closure = closure + localClosure;
-    end
-end
--- a/+scheme/+bc/bcForcingSetup.m	Fri Sep 07 09:19:03 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-function S = bcForcingSetup(diffOp, penalties, bcs, S_sign) %% SETUP in the name!!
-    default_arg('S_sign', 1);
-
-    assertType(bcs, 'cell');
-    assertIsMember(S_sign, [1, -1]);
-
-    verifyBcFormat(bcs, diffOp);
-
-    % % Setup storage arrays
-    % closure = spzeros(size(diffOp));
-    % gridData = {};
-    % symbolicData = {};
-
-    % Loop over bcs and collect data
-    for i = 1:length(bcs)
-        % [ok, isSym, data] = parseData(bcs{i}, penalties{i}, diffOp.grid)
-
-        % if ~ok
-        %     % There was no data
-        %     continue
-        % end
-
-        % if isSym
-        %     gridData{end+1} = data;
-        % else
-        %     symbolicData{end+1} = data;
-        % end
-    end
-
-
-    % Setup penalty function
-    O = spzeros(size(diffOp),1);
-    function v = S_fun(t)
-        v = O;
-        for i = 1:length(gridData)
-            v = v + gridData{i}.penalty*gridData{i}.func(t);
-        end
-
-        for i = 1:length(symbolicData)
-            v = v + symbolicData{i}.penalty*symbolicData{i}.func(t, symbolicData{i}.coords{:});
-        end
-
-        v = S_sign * v;
-    end
-    S = @S_fun;
-end
-
-function [ok, isSym, dataStruct] = parseData(bc, penalty, grid)
-    if ~isfield(bc,'data') || isempty(bc.data)
-        ok = false;
-        return
-    end
-    ok = true;
-
-    nArg = nargin(bc.data);
-
-    if nArg > 1
-        % Symbolic data
-        isSym = true;
-        coord = grid.getBoundary(bc.boundary);
-        dataStruct.penalty = penalty;
-        dataStruct.func = bc.data;
-        dataStruct.coords = num2cell(coord, 1);
-    else
-        % Grid data
-        isSym = false;
-        dataStruct.penalty = penalty;
-        dataStruct.func = bcs{i}.data;
-    end
-end
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/+scheme/+bc/closureSetup.m	Thu Nov 01 10:41:36 2018 +0100
@@ -0,0 +1,13 @@
+function [closure, penalties] = closureSetup(diffOp, bcs)
+    assertType(bcs, 'cell');
+
+    % Setup storage arrays
+    closure = spzeros(size(diffOp));
+    penalties = cell(1, length(bcs));
+
+    % Collect closures and penalties
+    for i = 1:length(bcs)
+        [localClosure, penalties{i}] = diffOp.boundary_condition(bcs{i}.boundary, bcs{i}.type);
+        closure = closure + localClosure;
+    end
+end
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/+scheme/+bc/forcingSetup.m	Thu Nov 01 10:41:36 2018 +0100
@@ -0,0 +1,70 @@
+function S = forcingSetup(diffOp, penalties, bcs, S_sign)
+    default_arg('S_sign', 1);
+
+    assertType(bcs, 'cell');
+    assertIsMember(S_sign, [1, -1]);
+
+    scheme.bc.verifyFormat(bcs, diffOp);
+
+    % % Setup storage arrays
+    % closure = spzeros(size(diffOp));
+    % gridData = {};
+    % symbolicData = {};
+
+    % Loop over bcs and collect data
+    for i = 1:length(bcs)
+        % [ok, isSym, data] = parseData(bcs{i}, penalties{i}, diffOp.grid)
+
+        % if ~ok
+        %     % There was no data
+        %     continue
+        % end
+
+        % if isSym
+        %     gridData{end+1} = data;
+        % else
+        %     symbolicData{end+1} = data;
+        % end
+    end
+
+
+    % Setup penalty function
+    O = spzeros(size(diffOp),1);
+    function v = S_fun(t)
+        v = O;
+        for i = 1:length(gridData)
+            v = v + gridData{i}.penalty*gridData{i}.func(t);
+        end
+
+        for i = 1:length(symbolicData)
+            v = v + symbolicData{i}.penalty*symbolicData{i}.func(t, symbolicData{i}.coords{:});
+        end
+
+        v = S_sign * v;
+    end
+    S = @S_fun;
+end
+
+function [ok, isSym, dataStruct] = parseData(bc, penalty, grid)
+    if ~isfield(bc,'data') || isempty(bc.data)
+        ok = false;
+        return
+    end
+    ok = true;
+
+    nArg = nargin(bc.data);
+
+    if nArg > 1
+        % Symbolic data
+        isSym = true;
+        coord = grid.getBoundary(bc.boundary);
+        dataStruct.penalty = penalty;
+        dataStruct.func = bc.data;
+        dataStruct.coords = num2cell(coord, 1);
+    else
+        % Grid data
+        isSym = false;
+        dataStruct.penalty = penalty;
+        dataStruct.func = bcs{i}.data;
+    end
+end
--- a/+scheme/bcSetup.m	Fri Sep 07 09:19:03 2018 +0200
+++ b/+scheme/bcSetup.m	Thu Nov 01 10:41:36 2018 +0100
@@ -16,8 +16,8 @@
     assertType(bcs, 'cell');
     assert(S_sign == 1 || S_sign == -1, 'S_sign must be either 1 or -1');
 
-    [closure, penalties] = bcClosureSetup(diffOp, bcs);
-    S = bcForcingSetup(diffOp, penalties, bcs, S_sign);
+    [closure, penalties] = scheme.bc.closureSetup(diffOp, bcs);
+    S = scheme.bc.forcingSetup(diffOp, penalties, bcs, S_sign);
 end
 
 %%% NOTES