Skip to content

The full bulk_in array is now passed into custom function #446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
StephenNneji wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −7
Draft

The full bulk_in array is now passed into custom function #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/domains/customXY/domainsXY.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
vfWater = 1 - totalVF;

% Now convert the Volume Fractions to SLD's...
siSLD = vfSilicon * bulk_in;
siSLD = vfSilicon * bulk_in(contrast);
oxSLD = vfOxide * 3.41e-6;

% Layer SLD depends on whether we are calculating the domain or not...
Expand Down
8 changes: 4 additions & 4 deletions targetFunctions/+domainsTF/processCustomFunction.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
coder.varsize('output2',[10000 numberOfOutputColumns], [1 1]);

if isnan(str2double(functionHandle))
[output1, subRoughs(i)] = callMatlabFunction(functionHandle, paramValues, bulkIns(i), bulkOuts, i, 1);
[output2, ~] = callMatlabFunction(functionHandle, paramValues, bulkIns(i), bulkOuts, i, 2);
[output1, subRoughs(i)] = callMatlabFunction(functionHandle, paramValues, bulkIns, bulkOuts, i, 1);
[output2, ~] = callMatlabFunction(functionHandle, paramValues, bulkIns, bulkOuts, i, 2);
else
[output1, subRoughs(i)] = callCppFunction(functionHandle, paramValues, bulkIns(i), bulkOuts, i, 1);
[output2, ~] = callCppFunction(functionHandle, paramValues, bulkIns(i), bulkOuts, i, 2);
[output1, subRoughs(i)] = callCppFunction(functionHandle, paramValues, bulkIns, bulkOuts, i, 1);
[output2, ~] = callCppFunction(functionHandle, paramValues, bulkIns, bulkOuts, i, 2);
end

% If SLD is real, add dummy imaginary column
Expand Down
4 changes: 2 additions & 2 deletions targetFunctions/+normalTF/processCustomFunction.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
coder.varsize('output',[10000 numberOfOutputColumns],[1 1]);

if isnan(str2double(functionHandle))
[output, subRoughs(i)] = callMatlabFunction(functionHandle, paramValues, bulkIns(i), bulkOuts, i, 0);
[output, subRoughs(i)] = callMatlabFunction(functionHandle, paramValues, bulkIns, bulkOuts, i, 0);
else
[output, subRoughs(i)] = callCppFunction(functionHandle, paramValues, bulkIns(i), bulkOuts, i, 0);
[output, subRoughs(i)] = callCppFunction(functionHandle, paramValues, bulkIns, bulkOuts, i, 0);
end

% If SLD is real, add dummy imaginary column
Expand Down
Loading