Skip to content

Commit

Permalink
Change field name
Browse files Browse the repository at this point in the history
Change Lambda to lambda
  • Loading branch information
dli323 committed Nov 13, 2019
1 parent 5688ec0 commit b7d0a16
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions SMU/HessMPD.m
Expand Up @@ -140,12 +140,12 @@
% Create simModes variable to contain simulated modal properties that
% will be used to match experimental modes when evaluating objective
% function of Jacobians.
% Lambda (n_modes x 1) - simulated eigenvalue
% lambda (n_modes x 1) - simulated eigenvalue
% psi_m (n_meas x n_modes) - simulated mode shape vector at measured DOFs
% psi (N x n_modes) - simulated mode shape vector at all DOFs
simModes.psi_m = psi_m(:, matchedModeIndex);
simModes.psi = psi(:, matchedModeIndex);
simModes.Lambda = lambda(matchedModeIndex);
simModes.lambda = lambda(matchedModeIndex);

for i = 1 : expModes.n_modes
if(~isempty(find(expModes.psiExp(:,i) == 1, 1)))
Expand Down Expand Up @@ -192,7 +192,7 @@


%% Calculate Jacobian and Hessian matrix of residual
omegaSim = sqrt( simModes.Lambda );
omegaSim = sqrt( simModes.lambda );
omegaExp = sqrt( expModes.lambdaExp );

n_meas = expModes.n_meas;
Expand Down Expand Up @@ -253,7 +253,7 @@
ddPsi_mr = zeros(n_alpha, n_alpha, n_meas - 1);
ddPsi_m = zeros(n_alpha, n_alpha, n_meas);

B = structModel.K - simModes.Lambda(i) * structModel.M0;
B = structModel.K - simModes.lambda(i) * structModel.M0;
% The maximum entry of Psi_m is normalized to 1
P_i = setdiff(1 : N, expModes.q(i));
Q_i = P_i(1 : n_meas - 1);
Expand Down
6 changes: 3 additions & 3 deletions SMU/JacMPDLsqnonlin.m
Expand Up @@ -41,7 +41,7 @@
%
% simModes - a structure array with simulated modal properties for
% model updating:
% Lambda (n_modes x 1) - simulated eigenvalue
% lambda (n_modes x 1) - simulated eigenvalue
% psi_m (n_meas x n_modes) - simulated mode shape vector at
% measured DOFs
% psi (N x n_modes) - simulated mode shape vector at all DOFs
Expand All @@ -65,7 +65,7 @@
n_alpha = length( structModel.K_j ) ;
N = size( structModel.K0, 1 );

omegaSim = sqrt( simModes.Lambda );
omegaSim = sqrt( simModes.lambda );
omegaExp = sqrt( expModes.lambdaExp );

n_meas = expModes.n_meas;
Expand Down Expand Up @@ -118,7 +118,7 @@
dPsi_m = zeros(n_meas, n_alpha, n_modes);
for i = 1 : n_modes
dPsi_dAlpha_j = zeros(N, 1);
B = sparse( structModel.K - simModes.Lambda(i) * structModel.M0 );
B = sparse( structModel.K - simModes.lambda(i) * structModel.M0 );

if (normOpt == 1)
% The maximum entry of Psi_m is normalized to 1
Expand Down
4 changes: 2 additions & 2 deletions SMU/ModelUpdatingJacobian.m
Expand Up @@ -40,14 +40,14 @@
% measDOFs (n_meas x 1) - measured DOFs
% lambdaWeights (n_modes x 1) - weighting factor for eigenvalue
% psiWeights (n_modes x 1) - weighting factor for eigenvector
% Lambda (n_modes x 1) - simulated eigenvalue
% lambda (n_modes x 1) - simulated eigenvalue
% psi_m (n_meas x n_modes) - simulated mode shape vector at
% measured DOFs
% psi (N x n_modes) - simulated mode shape vector at all DOFs
%
% simModes - a structure array with simulated modal properties for
% model updating:
% Lambda (n_modes x 1) - simulated eigenvalue
% lambda (n_modes x 1) - simulated eigenvalue
% psi_m (n_meas x n_modes) - simulated mode shape vector at
% measured DOFs
% psi (N x n_modes) - simulated mode shape vector at all DOFs
Expand Down
2 changes: 1 addition & 1 deletion SMU/ModelUpdatingObjective.m
Expand Up @@ -43,7 +43,7 @@
%
% simModes - a structure array with simulated modal properties for
% model updating:
% Lambda (n_modes x 1) - simulated eigenvalue
% lambda (n_modes x 1) - simulated eigenvalue
% psi_m (n_meas x n_modes) - simulated mode shape vector at
% measured DOFs
% psi (N x n_modes) - simulated mode shape vector at all DOFs
Expand Down
6 changes: 3 additions & 3 deletions SMU/ObjFuncMPDLsqnonlin.m
Expand Up @@ -25,7 +25,7 @@
%
% simModes - a MATLAB structure array with simulated modal properties for
% model updating:
% Lambda (n_modes x 1) - simulated eigenvalue
% lambda (n_modes x 1) - simulated eigenvalue
% psi_m (n_meas x n_modes) - simulated mode shape vector at
% measured DOFs
% psi (N x n_modes) - simulated mode shape vector at all DOFs
Expand All @@ -46,7 +46,7 @@
% Output:
% r: the objective residual vector r(x)

omegaSim = sqrt( simModes.Lambda ); % simulated angular frequency
omegaSim = sqrt( simModes.lambda ); % simulated angular frequency
omegaExp = sqrt( expModes.lambdaExp );% experimental angular frequency
freqSim = omegaSim / 2 / pi;
freqExp = omegaExp / 2 / pi;
Expand All @@ -67,7 +67,7 @@
for i = 1 : n_modes
if (eigFreqOpt == 0)
eigFreqTerm = expModes.lambdaWeights(i) * ...
(expModes.lambdaExp(i) - simModes.Lambda(i)) / expModes.lambdaExp(i);
(expModes.lambdaExp(i) - simModes.lambda(i)) / expModes.lambdaExp(i);
elseif (eigFreqOpt == 1)
eigFreqTerm = expModes.lambdaWeights(i) * (omegaExp(i) - omegaSim(i)) / omegaExp(i);
elseif (eigFreqOpt == 2)
Expand Down
6 changes: 3 additions & 3 deletions SMU/OptmzObjJac.m
Expand Up @@ -102,10 +102,10 @@
% Create simModes variable to contain simulated modal properties that
% will be used to match experimental modes when evaluating objective
% function of Jacobians.
% Lambda (n_modes x 1) - simulated eigenvalue
% lambda (n_modes x 1) - simulated eigenvalue
% psi_m (n_meas x n_modes) - simulated mode shape vector at measured DOFs
% psi (N x n_modes) - simulated mode shape vector at all DOFs
simModes = struct('psi_m',[],'psi',[],'Lambda',[]);
simModes = struct('psi_m',[],'psi',[],'lambda',[]);
% Add a new field K into structModel, which represents the stiffness matrix
% with current alpha values.
n_alpha = length(structModel.K_j);
Expand Down Expand Up @@ -143,7 +143,7 @@

simModes.psi_m = psi_m(:, matchedModeIndex);
simModes.psi = psi(:, matchedModeIndex);
simModes.Lambda = lambda(matchedModeIndex);
simModes.lambda = lambda(matchedModeIndex);

if( updatingOpts.formID < 2.3)
% Normalize mode shape vector so that the maximum entry magnitude = 1.
Expand Down

0 comments on commit b7d0a16

Please sign in to comment.