Skip to content
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

Jump to bottom

bemDraft #681

Draft
wants to merge 18 commits into
base: master
Choose a base branch
from
Draft

bemDraft #681

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift click to select a range
f04914e
bemDraft
santiago-correa-89 Dec 12, 2023
9bd81ee
uodateUbem
santiago-correa-89 Jan 23, 2024
550a42e
updateUBEM
santiago-correa-89 Jan 23, 2024
0e87506
Merge branch 'master' into localBEMfunctionSantiago
santiago-correa-89 Jan 25, 2024
20e84f3
updateAfterMergeMaster
santiago-correa-89 Jan 25, 2024
2be1140
udpateBEM
santiago-correa-89 Feb 3, 2024
0d4ca26
update
santiago-correa-89 Feb 3, 2024
ce6af67
update
santiago-correa-89 Feb 27, 2024
c71868b
update
santiago-correa-89 Feb 28, 2024
08eecec
nativeBEM
santiago-correa-89 Mar 9, 2024
cb402e4
update
santiago-correa-89 Mar 9, 2024
3ce87b2
update
santiago-correa-89 Mar 28, 2024
f51346d
update
santiago-correa-89 Apr 10, 2024
172cb59
Merge branch 'master' into localBEMfunctionSantiago
santiago-correa-89 Apr 17, 2024
e4e303e
update
santiago-correa-89 Apr 17, 2024
2fc98f6
Merge branch 'localBEMfunctionSantiago' of https://github.com/ONSAS/O…
santiago-correa-89 Apr 17, 2024
b206a00
update
santiago-correa-89 Apr 18, 2024
3ba48c5
update_smallupdate
santiago-correa-89 May 15, 2024
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
Prev Previous commit
Next Next commit
uodateUbem
  • Loading branch information
@santiago-correa-89
santiago-correa-89 committed Jan 23, 2024
commit 9bd81ee19226a70cd4bd5e4045a0105fc6f361ea
3 changes: 3 additions & 0 deletions src/core/assembler.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 208,9 @@
end

%md compute fluid forces on the element
if isempty(aeroNumericalParams)
aeroBool = false; % Used for uBEM first element of the interesection between nose and blase is computed as a frame without wind vel applied.
end
if aeroBool && fsBool
[FaeroElem, MataeroEelem] = frame_fluid_force( elemNodesxyzRefCoords, ...
elemCrossSecParams , ...
Expand Down
13 changes: 0 additions & 13 deletions src/elements/frame/auxiliar/readFoilData.m
View file
Open in desktop

This file was deleted.

13 changes: 5 additions & 8 deletions src/elements/frame/auxiliar/aeroBEMprops.m → src/elements/frame/auxiliar/uBEMAeroProps.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 15,13 @@
% You should have received a copy of the GNU General Public License
% along with ONSAS. If not, see <https://www.gnu.org/licenses/>.

function [ chordVector, aoa, cl, cd, cm, fstat, clinv, clfullysep ] = aeroBEMprops( aeroAirfoils, sectionData ) ;
function [ chordVector, aoast, liftCoef, dragCoef, momCoef] = uBEMAeroProps( twistList, chordList, polars )

for i = length(aeroAirfoils)
[aoa(:,i), cl(:,i), cd(:,i), cm(:,i), fstat(:,i), clinv(:,i), clfullysep(:,i)] = readairfoildata( aeroAirfoils(i) );
end
[aoast, liftCoef, dragCoef, momCoef ] = uBEMreadFoilData( polars ) ;

twist = sectionData(:,2); % Angle in DEGRESS
chord = sectionData(:,3);
chordVector = zeros( length(chordList), 3 );

for j = 1:length(twist)
chordVector(1,j) = [0, 0 , chord(j)] ;
for j = 1:length(twistList)
chordVector(j,3) = chordList(j) ;
end
end
12 changes: 12 additions & 0 deletions src/elements/frame/auxiliar/uBEMframeProps.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 1,12 @@
function [twist, chord, IDsection, radius, Idx1, Idx2] = uBEMframeProps(uBEMdataCoords, xs)

Idx1 = find(uBEMdataCoords(1:end, 1:3) == xs(1:3)', 1) ;
Idx2 = find(uBEMdataCoords(1:end, 1:3) == xs(4:6)', 1) ;

radius = [ uBEMdataCoords(Idx1, 7), uBEMdataCoords(Idx2, 7) ];

twist = [ 0 uBEMdataCoords(Idx1, 4) 0 0 uBEMdataCoords(Idx2, 4) 0 ]';
chord = [ 0 0 uBEMdataCoords(Idx1, 5) 0 0 uBEMdataCoords(Idx2, 5) ]';
IDsection = [ uBEMdataCoords(Idx1, 6), uBEMdataCoords(Idx2, 6) ];

end
43 changes: 43 additions & 0 deletions src/elements/frame/auxiliar/uBEMreadFoilData.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 1,43 @@
function [ aoa, cl, cd, cm ] = uBEMreadFoilData( polars )

% For uniform test
if iscell(polars) && numel(polars) >= 3
format = table2array(readtable( polars{3} ) );
[ row, ~ ] = size(format) ;
for i = 1:length(polars)
if i == 1 || i == 2 % First two columns are cylinder shapes
aoa(:,i) = format(:,1) ;
for j = 1:row
strucdata = table2array( readtable( polars{i} ) ) ;
cl(j,i) = strucdata(1,2);
cd(j,i) = strucdata(1,3);
cm(j,i) = strucdata(1,4);
end
else
strucdata = table2array( readtable( polars{i} ) );
if length(strucdata(:,1)) ~= row
[uniqueValues, ~, index] = unique(strucdata(:, 1));
rowsToKeep = accumarray(index, 1) == 1;
filteredData = strucdata(rowsToKeep, :) ;
aoa(:,i) = format(:, 1) ;
for j = 1:row
cl(j,i) = interp1( filteredData(:,1), filteredData(:,2), format(j, 1), 'linear', 'extrap' );
cd(j,i) = interp1( filteredData(:,1), filteredData(:,3), format(j, 1), 'linear', 'extrap' );
cm(j,i) = interp1( filteredData(:,1), filteredData(:,4), format(j, 1), 'linear', 'extrap' );
end
else
aoa(:,i) = strucdata(:,1) ;
cl(:,i) = strucdata(:,2) ;
cd(:,i) = strucdata(:,3) ;
cm(:,i) = strucdata(:,4) ;
end
end
end
else
strucdata = table2array( readtable( polars{1} ) ) ;
aoa = strucdata(:,1) ;
cl = strucdata(:,2) ;
cd = strucdata(:,3) ;
cm = strucdata(:,4) ;
end
end
Loading
Loading