Skip to content

Commit

Permalink
remove local mass original
Browse files Browse the repository at this point in the history
  • Loading branch information
@PetrKryslUCSD
PetrKryslUCSD committed Sep 28, 2023
1 parent 381e4af commit 2fffa91
Showing 1 changed file with 0 additions and 94 deletions.
94 changes: 0 additions & 94 deletions src/FEMMLinBeamModule.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,100 +327,6 @@ function local_mass!(MM, A, I1, I2, I3, rho, L, mass_type)
end
end

function local_mass_original!(MM, A, I1, I2, I3, rho, L, mass_type)
if (mass_type == MASS_TYPE_CONSISTENT_WITH_ROTATION_INERTIA)
# C
# C CONSISTENT MASS MATRIX including ROTATIONAL MASSES
# C Formulation of the (3.38), (3.39) equation from Dykstra's thesis
MM .= (rho*A*L)*[
1/3 0 0 0 0 0 1/6 0 0 0 0 0
0 13/35 0 0 0 11*L/210 0 9/70 0 0 0 -13*L/420
0 0 13/35 0 -11*L/210 0 0 0 9/70 0 13*L/420 0
0 0 0 I1/3/A 0 0 0 0 0 I1/6/A 0 0
0 0 -11*L/210 0 L^2/105 0 0 0 -13*L/420 0 -L^2/140 0
0 11*L/210 0 0 0 L^2/105 0 13*L/420 0 0 0 -L^2/140
1/6 0 0 0 0 0 1/3 0 0 0 0 0
0 9/70 0 0 0 13*L/420 0 13/35 0 0 0 -11*L/210
0 0 9/70 0 -13*L/420 0 0 0 13/35 0 11*L/210 0
0 0 0 I1/6/A 0 0 0 0 0 I1/3/A 0 0
0 0 13*L/420 0 -L^2/140 0 0 0 11*L/210 0 L^2/105 0
0 -13*L/420 0 0 0 -L^2/140 0 -11*L/210 0 0 0 L^2/105];
MM .+= (rho/L)*[
0 0 0 0 0 0 0 0 0 0 0 0
0 6/5*I2 0 0 0 L/10*I2 0 -6/5*I2 0 0 0 L/10*I2
0 0 6/5*I3 0 -L/10*I3 0 0 0 -6/5*I3 0 -L/10*I3 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 -L/10*I3 0 2*L^2/15*I3 0 0 0 L/10*I3 0 -L^2/30*I3 0
0 L/10*I2 0 0 0 2*L^2/15*I2 0 -L/10*I2 0 0 0 -L^2/30*I2
0 0 0 0 0 0 0 0 0 0 0 0
0 -6/5*I2 0 0 0 -L/10*I2 0 6/5*I2 0 0 0 -L/10*I2
0 0 -6/5*I3 0 L/10*I3 0 0 0 6/5*I3 0 L/10*I3 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 -L/10*I3 0 -L^2/30*I3 0 0 0 L/10*I3 0 2*L^2/15*I3 0
0 L/10*I2 0 0 0 -L^2/30*I2 0 -L/10*I2 0 0 0 2*L^2/15*I2];
elseif (mass_type == MASS_TYPE_CONSISTENT_NO_ROTATION_INERTIA)
# C
# C CONSISTENT MASS MATRIX excluding ROTATIONAL MASSES
# C Formulation of the (3.38) equation from Dykstra's thesis, no rotational inertia
MM .= (rho*A*L)*[
1/3 0 0 0 0 0 1/6 0 0 0 0 0
0 13/35 0 0 0 11*L/210 0 9/70 0 0 0 -13*L/420
0 0 13/35 0 -11*L/210 0 0 0 9/70 0 13*L/420 0
0 0 0 I1/3/A 0 0 0 0 0 I1/6/A 0 0
0 0 -11*L/210 0 L^2/105 0 0 0 -13*L/420 0 -L^2/140 0
0 11*L/210 0 0 0 L^2/105 0 13*L/420 0 0 0 -L^2/140
1/6 0 0 0 0 0 1/3 0 0 0 0 0
0 9/70 0 0 0 13*L/420 0 13/35 0 0 0 -11*L/210
0 0 9/70 0 -13*L/420 0 0 0 13/35 0 11*L/210 0
0 0 0 I1/6/A 0 0 0 0 0 I1/3/A 0 0
0 0 13*L/420 0 -L^2/140 0 0 0 11*L/210 0 L^2/105 0
0 -13*L/420 0 0 0 -L^2/140 0 -11*L/210 0 0 0 L^2/105];
elseif (mass_type == MASS_TYPE_LUMPED_DIAGONAL_WITH_ROTATION_INERTIA)
# C
# C LUMPED DIAGONAL MASS MATRIX WITH ROTATIONAL MASSES
# C
HLM = A*rho*L/2.;
HLI1 = rho*I1* L/2.;
HLI2 = rho*I2* L/2.;
HLI3 = rho*I3* L/2.;
CA = HLM;
CB = HLI1;
CC = HLI2;
CD = HLI3;
fill!(MM, 0.0);
MM[1,1] = MM[1,1] + CA;
MM[2,2] = MM[2,2] + CA;
MM[3,3] = MM[3,3] + CA;
MM[4,4] = MM[4,4] + CB;
MM[5,5] = MM[5,5] + CC;
MM[6,6] = MM[6,6] + CD;
MM[7,7] = MM[7,7] + CA;
MM[8,8] = MM[8,8] + CA;
MM[9,9] = MM[9,9] + CA;
MM[10,10] = MM[10,10] + CB;
MM[11,11] = MM[11,11] + CC;
MM[12,12] = MM[12,12] + CD;
elseif (mass_type == MASS_TYPE_LUMPED_DIAGONAL_NO_ROTATION_INERTIA)
# C
# C LUMPED DIAGONAL ISOTROPIC MASS MATRIX WITHOUT ROTATIONAL MASSES
# C
HLM = A*rho*L/2.;
CA = HLM;
CB = 0.0;
CC = 0.0;
CD = 0.0;
fill!(MM, 0.0);
MM[1,1] = MM[1,1] + CA;
MM[2,2] = MM[2,2] + CA;
MM[3,3] = MM[3,3] + CA;
MM[7,7] = MM[7,7] + CA;
MM[8,8] = MM[8,8] + CA;
MM[9,9] = MM[9,9] + CA;
end
return MM
end


"""
local_stiffness!(SM, E, G, A, I2, I3, J, A2s, A3s, L, aN, DN)
Expand Down

0 comments on commit 2fffa91

Please sign in to comment.