Skip to content

Commit c2b40ec

Browse files
author
Diego Vaca
committed
fixing PR part 3
1 parent d395686 commit c2b40ec

File tree

252 files changed

+1278
-19314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

252 files changed

+1278
-19314
lines changed

‎benchmarks/viscous_weno5_sgb_acoustic/case.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# - viscosity enabled
66
# - weno_Re_flux : T
77
# - weno_order : 5
8-
# - bubbles : T
8+
# - bubbles_euler : T
99
# - bubble_model : 3
1010
# - acoustic_source : T
1111

@@ -216,7 +216,7 @@
216216
# ==========================================================
217217

218218
# Bubbles ==================================================
219-
'bubbles' : 'T',
219+
'bubbles_euler' : 'T',
220220
'bubble_model' : 3,
221221
'polytropic' : 'T',
222222
'polydisperse' : 'F',

‎docs/documentation/case.md‎

Lines changed: 87 additions & 87 deletions
Large diffs are not rendered by default.

‎examples/0D_bubblecollapse_adap/case.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
# ==========================================================
120120

121121
# Bubbles ==================================================
122-
'bubbles' : 'T',
122+
'bubbles_euler' : 'T',
123123
'bubble_model' : 2,
124124

125125
# Nondimensional numbers

‎examples/1D_bubblescreen/case.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
# ==========================================================
177177

178178
# Bubbles ==================================================
179-
'bubbles' : 'T',
179+
'bubbles_euler' : 'T',
180180
'bubble_model' : 3,
181181
'polytropic' : 'T',
182182
'polydisperse' : 'F',

‎examples/1D_exp_bubscreen/case.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@
210210
# ==========================================================
211211

212212
# Bubbles ==================================================
213-
'bubbles' : 'T',
213+
'bubbles_euler' : 'T',
214214
# in user guide... 1 = gilbert 2 = keller-miksis
215215
# but gilbert won't work for the equations that you are using... (i think)
216216
'bubble_model' : 2,

‎examples/1D_poly_bubscreen/case.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
'rhoref' : rho0,
185185
# ==========================================================================
186186
# Bubbles ==================================================================
187-
'bubbles' : 'T',
187+
'bubbles_euler' : 'T',
188188
'bubble_model' : 2,
189189
'polytropic' : 'T',
190190
# 'polydisperse' : 'T',

‎examples/1D_qbmm/case.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
# ==========================================================
184184

185185
# Bubbles ==================================================
186-
'bubbles' : 'T',
186+
'bubbles_euler' : 'T',
187187
'bubble_model' : 2,
188188
'polytropic' : 'F',
189189
'polydisperse' : 'T',

‎examples/2D_bubbly_steady_shock/case.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204
# ==========================================================
205205

206206
# Bubbles ==================================================
207-
'bubbles' : 'T',
207+
'bubbles_euler' : 'T',
208208
'bubble_model' : 2,
209209
'polytropic' : 'T',
210210
'polydisperse' : 'F',

‎examples/2D_whale_bubble_annulus/case.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
# ==========================================================================
174174

175175
# Bubbles ==================================================================
176-
'bubbles' : 'T',
176+
'bubbles_euler' : 'T',
177177
'bubble_model' : 3,
178178
'polytropic' : 'T',
179179
'R0_type' : 1,

‎examples/3D_lag_bubbles_bubblescreen/case.py‎ renamed to ‎examples/3D_lagrange_bubblescreen/case.py‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
k_v = 0.02 # Thermal conductivity of the vapor - W/m/K
3737
diffVapor = 2.5e-5 # Diffusivity coefficient of the vapor - m2/s
3838
sigBubble = 0.069 # Surface tension of the bubble - N/m
39+
mu_g = 1.48e-5
3940

4041
# Acoustic source properties
4142
patm = 101325. # Atmospheric pressure - Pa
@@ -88,7 +89,7 @@
8889
# Simulation Algorithm Parameters ==========================
8990
'model_eqns' : 2,
9091
'time_stepper' : 3,
91-
'num_fluids' : 1,
92+
'num_fluids' : 2,
9293
'num_patches' : 1,
9394
'viscous' : 'T',
9495
'mpp_lim' : 'F',
@@ -143,7 +144,9 @@
143144
'patch_icpp(1)%vel(3)' : 0.,
144145
'patch_icpp(1)%pres' : patm/p0,
145146
'patch_icpp(1)%alpha_rho(1)' : rho_host/rho0,
147+
'patch_icpp(1)%alpha_rho(2)' : 0.,
146148
'patch_icpp(1)%alpha(1)' : 1.,
149+
'patch_icpp(1)%alpha(2)' : 0.,
147150
# ==========================================================
148151

149152
# Lagrangian Bubbles ===========================
@@ -160,26 +163,35 @@
160163
'lag_params%valmaxvoid' : 0.9,
161164
'lag_params%write_bubbles' : 'F',
162165
'lag_params%write_bubbles_stats' : 'F',
163-
'lag_params%csonhost' : c_host/c0,
164-
'lag_params%vischost' : mu_host/(rho0*x0*c0),
165-
'lag_params%Thost' : T_host/T0,
166-
'lag_params%gammagas' : gamma_g,
167-
'lag_params%gammavapor' : gamma_v,
168-
'lag_params%pvap' : pv/p0,
169-
'lag_params%cpgas' : cp_g*(T0/(c0*c0)),
170-
'lag_params%cpvapor' : cp_v*(T0/(c0*c0)),
171-
'lag_params%kgas' : k_g*(T0/(x0*rho0*c0*c0*c0)),
172-
'lag_params%kvapor' : k_v*(T0/(x0*rho0*c0*c0*c0)),
173-
'lag_params%Rgas' : (R_uni/MW_g)*(T0/(c0*c0)),
174-
'lag_params%Rvapor' : (R_uni/MW_v)*(T0/(c0*c0)),
175-
'lag_params%diffcoefvap' : diffVapor/(x0*c0),
176-
'lag_params%sigmabubble' : sigBubble/(rho0*x0*c0*c0),
166+
'lag_params%c0' : c0,
167+
'lag_params%rho0' : rho0,
168+
'lag_params%T0' : T0,
169+
'lag_params%x0' : x0,
170+
'lag_params%diffcoefvap' : diffVapor,
171+
'lag_params%Thost' : T_host,
177172
# ==========================================================
178173

179174
# Fluids Physical Parameters ===============================
175+
# Host medium
180176
'fluid_pp(1)%gamma' : 1.0/(gamma_host-1.0),
181177
'fluid_pp(1)%pi_inf' : gamma_host*(pi_inf_host/p0)/(gamma_host-1.0),
182178
'fluid_pp(1)%Re(1)' : 1.0/(mu_host/(rho0*c0*x0)),
179+
'fluid_pp(1)%mul0' : mu_host,
180+
'fluid_pp(1)%ss' : sigBubble,
181+
'fluid_pp(1)%pv' : pv,
182+
'fluid_pp(1)%gamma_v' : gamma_v,
183+
'fluid_pp(1)%M_v' : MW_v,
184+
'fluid_pp(1)%k_v' : k_v,
185+
'fluid_pp(1)%cp_v' : cp_v,
186+
187+
# Bubble gas state
188+
'fluid_pp(2)%gamma' : 1./(gamma_g-1.),
189+
'fluid_pp(2)%pi_inf' : 0.0E+00,
190+
'fluid_pp(2)%Re(1)' : 1.0/(mu_g/(rho0*c0*x0)),
191+
'fluid_pp(2)%gamma_v' : gamma_g,
192+
'fluid_pp(2)%M_v' : MW_g,
193+
'fluid_pp(2)%k_v' : k_g,
194+
'fluid_pp(2)%cp_v' : cp_g,
183195
# ==========================================================
184196
}))
185197

0 commit comments

Comments
 (0)