Skip to content
Snippets Groups Projects
Commit 8f7ce400 authored by Nicola Vigano's avatar Nicola Vigano
Browse files

Fixed some formatting

parent d20c0df2
No related branches found
No related tags found
No related merge requests found
......@@ -84,7 +84,7 @@ g1 = oriConversion(ori1);
g2 = oriConversion(ori2);
% Compute active/passive disorientation angle/axis
if nargout > 1
if (nargout > 1)
mis_axis = zeros(Ngrain1, 3);
tmp_info(Ngrain1).g1 = [];
......
......@@ -28,43 +28,40 @@ function mis = gtMathsMisorientation(r_vectors1, r_vectors2, symm, biunivocal, c
% Updated version
if ~exist('symm','var') || isempty(symm)
parameters = [];
load('parameters.mat');
if (~exist('symm','var') || isempty(symm))
parameters = gtLoadParameters();
symm = gtCrystGetSymmetryOperators(parameters.cryst.crystal_system);
end
if ~exist('biunivocal','var') || isempty(biunivocal)
if (~exist('biunivocal','var') || isempty(biunivocal))
biunivocal = false;
end
if ~exist('cellarray','var') || isempty(cellarray)
if (~exist('cellarray','var') || isempty(cellarray))
cellarray = false;
end
if (biunivocal) && length(r_vectors1) ~= length(r_vectors2)
if (biunivocal && (length(r_vectors1) ~= length(r_vectors2)))
gtError('gtMathsMisorientation:wrongArgument','Different length of r_vector lists... Wrong value for the flag ''biunivocal''.')
end
if (biunivocal)
[mis.dis_angle, mis.dis_axis, ~] = arrayfun(@(num) ...
gtDisorientation(r_vectors1(num,:).', r_vectors2(num,:).', symm, varargin{:}),...
1:length(r_vectors1), 'UniformOutput', false);
[mis.dis_angle, mis.dis_axis, ~] = arrayfun(...
@(num)gtDisorientation(r_vectors1(num, :).', r_vectors2(num, :).', symm, varargin{:}), ...
1:length(r_vectors1), 'UniformOutput', false);
mis.dis_angle = [mis.dis_angle{:}];
mis.dis_axis = reshape([mis.dis_axis{:}],3,[]);
mis.dis_axis = reshape([mis.dis_axis{:}], 3, []);
mis.id1 = 1:length(mis.dis_angle);
mis.id2 = 1:length(mis.dis_angle);
mis.biunivocal = biunivocal;
mis.n_grain1 = length(r_vectors1);
mis.n_grain2 = length(r_vectors2);
mis.biunivocal = biunivocal;
mis.n_grain1 = length(r_vectors1);
mis.n_grain2 = length(r_vectors2);
else
if (cellarray)
mis = cell(0,1);
for ii=1:size(r_vectors1,1)
for ii = 1:size(r_vectors1, 1)
% calculate the misorientation angle and axis between each grain from 1 with
% all the grains from 2
for jj=1:size(r_vectors2,1)
for jj = 1:size(r_vectors2, 1)
[dis_angle, dis_axis, ~] = gtDisorientation(r_vectors1(ii,:).', r_vectors2(jj,:).', symm, varargin{:});
mis{end+1}.dis_angle = dis_angle;
......@@ -79,7 +76,7 @@ else
mis.id1 = [];
mis.id2 = [];
for ii=1:length(r_vectors1)
for ii = 1:length(r_vectors1)
% calculate the misorientation angle and axis between each grain from 1 with
% all the grains from 2
[dis_angles, dis_axes, ~] = arrayfun(@(num) ...
......@@ -98,8 +95,6 @@ else
mis.n_grain1 = length(r_vectors1);
mis.n_grain2 = length(r_vectors2);
end
end
end % end of function
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment