Skip to content

Commit 19f6bb5

Browse files
committed
debugged IMRv2 FD
1 parent 1e4bb4d commit 19f6bb5

File tree

2 files changed

+24
-11
lines changed

2 files changed

+24
-11
lines changed

src/spectral/m_imrv2_finitediff.m

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,21 @@
103103

104104
% radius, velocity, pressure, bubble temperature, medium temperature,
105105
% vapor concentration
106-
Tau0 = zeros(Nt,1);
107-
Tm0 = ones(Mt ~= -1);
106+
T = zeros(-1,1);
107+
if bubtherm
108+
Tau0 = zeros(Nt,1);
109+
Tm0 = ones(Mt ~= -1);
110+
111+
else
112+
Tau0 = zeros(-1,1);
113+
Tm0 = zeros(-1,1);
114+
end
108115
if masstrans
109116
C0 = C0*ones(Nt,1);
110117
else
111118
C0 = zeros(-1,1);
112119
end
113-
init = [Rzero; Uzero; Tau0; Tm0; C0];
114-
init
120+
init = [Rzero; Uzero; p0star; Tau0; Tm0; C0];
115121
tau_del = [];
116122

117123
% solver start
@@ -126,10 +132,17 @@
126132
R = X(:,1);
127133
U = X(:,2);
128134
p = X(:,3);
129-
Tau = X(:,4:(NT+3)); % Variable relating to internal temp
130-
Tm = X(:,(NT+4):(2*NT+3)); % Temperature in the medium
131-
C = X(:, (2*NT+4):end ); % Vapor concentration in the bubble
132-
T = (A_star -1 + sqrt(1+2*Tau*A_star)) / A_star; % Temp in bubble
135+
if bubtherm
136+
Tau = X(:,4:(Nt+3));
137+
T = (A_star -1 + sqrt(1+2*Tau*A_star)) / A_star; % Temp in bubble
138+
if medtherm
139+
Tm = X(:,(Nt+4):(2*Nt+3));
140+
end
141+
142+
end
143+
if masstrans
144+
C = X(:,(2*Nt+4):end);
145+
end
133146

134147
% transform variables back into their dimensional form
135148
if (dimensionalout == 1)

src/spectral/m_imrv2_spectral.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,15 +158,15 @@
158158
R = X(:,1);
159159
U = X(:,2);
160160
p = X(:,3);
161-
if bubtherm == 1
161+
if bubtherm
162162
T = (alpha-1+sqrt(1+2*alpha*gA*a))/alpha;
163-
if medtherm == 1
163+
if medtherm
164164
TL = mA*b;
165165
end
166166
else
167167
T = R.^(-3*kappa);
168168
end
169-
if masstrans == 1
169+
if masstrans
170170
C = gC*e;
171171
end
172172
Z1 = X(:,ic);

0 commit comments

Comments
 (0)