Skip to content

Severe performance improvement in onlyheat calculations of strainMap #18

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

Open
physiker05 wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Severe performance improvement in onlyheat calculations of strainMap #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
83e5acf
Generalization of thermCond in heat.m
physiker05 Aug 31, 2020
bc3766a
Update heat.m
physiker05 Sep 1, 2020
5a9d9e7
Update heat.m
physiker05 Sep 1, 2020
772813d
Update heat.m
physiker05 Sep 1, 2020
222bb0b
Update heat.m
physiker05 Sep 2, 2020
0fd62aa
Merge pull request #1 from physiker05/energy-map
physiker05 Sep 2, 2020
a916522
Merge pull request #2 from physiker05/thermCond-mod
physiker05 Sep 2, 2020
cb78ecc
Update heat.m
physiker05 Sep 2, 2020
e590d7c
Update phonon.m
physiker05 Sep 16, 2020
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
9 changes: 4 additions & 5 deletions classes/heat.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
obj.heatDiffusion = p.Results.heatDiffusion;
obj.intpAtInterface = p.Results.intpAtInterface;
% set default ode options after initialization of parent class
obj.odeOptions.RelTol = 1e-3;
obj.odeOptions.RelTol = 1e-4;
end%function

%% Display
Expand Down Expand Up @@ -635,7 +635,7 @@ function setBoundaryCondition(obj,varargin)
index = finderb(z,dStart);
unitCell = handles{index}; % this is the handle to the corresponding unitCell

k = cellfun(@feval,(unitCell.thermCond)',num2cell(T));
k = cellfun(@feval,(unitCell.thermCond)',repmat({T},K,1));
% these are the parameters of the differential equation as they
% are defined in matlab for the pdesolver

Expand Down Expand Up @@ -731,11 +731,10 @@ function setBoundaryCondition(obj,varargin)
aAxes = obj.S.getUnitCellPropertyVector('aAxis');
bAxes = obj.S.getUnitCellPropertyVector('bAxis');
UCmasses = normMasses.*(aAxes/1e-10).*(bAxes/1e-10); % calculates vector of unit cell masses
Cells = obj.S.getNumberOfUnitCells;

for k=1:obj.S.numSubSystems
parfor i=1:size(tempMap,1)
for n=1:Cells
for i=1:size(tempMap,1)
for n=1:obj.S.getNumberOfUnitCells
energyMap(i,n,k) = UCmasses(n)*( intHeatCapacity{n,k}(tempMap(i,n,k)) - intHeatCapacity{n,k}(initTemp(n,k)) );
end
end
Expand Down
5 changes: 4 additions & 1 deletion classes/phonon.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,10 @@ function disp(obj)
% current temperature for each subsystem
% traverse subsystems
for j=1:K
intAlphaT(:,j) = cellfun(@feval,intLinThermExps(:,j),num2cell(squeeze(tempMap(i,:,j))'));
% traverse unit cells
for n=1:N
intAlphaT(n,j) = intLinThermExps{n,j}(tempMap(i,n,j)); % cellfun(@feval,intLinThermExps(:,j),num2cell(squeeze(tempMap(i,:,j))'));
end
end%for

% calculate the length of the sticks of each subsystem and sum
Expand Down