From 7a2fc4973d9db292a022f553fa50a03838b277a1 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Tue, 11 Jun 2024 13:29:58 -0600 Subject: [PATCH 1/9] update meshes repository for new tests --- test/meshes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/meshes b/test/meshes index 229215a..7ee683b 160000 --- a/test/meshes +++ b/test/meshes @@ -1 +1 @@ -Subproject commit 229215ac3752fc5a680eb4888094f12c667e9b53 +Subproject commit 7ee683b02412ba35e64144702feb33228acd2fd7 From 1d7af984cc9b737b585cced015d7764727466a9e Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Tue, 11 Jun 2024 13:32:03 -0600 Subject: [PATCH 2/9] add input files, include reg tests --- test/CMakeLists.txt | 2 + .../dam-break-block/dam-break-block-amr.inp | 61 +++++++ .../dam-break-block/dam-break-block-nalu.yaml | 146 ++++++++++++++++ .../dam-break-block/dam-break-block.yaml | 19 ++ .../stokes-waves-cylinder-amr.inp | 77 +++++++++ .../stokes-waves-cylinder-nalu.yaml | 163 ++++++++++++++++++ .../stokes-waves-cylinder.yaml | 19 ++ 7 files changed, 487 insertions(+) create mode 100644 test/test_files/dam-break-block/dam-break-block-amr.inp create mode 100644 test/test_files/dam-break-block/dam-break-block-nalu.yaml create mode 100644 test/test_files/dam-break-block/dam-break-block.yaml create mode 100644 test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-amr.inp create mode 100644 test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml create mode 100644 test/test_files/stokes-waves-cylinder/stokes-waves-cylinder.yaml diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 458652c..acd13a5 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -63,4 +63,6 @@ add_test_r(nalu-nalu-cylinder-motion) add_test_r(amr-nalu-cylinder-motion) add_test_r(zalesak) add_test_r(hybrid-multi-cylinder) +add_test_r(stokes-waves-cylinder) +add_test_r(dam-break-block) 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 new file mode 100644 index 0000000..904374e --- /dev/null +++ b/test/test_files/dam-break-block/dam-break-block-amr.inp @@ -0,0 +1,61 @@ +time.stop_time = 2 # Max (simulated) time to evolve +time.max_step = 2000 # Max number of time steps + +time.fixed_dt = 0.001 # Use this constant dt if > 0 +time.cfl = 0.95 # CFL factor + +time.plot_interval = 10 # Steps between plot files +time.checkpoint_interval = -100 # Steps between checkpoint files + +io.int_outputs = iblank_cell + +incflo.use_godunov = 1 +incflo.godunov_type = "weno_z" +transport.model = TwoPhaseTransport +transport.viscosity_fluid1=1.e-5 +transport.viscosity_fluid2=1.e-5 + +transport.laminar_prandtl = 0.7 +transport.turbulent_prandtl = 0.3333 +turbulence.model = Laminar + +incflo.physics = MultiPhase DamBreak +MultiPhase.density_fluid1=1000. +MultiPhase.density_fluid2=1. +DamBreak.location = -0.8 0.0 -0.3125 +DamBreak.width = 0.5 +DamBreak.height = 0.8 +ICNS.source_terms = GravityForcing + +amr.n_cell = 64 16 32 # Grid cells at coarsest AMRlevel +amr.max_level = 0 # Max AMR level in hierarchy + +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" +xhi.vof_type = "zero_gradient" + +ylo.type = "slip_wall" +ylo.vof_type = "zero_gradient" +yhi.type = "slip_wall" +yhi.vof_type = "zero_gradient" + +zlo.type = "slip_wall" +zlo.vof_type = "zero_gradient" +zhi.type = "slip_wall" +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/dam-break-block/dam-break-block-nalu.yaml b/test/test_files/dam-break-block/dam-break-block-nalu.yaml new file mode 100644 index 0000000..89a4b7b --- /dev/null +++ b/test/test_files/dam-break-block/dam-break-block-nalu.yaml @@ -0,0 +1,146 @@ +Simulations: + - name: sim1 + time_integrator: ti_1 + optimizer: opt1 + +linear_solvers: + + - name: solve_scalar + type: tpetra + method: gmres + preconditioner: sgs + tolerance: 1e-12 + max_iterations: 50 + kspace: 50 + output_level: 0 + + - name: solve_cont + type: hypre + method: hypre_gmres + preconditioner: boomerAMG + tolerance: 1e-5 + max_iterations: 200 + kspace: 5 + output_level: 0 + +realms: + + - name: realm_1 + mesh: ../../meshes/block_within_cube.exo + use_edges: yes + automatic_decomposition_type: rcb + check_for_missing_bcs: yes + + equation_systems: + name: theEqSys + max_iterations: 3 + decoupled_overset_solve: yes + + solver_system_specification: + volume_of_fluid: solve_scalar + velocity: solve_scalar + pressure: solve_cont + + systems: + - VolumeOfFluid: + name: myVOF + max_iterations: 1 + convergence_tolerance: 1e-8 + - LowMachEOM: + name: myLowMach + max_iterations: 1 + convergence_tolerance: 1e-8 + + initial_conditions: + + - user_function: ic_1 + target_name: fluid-HEX + user_function_name: + pressure: sloshing_tank + user_function_parameters: + pressure: [-100, 0.0, 0.25, 0.05, 1.1875] + + - constant: ic_1 + target_name: fluid-HEX + value: + volume_of_fluid: 0.0 + velocity: [0.0, 0.0, 0.0] + + material_properties: + target_name: fluid-HEX + specifications: + - name: density + type: volume_of_fluid + primary_value: 1000.0 + secondary_value: 1. + + - name: viscosity + type: constant + value: 1.0e-5 + + boundary_conditions: + + - wall_boundary_condition: bc_wall + target_name: block + wall_user_data: + velocity: [0.0, 0.0, 0.0] + - overset_boundary_condition: bc_overset + overset_connectivity_type: tioga + overset_user_data: + mesh_group: + - overset_name: oset_n + mesh_parts: [fluid-HEX] + wall_parts: [block] + ovset_parts: [ovst_bdy] + + solution_options: + name: myOptions + use_balanced_buoyancy_force: yes + + options: + - hybrid_factor: + velocity: 0.05 + volume_of_fluid: 0.0 + + - upw_factor: + velocity: 0.0 + + - limiter: + volume_of_fluid: yes + + - consistent_mass_matrix_png: + pressure: no + + - source_terms: + momentum: + - buoyancy + + - user_constants: + reference_density: 0.00 + gravity: [0.0, 0.0, -9.81] + + output: + output_data_base_name: out/damBreak.e + output_frequency: 10 + output_node_set: yes + output_variables: + - density + - volume_of_fluid + - velocity + - pressure + - dvolume_of_fluiddx + - dpressuredx + - iblank +Time_Integrators: + - StandardTimeIntegrator: + name: ti_1 + start_time: 0.0 + termination_time: 2.0 + time_step: 0.001 + time_stepping_type: fixed + time_step_count: 0 + second_order_accuracy: yes + + + realms: + - realm_1 diff --git a/test/test_files/dam-break-block/dam-break-block.yaml b/test/test_files/dam-break-block/dam-break-block.yaml new file mode 100644 index 0000000..6a55b25 --- /dev/null +++ b/test/test_files/dam-break-block/dam-break-block.yaml @@ -0,0 +1,19 @@ + +exawind: + nalu_wind_inp: + - dam-break-block-nalu.yaml + amr_wind_inp: dam-break-block-amr.inp + num_timesteps: 2000 + additional_picard_iterations: 2 + + nalu_vars: + - volume_of_fluid + - velocity + - density + - pressure + amr_cell_vars: + - vof + - velocity + - density + amr_node_vars: + - p 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 new file mode 100644 index 0000000..49e0107 --- /dev/null +++ b/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-amr.inp @@ -0,0 +1,77 @@ +time.stop_time = 200 # Max (simulated) time to evolve +time.max_step = -10 # Max number of time steps + +time.initial_dt = -0.05 # Use this constant dt if > 0 +time.fixed_dt = 0.01 +time.cfl = 0.5 # CFL factor +time.plot_interval = 20 # Steps between plot files +time.checkpoint_interval = 500 +incflo.do_initial_proj = 0 +incflo.initial_iterations = 0 + +io.outputs = density vof velocity p gp levelset reference_pressure ow_velocity ow_levelset +io.int_outputs = iblank_cell iblank_node + +incflo.use_godunov = 1 +incflo.godunov_type="weno_z" +transport.model = TwoPhaseTransport +transport.laminar_prandtl = 0.7 +transport.turbulent_prandtl = 0.3333 +turbulence.model = Laminar + +transport.viscosity_fluid1=1e-3 +transport.viscosity_fluid2=1e-5 + +incflo.physics = MultiPhase OceanWaves +OceanWaves.label = Wave1 +OceanWaves.Wave1.type = StokesWaves +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.numerical_beach_lfactor=2.0 +OceanWaves.Wave1.zero_sea_level=0.0 +MultiPhase.density_fluid1=1000. +MultiPhase.density_fluid2=1. +MultiPhase.initialize_pressure=true +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 +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.is_periodic = 0 0 0 # Periodicity x y z (0/1) + +tagging.labels = refine0 +tagging.refine0.type = GeometryRefinement +tagging.refine0.shapes = c0 b0 +tagging.refine0.level = 0 + +tagging.refine0.c0.type = cylinder +tagging.refine0.c0.start = 0.0 0.0 -2.0 +tagging.refine0.c0.end = 0.0 0.0 1.5 +tagging.refine0.c0.outer_radius = 0.5 + +tagging.refine0.b0.type = box +tagging.refine0.b0.origin = -10.0 -5.5 -0.5 +tagging.refine0.b0.xaxis = 30.0 0.0 0.0 +tagging.refine0.b0.yaxis = 0.0 11.0 0.0 +tagging.refine0.b0.zaxis = 0.0 0.0 1.0 + +xlo.type = "wave_generation" +xhi.type = "pressure_outflow" +ylo.type = "slip_wall" +yhi.type = "slip_wall" +zlo.type = "slip_wall" +zhi.type = "slip_wall" + +incflo.verbose = 0 # incflo_level \ No newline at end of file diff --git a/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml b/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml new file mode 100644 index 0000000..24547bf --- /dev/null +++ b/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml @@ -0,0 +1,163 @@ +Simulations: + - name: sim1 + time_integrator: ti_1 + optimizer: opt1 + +linear_solvers: + + - name: solve_scalar + type: tpetra + method: gmres + preconditioner: sgs + tolerance: 1e-12 + max_iterations: 50 + kspace: 50 + output_level: 0 + + - name: solve_cont + type: hypre + method: hypre_gmres + preconditioner: boomerAMG + tolerance: 1e-5 + max_iterations: 200 + kspace: 5 + output_level: 0 + +realms: + + - name: realm_1 + mesh: ../../meshes/cylinder_oc5diam_medium.e + use_edges: yes + automatic_decomposition_type: rcb + check_for_missing_bcs: yes + + equation_systems: + name: theEqSys + max_iterations: 3 + decoupled_overset_solve: yes + + solver_system_specification: + volume_of_fluid: solve_scalar + velocity: solve_scalar + pressure: solve_cont + + systems: + - VolumeOfFluid: + name: myVOF + max_iterations: 1 + convergence_tolerance: 1e-8 + - LowMachEOM: + name: myLowMach + max_iterations: 1 + convergence_tolerance: 1e-8 + + initial_conditions: + + - user_function: ic_1 + target_name: oset + user_function_name: + volume_of_fluid: sloshing_tank + pressure: sloshing_tank + user_function_parameters: + volume_of_fluid: [0.0, 0.0, 0.25, 0.1] + pressure: [0.0, 0.0, 0.25, 0.1, 2.4007484815] + + - constant: ic_1 + target_name: oset + value: + velocity: [0.0, 0.0, 0.0] + + material_properties: + target_name: oset + specifications: + - name: density + type: volume_of_fluid + primary_value: 1000.0 + secondary_value: 1. + + - name: viscosity + type: volume_of_fluid + primary_value: 1.0e-3 + secondary_value: 1.0e-5 + + boundary_conditions: + + - wall_boundary_condition: bc_wall + target_name: surface_2 + wall_user_data: + velocity: [0.0, 0.0, 0.0] + + - overset_boundary_condition: bc_overset + overset_connectivity_type: tioga + overset_user_data: + mesh_group: + - overset_name: oset_n + mesh_parts: [oset] + wall_parts: [surface_2] + ovset_parts: [surface_1] + + solution_options: + name: myOptions + use_balanced_buoyancy_force: no + + options: + - hybrid_factor: + velocity: 0.05 + volume_of_fluid: 0.0 + + - upw_factor: + velocity: 0.0 + + - limiter: + volume_of_fluid: yes + + - consistent_mass_matrix_png: + pressure: no + + - source_terms: + momentum: + - buoyancy + + - user_constants: + reference_density: 0.00 + gravity: [0.0, 0.0, -9.81] + + post_processing: + - type: surface + physics: surface_force_and_moment + output_file_name: cylinder_forces.dat + frequency: 5 + parameters: [0, 0, 0] + target_name: + - surface_2 + + output: + output_data_base_name: out/stokesWavesCylinder.e + output_frequency: 20 + output_node_set: yes + output_variables: + - density + - volume_of_fluid + - velocity + - pressure + - dvolume_of_fluiddx + - dpressuredx + - iblank + + restart: + restart_data_base_name: rst/stokesWavesCylinder.rst + restart_frequency: 500 + +Time_Integrators: + - StandardTimeIntegrator: + name: ti_1 + start_time: 0.0 + termination_time: 200.0 + time_step: 0.01 + time_stepping_type: fixed + time_step_count: 0 + second_order_accuracy: yes + + + realms: + - realm_1 diff --git a/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder.yaml b/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder.yaml new file mode 100644 index 0000000..d1508b3 --- /dev/null +++ b/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder.yaml @@ -0,0 +1,19 @@ + +exawind: + nalu_wind_inp: + - stokes-waves-cylinder-nalu.yaml + amr_wind_inp: stokes-waves-cylinder-amr.inp + num_timesteps: 5000 + additional_picard_iterations: 1 + + nalu_vars: + - volume_of_fluid + - velocity + - density + - pressure + amr_cell_vars: + - vof + - velocity + - density + amr_node_vars: + - p From 0bad52a56dc56e6b3705c33f95fc78f114de0a6c Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Tue, 11 Jun 2024 13:32:13 -0600 Subject: [PATCH 3/9] update git ignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 06b3fdb..66982fc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ spack* compile_commands.json .cache +.vscode +build* \ No newline at end of file From 1f5cfb6f7c95e2e5f4daeddb5ee9c1d15b981207 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Tue, 30 Jul 2024 07:26:13 -0600 Subject: [PATCH 4/9] switch to buoyancy_density --- test/test_files/dam-break-block/dam-break-block-nalu.yaml | 2 +- .../stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_files/dam-break-block/dam-break-block-nalu.yaml b/test/test_files/dam-break-block/dam-break-block-nalu.yaml index 89a4b7b..f48bb0b 100644 --- a/test/test_files/dam-break-block/dam-break-block-nalu.yaml +++ b/test/test_files/dam-break-block/dam-break-block-nalu.yaml @@ -113,7 +113,7 @@ realms: - source_terms: momentum: - - buoyancy + - buoyancy_density - user_constants: reference_density: 0.00 diff --git a/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml b/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml index 24547bf..4d08117 100644 --- a/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml +++ b/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml @@ -116,7 +116,7 @@ realms: - source_terms: momentum: - - buoyancy + - buoyancy_density - user_constants: reference_density: 0.00 From 456898b1e7164e4837889fc8ecfbfabc3fddbda4 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Tue, 30 Jul 2024 07:26:43 -0600 Subject: [PATCH 5/9] switch to hypre solvers --- .../dam-break-block/dam-break-block-nalu.yaml | 12 ++++++------ .../stokes-waves-cylinder-nalu.yaml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/test_files/dam-break-block/dam-break-block-nalu.yaml b/test/test_files/dam-break-block/dam-break-block-nalu.yaml index f48bb0b..58985fc 100644 --- a/test/test_files/dam-break-block/dam-break-block-nalu.yaml +++ b/test/test_files/dam-break-block/dam-break-block-nalu.yaml @@ -6,12 +6,12 @@ Simulations: linear_solvers: - name: solve_scalar - type: tpetra - method: gmres - preconditioner: sgs - tolerance: 1e-12 - max_iterations: 50 - kspace: 50 + type: hypre + method: hypre_gmres + preconditioner: boomerAMG + tolerance: 1e-5 + max_iterations: 200 + kspace: 5 output_level: 0 - name: solve_cont diff --git a/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml b/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml index 4d08117..0cf3628 100644 --- a/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml +++ b/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml @@ -6,12 +6,12 @@ Simulations: linear_solvers: - name: solve_scalar - type: tpetra - method: gmres - preconditioner: sgs - tolerance: 1e-12 - max_iterations: 50 - kspace: 50 + type: hypre + method: hypre_gmres + preconditioner: boomerAMG + tolerance: 1e-5 + max_iterations: 200 + kspace: 5 output_level: 0 - name: solve_cont From a64e58b1bdc9d03390b029fb2faf99da4aec6505 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Fri, 2 Aug 2024 11:02:08 -0600 Subject: [PATCH 6/9] correct meshes location for ctest --- test/test_files/dam-break-block/dam-break-block-nalu.yaml | 2 +- .../stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_files/dam-break-block/dam-break-block-nalu.yaml b/test/test_files/dam-break-block/dam-break-block-nalu.yaml index 58985fc..16c3747 100644 --- a/test/test_files/dam-break-block/dam-break-block-nalu.yaml +++ b/test/test_files/dam-break-block/dam-break-block-nalu.yaml @@ -26,7 +26,7 @@ linear_solvers: realms: - name: realm_1 - mesh: ../../meshes/block_within_cube.exo + mesh: meshes/block_within_cube.exo use_edges: yes automatic_decomposition_type: rcb check_for_missing_bcs: yes diff --git a/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml b/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml index 0cf3628..6a8a271 100644 --- a/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml +++ b/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml @@ -26,7 +26,7 @@ linear_solvers: realms: - name: realm_1 - mesh: ../../meshes/cylinder_oc5diam_medium.e + mesh: meshes/cylinder_oc5diam_medium.e use_edges: yes automatic_decomposition_type: rcb check_for_missing_bcs: yes From e30ff8c2a27073a1e6b5707ad90a47c1d89695b7 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Fri, 2 Aug 2024 11:21:49 -0600 Subject: [PATCH 7/9] reducing number of timesteps and removing pressure user function --- test/test_files/dam-break-block/dam-break-block-nalu.yaml | 8 +------- test/test_files/dam-break-block/dam-break-block.yaml | 2 +- .../stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml | 3 +-- .../stokes-waves-cylinder/stokes-waves-cylinder.yaml | 2 +- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/test/test_files/dam-break-block/dam-break-block-nalu.yaml b/test/test_files/dam-break-block/dam-break-block-nalu.yaml index 16c3747..5d1edcd 100644 --- a/test/test_files/dam-break-block/dam-break-block-nalu.yaml +++ b/test/test_files/dam-break-block/dam-break-block-nalu.yaml @@ -53,18 +53,12 @@ realms: initial_conditions: - - user_function: ic_1 - target_name: fluid-HEX - user_function_name: - pressure: sloshing_tank - user_function_parameters: - pressure: [-100, 0.0, 0.25, 0.05, 1.1875] - - constant: ic_1 target_name: fluid-HEX value: volume_of_fluid: 0.0 velocity: [0.0, 0.0, 0.0] + pressure: 0.0 material_properties: target_name: fluid-HEX diff --git a/test/test_files/dam-break-block/dam-break-block.yaml b/test/test_files/dam-break-block/dam-break-block.yaml index 6a55b25..31a5bb7 100644 --- a/test/test_files/dam-break-block/dam-break-block.yaml +++ b/test/test_files/dam-break-block/dam-break-block.yaml @@ -3,7 +3,7 @@ exawind: nalu_wind_inp: - dam-break-block-nalu.yaml amr_wind_inp: dam-break-block-amr.inp - num_timesteps: 2000 + num_timesteps: 10 additional_picard_iterations: 2 nalu_vars: diff --git a/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml b/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml index 6a8a271..2791c67 100644 --- a/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml +++ b/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder-nalu.yaml @@ -57,15 +57,14 @@ realms: target_name: oset user_function_name: volume_of_fluid: sloshing_tank - pressure: sloshing_tank user_function_parameters: volume_of_fluid: [0.0, 0.0, 0.25, 0.1] - pressure: [0.0, 0.0, 0.25, 0.1, 2.4007484815] - constant: ic_1 target_name: oset value: velocity: [0.0, 0.0, 0.0] + pressure: 0.0 material_properties: target_name: oset diff --git a/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder.yaml b/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder.yaml index d1508b3..9de34d1 100644 --- a/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder.yaml +++ b/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder.yaml @@ -3,7 +3,7 @@ exawind: nalu_wind_inp: - stokes-waves-cylinder-nalu.yaml amr_wind_inp: stokes-waves-cylinder-amr.inp - num_timesteps: 5000 + num_timesteps: 10 additional_picard_iterations: 1 nalu_vars: From 902d02355b2fe6c0082e5ac042556fbb124e9745 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Sat, 3 Aug 2024 20:18:11 -0600 Subject: [PATCH 8/9] updating reg test inputs - crucially, diffusion type for stokes waves cylinder --- .../stokes-waves-cylinder-amr.inp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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 49e0107..127f766 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 @@ -3,17 +3,17 @@ time.max_step = -10 # Max number of time steps time.initial_dt = -0.05 # Use this constant dt if > 0 time.fixed_dt = 0.01 -time.cfl = 0.5 # CFL factor -time.plot_interval = 20 # Steps between plot files -time.checkpoint_interval = 500 +time.cfl = 0.95 # CFL factor +time.plot_interval = 10 # Steps between plot files incflo.do_initial_proj = 0 incflo.initial_iterations = 0 -io.outputs = density vof velocity p gp levelset reference_pressure ow_velocity ow_levelset +io.outputs = density vof velocity p gp reference_pressure ow_velocity ow_levelset io.int_outputs = iblank_cell iblank_node 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 @@ -31,11 +31,10 @@ 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.numerical_beach_lfactor=2.0 +OceanWaves.Wave1.numerical_beach_length_factor=2.0 OceanWaves.Wave1.zero_sea_level=0.0 MultiPhase.density_fluid1=1000. MultiPhase.density_fluid2=1. -MultiPhase.initialize_pressure=true ICNS.source_terms = GravityForcing ICNS.use_perturb_pressure = true From 262c6930b20e00bde87c3967b330c5174b66d5f7 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 8 Aug 2024 10:28:45 -0600 Subject: [PATCH 9/9] reduce number of timesteps --- .../test_files/stokes-waves-cylinder/stokes-waves-cylinder.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder.yaml b/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder.yaml index 9de34d1..e779952 100644 --- a/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder.yaml +++ b/test/test_files/stokes-waves-cylinder/stokes-waves-cylinder.yaml @@ -3,7 +3,7 @@ exawind: nalu_wind_inp: - stokes-waves-cylinder-nalu.yaml amr_wind_inp: stokes-waves-cylinder-amr.inp - num_timesteps: 10 + num_timesteps: 5 additional_picard_iterations: 1 nalu_vars: