Skip to content

Commit 80aced0

Browse files
committed
updated acoustic wave IC to run
there is still a bug with the IO
1 parent 513db6b commit 80aced0

File tree

2 files changed

+19
-46
lines changed

2 files changed

+19
-46
lines changed

RKLM_Python/inputs/acoustic_wave_high.py

+18-45
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,9 @@ def __init__(self):
9393
self.zmin = - 1.0
9494
self.zmax = 1.0
9595

96-
self.wind_speed = 1.0 / self.u_ref
97-
self.wind_shear = -0.0
98-
self.hill_shape = HillShapes.AGNESI
99-
self.hill_height = 0.0 * 0.096447
100-
self.hill_length_scale = 0.1535
96+
self.u_wind_speed = 0.0 / self.u_ref
97+
self.v_wind_speed = 0.0 / self.u_ref
98+
self.w_wind_speed = 0.0 / self.u_ref
10199

102100
# self.xmin = - 5000. / self.h_ref
103101
# self.xmax = 5000. / self.h_ref
@@ -126,23 +124,14 @@ def __init__(self):
126124
self.bdry_type[1] = BdryType.PERIODIC
127125
self.bdry_type[2] = BdryType.WALL
128126

129-
self.absorber = False # 0 == WRONG == FALSE
130-
self.bottom_theta_bc = BottomBC.BOTTOM_BC_DEFAULT
131-
132127
##########################################
133128
# NUMERICS
134129
##########################################
135-
136-
self.time_integrator = TimeIntegrator.SI_MIDPT
137-
self.advec_time_integrator = TimeIntegrator.STRANG
138130
# self.CFL = 77.0
139131
self.CFL = 0.45
140132
self.dtfixed0 = 0.0000668205
141133
self.dtfixed = 0.0000668205
142134

143-
# self.tips = TimeIntegratorParams()
144-
# SetTimeIntegratorParameters(self)
145-
146135
# self.inx = 64+1
147136
# self.iny = 32+1
148137
self.inx = 64+1
@@ -153,51 +142,33 @@ def __init__(self):
153142
self.limiter_type_scalars = LimiterType.NONE
154143
self.limiter_type_velocity = LimiterType.NONE
155144

156-
self.kp = 1.4
157-
self.kz = 1.4
158-
self.km = 1.4
159-
self.kY = 1.4
160-
self.kZ = 1.4
145+
self.tol = 1.e-8
146+
self.max_iterations = 1000
161147

162-
self.ncache = 175
163-
164-
tol = 1.e-8
165148

149+
self.blending_weight = 0./16
150+
self.blending_mean = 'rhoY' # 1.0, rhoY
151+
self.blending_conv = 'rho' # theta, rho
152+
self.blending_type = 'half'
153+
166154
self.continuous_blending = False
167-
self.no_of_pi_initial = 20
168-
self.no_of_pi_transition = 20
155+
self.initial_blending = False
156+
self.no_of_pi_initial = 0
157+
self.no_of_pi_transition = 0
169158
self.no_of_hy_initial = 0
170159
self.no_of_hy_transition = 0
171160

172-
self.flux_correction_precision = tol
173-
self.flux_correction_local_precision = tol
174-
self.second_projection_precision = tol
175-
self.second_projection_local_precision = tol
176-
self.flux_correction_max_iterations = 6000
177-
self.second_projection_max_iterations = 6000
178-
179161
self.initial_projection = False
180-
self.initial_impl_Euler = False
181-
182-
self.column_preconditionr = True
183-
self.synchronize_nodal_pressure = False
184-
self.synchronize_weight = 0.0
185-
186-
self.eps_Machine = np.sqrt(np.finfo(np.float).eps)
187162

188163
# self.tout[0] = 0.00267282
189164
# self.tout = [0.00267282]
190165
# self.tout = np.arange(0.0,0.00267282,2.5e-5)
191-
self.tout = np.arange(0.0,0.002+2.5e-5,2.5e-5)
166+
self.tout = np.arange(0.0,0.002+2.5e-5,2.5e-5)[1:]
192167
# self.tout[1] = -1.0
193168

194169
self.stepmax = 999
195170

196-
self.write_stdout = True
197-
self.write_stdout_period = 1
198-
self.write_file = True
199-
self.write_file_period = 40
200-
self.file_format = 'HDF'
171+
self.output_timesteps = False
201172

202173
self.output_base_name = "_acoustic_wave"
203174
self.output_name_psinc = "_low_mach_gravity_psinc"
@@ -208,6 +179,8 @@ def __init__(self):
208179
self.output_suffix = "_%i_%i_%.5f_psinc" %(self.inx-1,self.iny-1,self.tout[-1])
209180
if self.continuous_blending == True:
210181
self.output_suffix = "_%i_%i_%.5f" %(self.inx-1,self.iny-1,self.tout[-1])
182+
183+
self.aux = 'test'
211184

212185
self.stratification = self.stratification_function
213186

@@ -218,7 +191,7 @@ def stratification_function(self, y):
218191
return np.ones((y.shape))
219192

220193
def sol_init(Sol, mpv, elem, node, th, ud):
221-
u0 = ud.wind_speed
194+
u0 = ud.u_wind_speed
222195
v0 = 0.0
223196
w0 = 0.0
224197
del0 = 0.05

RKLM_Python/run.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
class run_params(object):
1010
N = 1
11-
tc = 'rb'
11+
tc = 'aw'
1212

1313
def __init__(self):
1414
self.N = self.N

0 commit comments

Comments
 (0)