From 98f39c915e36a770cffbb7d3deb855dc377c06f6 Mon Sep 17 00:00:00 2001 From: Michael B Kuhn <31661049+mbkuhn@users.noreply.github.com> Date: Sun, 12 Jan 2025 09:20:01 -0700 Subject: [PATCH] Multiphase reg test updates (#92) --- .../dam-break-block/dam-break-block-amr.inp | 14 +++--------- .../flat-surface/flat-surface-amr.inp | 7 +----- .../linear-waves/linear-waves-amr.inp | 7 +++--- .../test_files/linear-waves/linear-waves.yaml | 2 +- .../sloshing-tank/sloshing-tank-amr.inp | 9 +++----- .../stokes-waves-cylinder-amr.inp | 22 ++++++++++--------- test/test_files/zalesak/zalesak-amr.inp | 2 -- 7 files changed, 23 insertions(+), 40 deletions(-) diff --git a/test/test_files/dam-break-block/dam-break-block-amr.inp b/test/test_files/dam-break-block/dam-break-block-amr.inp index 9ec3635..5433c9d 100644 --- a/test/test_files/dam-break-block/dam-break-block-amr.inp +++ b/test/test_files/dam-break-block/dam-break-block-amr.inp @@ -14,10 +14,10 @@ incflo.godunov_type = "weno_z" transport.model = TwoPhaseTransport transport.viscosity_fluid1=1.e-5 transport.viscosity_fluid2=1.e-5 +turbulence.model = Laminar -transport.laminar_prandtl = 0.7 -transport.turbulent_prandtl = 0.3333 -turbulence.model = Laminar +nodal_proj.max_coarsening_level = 0 +mac_proj.max_coarsening_level = 2 incflo.physics = MultiPhase DamBreak MultiPhase.density_fluid1=1000. @@ -34,9 +34,6 @@ geometry.prob_lo = -1.4 -0.375 -0.3125 # Lo corner coordinates geometry.prob_hi = 1.1 0.375 1.1875 # Hi corner coordinates geometry.is_periodic = 0 0 0 # Periodicity x y z (0/1) -Overset.disable_coupled_mac_proj = true -Overset.disable_coupled_nodal_proj = true - xlo.type = "slip_wall" xlo.vof_type = "zero_gradient" xhi.type = "slip_wall" @@ -54,8 +51,3 @@ zhi.vof_type = "mass_inflow" zhi.vof = 0.0 incflo.verbose=0 - -nodal_proj.num_pre_smooth = 20 -nodal_proj.num_post_smooth = 20 -mac_proj.num_pre_smooth = 20 -mac_proj.num_post_smooth = 20 diff --git a/test/test_files/flat-surface/flat-surface-amr.inp b/test/test_files/flat-surface/flat-surface-amr.inp index 1c054f9..2b0ae77 100644 --- a/test/test_files/flat-surface/flat-surface-amr.inp +++ b/test/test_files/flat-surface/flat-surface-amr.inp @@ -16,8 +16,6 @@ incflo.godunov_type="weno_z" transport.model = TwoPhaseTransport transport.viscosity_fluid1=1e-5 transport.viscosity_fluid2=1e-5 -transport.laminar_prandtl = 0.7 -transport.turbulent_prandtl = 0.3333 turbulence.model = Laminar incflo.physics = MultiPhase SloshingTank @@ -29,11 +27,8 @@ SloshingTank.water_level =-0.1015625 ICNS.source_terms = GravityForcing ICNS.use_perturb_pressure = false -VOF.replace_masked = true - -Overset.disable_coupled_mac_proj = true -Overset.disable_coupled_nodal_proj = true Overset.verbose = 1 +nodal_proj.max_coarsening_level = 2 amr.n_cell = 64 64 64 # Grid cells at coarsest AMRlevel amr.max_level = 0 diff --git a/test/test_files/linear-waves/linear-waves-amr.inp b/test/test_files/linear-waves/linear-waves-amr.inp index 2ce958d..fab9f36 100644 --- a/test/test_files/linear-waves/linear-waves-amr.inp +++ b/test/test_files/linear-waves/linear-waves-amr.inp @@ -28,8 +28,6 @@ incflo.mflux_type="minmod" transport.model = TwoPhaseTransport transport.viscosity_fluid1=1e-3 transport.viscosity_fluid2=1e-5 -transport.laminar_prandtl = 0.7 -transport.turbulent_prandtl = 0.3333 turbulence.model = Laminar incflo.physics = MultiPhase OceanWaves @@ -48,8 +46,9 @@ ICNS.source_terms = GravityForcing incflo.initial_iterations = 0 incflo.do_initial_proj = false -Overset.disable_coupled_mac_proj = true -Overset.disable_coupled_nodal_proj = true +incflo.diffusion_type = 0 +nodal_proj.max_coarsening_level = 2 +mac_proj.max_coarsening_level = 6 MultiPhase.verbose=0 #¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨# diff --git a/test/test_files/linear-waves/linear-waves.yaml b/test/test_files/linear-waves/linear-waves.yaml index e64501c..e516f24 100644 --- a/test/test_files/linear-waves/linear-waves.yaml +++ b/test/test_files/linear-waves/linear-waves.yaml @@ -3,7 +3,7 @@ exawind: nalu_wind_inp: - linear-waves-nalu.yaml amr_wind_inp: linear-waves-amr.inp - num_timesteps: 5 + num_timesteps: 3 additional_picard_iterations: 2 nalu_vars: diff --git a/test/test_files/sloshing-tank/sloshing-tank-amr.inp b/test/test_files/sloshing-tank/sloshing-tank-amr.inp index 37cc281..a00e84d 100644 --- a/test/test_files/sloshing-tank/sloshing-tank-amr.inp +++ b/test/test_files/sloshing-tank/sloshing-tank-amr.inp @@ -8,9 +8,6 @@ time.plot_interval = 10 # Steps between plot files incflo.do_initial_proj = 0 incflo.initial_iterations = 0 -Overset.disable_coupled_mac_proj = true -Overset.disable_coupled_nodal_proj = true - io.outputs = density vof velocity p gp levelset io.int_outputs = iblank_cell @@ -19,10 +16,11 @@ incflo.godunov_type="weno_z" transport.model = TwoPhaseTransport transport.viscosity_fluid1=1e-5 transport.viscosity_fluid2=1e-5 -transport.laminar_prandtl = 0.7 -transport.turbulent_prandtl = 0.3333 turbulence.model = Laminar +mac_proj.max_coarsening_level = 2 +nodal_proj.max_coarsening_level = 2 + incflo.physics = MultiPhase SloshingTank MultiPhase.density_fluid1=1000. MultiPhase.density_fluid2=1. @@ -31,7 +29,6 @@ SloshingTank.amplitude=0.7 SloshingTank.peak_enhance=1.5 SloshingTank.water_level=0.0 ICNS.source_terms = GravityForcing -VOF.replace_masked = true # Target resolution at interface is dx = dy = 0.3125, dz = 0.125 amr.n_cell = 64 64 48 # Grid cells at coarsest AMRlevel diff --git a/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-amr.inp b/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-amr.inp index 127f766..920ed69 100644 --- a/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-amr.inp +++ b/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-amr.inp @@ -15,8 +15,6 @@ incflo.use_godunov = 1 incflo.godunov_type="weno_z" incflo.diffusion_type = 0 transport.model = TwoPhaseTransport -transport.laminar_prandtl = 0.7 -transport.turbulent_prandtl = 0.3333 turbulence.model = Laminar transport.viscosity_fluid1=1e-3 @@ -29,8 +27,8 @@ OceanWaves.Wave1.order=5 OceanWaves.Wave1.wave_height=0.3327 # nominal: 0.37 OceanWaves.Wave1.wave_period=1.536 # nominal: 1.533 OceanWaves.Wave1.water_depth=10.0 -OceanWaves.Wave1.relax_zone_gen_length=4.801496963 -OceanWaves.Wave1.numerical_beach_length=9.602993926 +OceanWaves.Wave1.relax_zone_gen_length=3.0 +OceanWaves.Wave1.numerical_beach_length=3.0 OceanWaves.Wave1.numerical_beach_length_factor=2.0 OceanWaves.Wave1.zero_sea_level=0.0 MultiPhase.density_fluid1=1000. @@ -39,15 +37,19 @@ ICNS.source_terms = GravityForcing ICNS.use_perturb_pressure = true ICNS.reconstruct_true_pressure = true -VOF.replace_masked = true -Overset.disable_coupled_mac_proj = true -Overset.disable_coupled_nodal_proj = true -amr.n_cell = 128 48 56 +mac_proj.num_pre_smooth = 8 +mac_proj.num_post_smooth = 8 +mac_proj.bottom_solver = hypre +nodal_proj.max_coarsening_level = 1 +nodal_proj.num_pre_smooth = 8 +nodal_proj.num_post_smooth = 8 + +amr.n_cell = 64 32 48 amr.max_level = 1 -geometry.prob_lo = -9.602993926 -5.25 -10.0 # Lo corner coordinates -geometry.prob_hi = 19.205987852 5.25 2.4007484815 # Hi corner coordinates +geometry.prob_lo = -6 -5 -10.0 # Lo corner coordinates +geometry.prob_hi = 14 5 5 # Hi corner coordinates geometry.is_periodic = 0 0 0 # Periodicity x y z (0/1) tagging.labels = refine0 diff --git a/test/test_files/zalesak/zalesak-amr.inp b/test/test_files/zalesak/zalesak-amr.inp index d38cb88..e6eb7f1 100644 --- a/test/test_files/zalesak/zalesak-amr.inp +++ b/test/test_files/zalesak/zalesak-amr.inp @@ -28,8 +28,6 @@ incflo.godunov_type = "weno" transport.model = TwoPhaseTransport transport.viscosity_fluid1=0.0 transport.viscosity_fluid2=0.0 -transport.laminar_prandtl = 0.7 -transport.turbulent_prandtl = 0.3333 turbulence.model = Laminar incflo.physics = MultiPhase ZalesakDisk