Skip to content

Commit

Permalink
fixed fmm checks
Browse files Browse the repository at this point in the history
  • Loading branch information
mrachh committed Apr 1, 2024
1 parent c913a16 commit b5d8bcf
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 121 deletions.
5 changes: 5 additions & 0 deletions chunkie/@kernel/elast2d.m
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,9 @@

end

icheck = exist(['fmm2d.' mexext], 'file');
if icheck ~=3
obj.fmm = [];
end

end
6 changes: 6 additions & 0 deletions chunkie/@kernel/helm2d.m
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,10 @@

end

icheck = exist(['fmm2d.' mexext], 'file');
if icheck ~=3
obj.fmm = [];
end


end
6 changes: 6 additions & 0 deletions chunkie/@kernel/helm2ddiff.m
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,10 @@

end

icheck = exist(['fmm2d.' mexext], 'file');
if icheck ~=3
obj.fmm = [];
end


end
5 changes: 5 additions & 0 deletions chunkie/@kernel/lap2d.m
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,9 @@

end

icheck = exist(['fmm2d.' mexext], 'file');
if icheck ~=3
obj.fmm = [];
end

end
6 changes: 6 additions & 0 deletions chunkie/@kernel/stok2d.m
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,10 @@

end

icheck = exist(['fmm2d.' mexext], 'file');
if icheck ~=3
obj.fmm = [];
end


end
11 changes: 10 additions & 1 deletion chunkie/chunkerkerneval.m
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,16 @@
end
end


if strcmpi(imethod,'fmm')
icheck = exist(['fmm2d.' mexext], 'file');
if icheck ~=3
imethod = 'direct';
fstr = ['CHUNKERKERNEVAL: forcefmm flag used but fmm2d not found\n' ...
'Using direct computation instead\nMake sure fmm2d.' mexext ...
' is in MATLAB path'];
warning(sprintf(fstr))
end
end


if strcmpi(imethod,'direct')
Expand Down
120 changes: 0 additions & 120 deletions devtools/test/chunkermat_helm2dfmmTest.m

This file was deleted.

0 comments on commit b5d8bcf

Please sign in to comment.