Skip to content

Commit 8f6502a

Browse files
authored
update regression tests to use pressure initialization (#115)
* update regression tests to use pressure initialization * sloshing tank changes: - solver parameters that work - use option to turn on pressure init - turn off force cfl * merge conflict
1 parent 10548be commit 8f6502a

File tree

7 files changed

+16
-14
lines changed

7 files changed

+16
-14
lines changed

test/test_files/flat-surface/flat-surface-nalu.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,14 @@ realms:
5959
target_name: block_1
6060
user_function_name:
6161
volume_of_fluid: sloshing_tank
62+
pressure: sloshing_tank
6263
user_function_parameters:
6364
volume_of_fluid: [-0.1015625, 0.0, 0.25, 0.03]
65+
pressure: [-0.1015625, 0.0, 0.25, 0.03, 0.5]
6466

6567
- constant: ic_1
6668
target_name: block_1
6769
value:
68-
pressure: 0.0
6970
velocity: [0.0, 0.0, 0.0]
7071

7172
material_properties:

test/test_files/linear-waves/linear-waves-amr.inp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ OceanWaves.Wave1.numerical_beach_length=1.0
4242
OceanWaves.Wave1.numerical_beach_length_factor=2.0
4343
MultiPhase.density_fluid1=1000.
4444
MultiPhase.density_fluid2=1.
45+
MultiPhase.initialize_pressure = true
4546
ICNS.source_terms = GravityForcing
4647

4748
incflo.initial_iterations = 0
@@ -70,18 +71,9 @@ geometry.is_periodic = 0 1 0 # Periodicity x y z (0/1)
7071

7172
xlo.type = "slip_wall"
7273
xhi.type = "slip_wall"
73-
xlo.vof_type = "zero_gradient"
74-
xhi.vof_type = "zero_gradient"
75-
xlo.density_type = "zero_gradient"
76-
xhi.density_type = "zero_gradient"
77-
7874
zlo.type = "slip_wall"
7975
zhi.type = "slip_wall"
80-
zlo.vof_type = "zero_gradient"
81-
zhi.vof_type = "zero_gradient"
82-
zlo.density_type = "zero_gradient"
83-
zhi.density_type = "zero_gradient"
8476

8577
incflo.verbose=0
8678

87-
amrex.the_arena_init_size = 0
79+
amrex.the_arena_init_size = 0

test/test_files/linear-waves/linear-waves-nalu.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,14 @@ realms:
5959
target_name: block_1
6060
user_function_name:
6161
volume_of_fluid: sloshing_tank
62+
pressure: sloshing_tank
6263
user_function_parameters:
6364
volume_of_fluid: [0.015625, 0.0, 0.25, 0.06]
65+
pressure: [0.015625, 0.0, 0.25, 0.06, 0.6]
6466

6567
- constant: ic_1
6668
target_name: block_1
6769
value:
68-
pressure: 0.0
6970
velocity: [0.0, 0.0, 0.0]
7071

7172
material_properties:

test/test_files/sloshing-tank/sloshing-tank-amr.inp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ time.initial_dt = -0.05 # Use this constant dt if > 0
55
time.fixed_dt = 0.01
66
time.cfl = 0.95 # CFL factor
77
time.plot_interval = 10 # Steps between plot files
8+
time.use_force_cfl= false
89
incflo.do_initial_proj = 0
910
incflo.initial_iterations = 0
1011

@@ -20,8 +21,11 @@ turbulence.model = Laminar
2021

2122
nodal_proj.mg_rtol = 1.0e-12
2223
nodal_proj.mg_atol = 1.0e-12
24+
nodal_proj.bottom_atol = 1e-14
25+
nodal_proj.max_coarsening_level = 0
2326
mac_proj.mg_rtol = 1.0e-12
2427
mac_proj.mg_atol = 1.0e-12
28+
mac_proj.bottom_atol = 1e-14
2529
mac_proj.max_coarsening_level = 2
2630

2731
incflo.physics = MultiPhase SloshingTank
@@ -31,6 +35,7 @@ MultiPhase.water_level=0.0
3135
SloshingTank.amplitude=0.7
3236
SloshingTank.peak_enhance=1.5
3337
SloshingTank.water_level=0.0
38+
SloshingTank.initialize_pressure = true
3439
ICNS.source_terms = GravityForcing
3540

3641
# Target resolution at interface is dx = dy = 0.3125, dz = 0.125

test/test_files/sloshing-tank/sloshing-tank-nalu.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,14 @@ realms:
5959
target_name: block_1
6060
user_function_name:
6161
volume_of_fluid: sloshing_tank
62+
pressure: sloshing_tank
6263
user_function_parameters:
6364
volume_of_fluid: [0., 0.7, 1.5, 0.06]
65+
pressure: [0., 0.7, 1.5, 0.06, 1.5]
6466

6567
- constant: ic_1
6668
target_name: block_1
6769
value:
68-
pressure: 0.0
6970
velocity: [0.0, 0.0, 0.0]
7071

7172
material_properties:

test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-amr.inp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ OceanWaves.Wave1.numerical_beach_length_factor=2.0
3333
OceanWaves.Wave1.zero_sea_level=0.0
3434
MultiPhase.density_fluid1=1000.
3535
MultiPhase.density_fluid2=1.
36+
MultiPhase.initialize_pressure=true
3637
ICNS.source_terms = GravityForcing
3738

3839
ICNS.use_perturb_pressure = true

test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,15 @@ realms:
5959
target_name: oset
6060
user_function_name:
6161
volume_of_fluid: sloshing_tank
62+
pressure: sloshing_tank
6263
user_function_parameters:
6364
volume_of_fluid: [0.0, 0.0, 0.25, 0.1]
65+
pressure: [0.0, 0.0, 0.25, 0.1, 2.]
6466

6567
- constant: ic_1
6668
target_name: oset
6769
value:
6870
velocity: [0.0, 0.0, 0.0]
69-
pressure: 0.0
7071

7172
material_properties:
7273
target_name: oset

0 commit comments

Comments
 (0)