-
Notifications
You must be signed in to change notification settings - Fork 91
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Multiphase stabilization and mass-momentum consistency updates (#1265)
Co-authored-by: whorne <[email protected]> Co-authored-by: Michael Kuhn <[email protected]>
- Loading branch information
1 parent
abe69db
commit 2d1d326
Showing
24 changed files
with
755 additions
and
74 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
// Copyright 2017 National Technology & Engineering Solutions of Sandia, LLC | ||
// (NTESS), National Renewable Energy Laboratory, University of Texas Austin, | ||
// Northwest Research Associates. Under the terms of Contract DE-NA0003525 | ||
// with NTESS, the U.S. Government retains certain rights in this software. | ||
// | ||
// This software is released under the BSD 3-clause license. See LICENSE file | ||
// for more details. | ||
// | ||
|
||
#ifndef DropletVelocityAuxFunction_h | ||
#define DropletVelocityAuxFunction_h | ||
|
||
#include <AuxFunction.h> | ||
|
||
#include <vector> | ||
|
||
namespace sierra { | ||
namespace nalu { | ||
|
||
class DropletVelocityAuxFunction : public AuxFunction | ||
{ | ||
public: | ||
DropletVelocityAuxFunction( | ||
const unsigned beginPos, | ||
const unsigned endPos, | ||
const std::vector<double>& params); | ||
|
||
virtual ~DropletVelocityAuxFunction() {} | ||
|
||
using AuxFunction::do_evaluate; | ||
virtual void do_evaluate( | ||
const double* coords, | ||
const double time, | ||
const unsigned spatialDimension, | ||
const unsigned numPoints, | ||
double* fieldPtr, | ||
const unsigned fieldSize, | ||
const unsigned beginPos, | ||
const unsigned endPos) const; | ||
|
||
double droppos_x_; | ||
double droppos_y_; | ||
double droppos_z_; | ||
double dropvel_x_; | ||
double dropvel_y_; | ||
double dropvel_z_; | ||
double radius_; | ||
double interface_thickness_; | ||
}; | ||
|
||
} // namespace nalu | ||
} // namespace sierra | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
// Copyright 2017 National Technology & Engineering Solutions of Sandia, LLC | ||
// (NTESS), National Renewable Energy Laboratory, University of Texas Austin, | ||
// Northwest Research Associates. Under the terms of Contract DE-NA0003525 | ||
// with NTESS, the U.S. Government retains certain rights in this software. | ||
// | ||
// This software is released under the BSD 3-clause license. See LICENSE file | ||
// for more details. | ||
// | ||
|
||
#ifndef SloshingTankVOFAuxFunction_h | ||
#define SloshingTankVOFAuxFunction_h | ||
|
||
#include <AuxFunction.h> | ||
|
||
#include <vector> | ||
|
||
namespace sierra { | ||
namespace nalu { | ||
|
||
class SloshingTankVOFAuxFunction : public AuxFunction | ||
{ | ||
public: | ||
SloshingTankVOFAuxFunction(const std::vector<double>& params); | ||
|
||
virtual ~SloshingTankVOFAuxFunction() {} | ||
|
||
using AuxFunction::do_evaluate; | ||
virtual void do_evaluate( | ||
const double* coords, | ||
const double time, | ||
const unsigned spatialDimension, | ||
const unsigned numPoints, | ||
double* fieldPtr, | ||
const unsigned fieldSize, | ||
const unsigned beginPos, | ||
const unsigned endPos) const; | ||
|
||
double water_level_; | ||
double amplitude_; | ||
double kappa_; | ||
double interface_thickness_; | ||
}; | ||
|
||
} // namespace nalu | ||
} // namespace sierra | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
2.673434136755543e-05 11 0.0001 | ||
6.859619665424398e-06 12 0.0002 | ||
3.313464463487801e-06 13 0.0003 | ||
0.0006181350623480881 11 0.0001 | ||
0.0001148227599440996 12 0.0002 | ||
0.0001728609404847864 13 0.0003 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
reg_tests/test_files/VOFInertialDroplet/VOFInertialDroplet.norm.gold
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
0.0004280828978167022 11 0.005 | ||
0.0002425402745256439 12 0.01 | ||
0.0001207937198159064 13 0.015 |
136 changes: 136 additions & 0 deletions
136
reg_tests/test_files/VOFInertialDroplet/VOFInertialDroplet.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,136 @@ | ||
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: tpetra | ||
method: gmres | ||
preconditioner: muelu | ||
tolerance: 1e-12 | ||
max_iterations: 75 | ||
kspace: 75 | ||
output_level: 0 | ||
recompute_preconditioner: yes | ||
muelu_xml_file_name: ../../xml/vof_resolved.xml | ||
|
||
|
||
realms: | ||
|
||
- name: realm_1 | ||
mesh: "generated:75x75x75|bbox:-0.5,-0.5,-0.5,0.5,0.5,0.5|sideset:xXyYzZ|show" | ||
use_edges: yes | ||
automatic_decomposition_type: rcb | ||
|
||
equation_systems: | ||
name: theEqSys | ||
max_iterations: 3 | ||
|
||
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: block_1 | ||
user_function_name: | ||
volume_of_fluid: droplet | ||
velocity: droplet | ||
user_function_parameters: | ||
volume_of_fluid: [0.0, 0.0, 0.0, 0.15, -100, 0, 0.01] | ||
velocity: [0.0, 0.0, 0.0, 0.2, 0.2, 0.2, 0.15, 0.01] | ||
- constant: ic_2 | ||
target_name: block_1 | ||
value: | ||
pressure: 0.0 | ||
|
||
material_properties: | ||
target_name: block_1 | ||
specifications: | ||
- name: density | ||
type: volume_of_fluid | ||
primary_value: 1000.0 | ||
secondary_value: 1.0 | ||
|
||
- name: viscosity | ||
type: volume_of_fluid | ||
primary_value: 1.0e-3 | ||
secondary_value: 1.0e-5 | ||
|
||
boundary_conditions: | ||
- periodic_boundary_condition: bc_1 | ||
target_name: [surface_1, surface_2] | ||
periodic_user_data: | ||
search_tolerance: 0.001 | ||
- periodic_boundary_condition: bc_2 | ||
target_name: [surface_3, surface_4] | ||
periodic_user_data: | ||
search_tolerance: 0.001 | ||
- periodic_boundary_condition: bc_3 | ||
target_name: [surface_5, surface_6] | ||
periodic_user_data: | ||
search_tolerance: 0.001 | ||
|
||
solution_options: | ||
name: myOptions | ||
projected_timescale_type: momentum_diag_inv | ||
|
||
options: | ||
- hybrid_factor: | ||
velocity: 0.05 | ||
volume_of_fluid: 0.0 | ||
|
||
- limiter: | ||
volume_of_fluid: yes | ||
pressure: no | ||
velocity: no | ||
|
||
- consistent_mass_matrix_png: | ||
pressure: no | ||
|
||
output: | ||
output_data_base_name: out/inertialDroplet.e | ||
output_frequency: 50 | ||
output_node_set: yes | ||
output_variables: | ||
- density | ||
- volume_of_fluid | ||
- velocity | ||
- pressure | ||
- dvolume_of_fluiddx | ||
Time_Integrators: | ||
- StandardTimeIntegrator: | ||
name: ti_1 | ||
start_time: 0 | ||
termination_time: 0.015 | ||
time_step: 0.005 | ||
time_stepping_type: fixed | ||
time_step_count: 10 | ||
second_order_accuracy: yes | ||
|
||
|
||
realms: | ||
- realm_1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.