-
Notifications
You must be signed in to change notification settings - Fork 8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Dust coagulation #25
Open
shengtai
wants to merge
15
commits into
develop
Choose a base branch
from
sli/dust
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Dust coagulation #25
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
e061712
merge with the develop branch
shengtai b191975
add files from gitlab/sli/coagulation branch and merge with develop
shengtai 63e37b9
format fixed in pgen/dust_coagulation.hpp
shengtai d82919a
Merge branch 'develop' of github.com:lanl/artemis into sli/dust
shengtai 6ba72b0
fixed omega_k calculation in dust.cpp
shengtai 1beaf24
remove dust_drag
shengtai a26caad
modification based on merge comments
shengtai 05da651
Merge branch 'develop' of github.com:lanl/artemis into sli/dust
shengtai 548a9d1
Merge branch 'develop' into sli/dust
shengtai 347ea01
merge with the head version and modify c2p to p2c in dust.cpp
shengtai 11afd99
Merge branch 'sli/dust' of github.com:lanl/artemis into sli/dust
shengtai 9061f6a
Merge branch 'develop' of github.com:lanl/artemis into sli/dust
shengtai ecf6de0
Merge branch 'develop' of github.com:lanl/artemis into sli/dust
shengtai 053f77b
new modification based on units
shengtai 0198b3b
new output file name based on problem_id
shengtai File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Submodule parthenon
updated
13 files
+0 −3 | CHANGELOG.md | |
+2 −12 | doc/sphinx/src/outputs.rst | |
+1 −0 | src/CMakeLists.txt | |
+2 −8 | src/outputs/ascent.cpp | |
+2 −8 | src/outputs/histogram.cpp | |
+2 −8 | src/outputs/history.cpp | |
+1 −2 | src/outputs/output_parameters.hpp | |
+8 −28 | src/outputs/outputs.cpp | |
+12 −0 | src/outputs/outputs.hpp | |
+2 −8 | src/outputs/parthenon_hdf5.cpp | |
+240 −0 | src/outputs/vtk.cpp | |
+1 −5 | src/parameter_input.cpp | |
+2 −2 | src/tasks/tasks.cpp |
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,107 @@ | ||
# ======================================================================================== | ||
# (C) (or copyright) 2023-2024. Triad National Security, LLC. All rights reserved. | ||
# | ||
# This program was produced under U.S. Government contract 89233218CNA000001 for Los | ||
# Alamos National Laboratory (LANL), which is operated by Triad National Security, LLC | ||
# for the U.S. Department of Energy/National Nuclear Security Administration. All rights | ||
# in the program are reserved by Triad National Security, LLC, and the U.S. Department | ||
# of Energy/National Nuclear Security Administration. The Government is granted for | ||
# itself and others acting on its behalf a nonexclusive, paid-up, irrevocable worldwide | ||
# license in this material to reproduce, prepare derivative works, distribute copies to | ||
# the public, perform publicly and display publicly, and to permit others to do so. | ||
# ======================================================================================== | ||
|
||
<artemis> | ||
problem = dust_coagulation # name of the pgen | ||
coordinates = cartesian # coordinate system | ||
|
||
<parthenon/job> | ||
problem_id = coag # problem ID: basename of output filenames | ||
|
||
|
||
<parthenon/output0> | ||
file_type = hst | ||
dt = 0.628 | ||
|
||
<parthenon/output1> | ||
variables = gas.prim.density, & | ||
dust.prim.density | ||
file_type = hdf5 # tab data dump | ||
dt = 62.8 # time increment between outputs | ||
|
||
<parthenon/output2> | ||
file_type = rst | ||
dt = 628 | ||
|
||
<parthenon/time> | ||
nlim = -1 # cycle limit | ||
tlim = 6280. # time limit | ||
integrator = rk2 # time integration algorithm | ||
ncycle_out = 1 # interval for stdout summary info | ||
|
||
<parthenon/mesh> | ||
nghost = 2 | ||
refinement = none | ||
# numlevel = 1 | ||
|
||
nx1 = 16 # Number of zones in X1-direction | ||
x1min = 1.35e15 # minimum value of X1 | ||
x1max = 1.64e15 # maximum value of X1 | ||
ix1_bc = outflow # Inner-X1 boundary condition flag | ||
ox1_bc = outflow # Outer-X1 boundary condition flag | ||
|
||
nx2 = 1 # Number of zones in X2-direction | ||
x2min = 0.0 # minimum value of X2 | ||
x2max = 6.283185307179586 # maximum value of X2 | ||
ix2_bc = periodic # Inner-X2 boundary condition flag | ||
ox2_bc = periodic # Outer-X2 boundary condition flag | ||
|
||
nx3 = 1 # Number of zones in X3-direction | ||
x3min = -0.5 # minimum value of X3 | ||
x3max = 0.5 # maximum value of X3 | ||
ix3_bc = periodic # Inner-X3 boundary condition flag | ||
ox3_bc = periodic # Outer-X3 boundary condition flag | ||
|
||
<parthenon/meshblock> | ||
nx1 = 16 # Number of cells in each MeshBlock, X1-dir | ||
nx2 = 1 # Number of cells in each MeshBlock, X2-dir | ||
nx3 = 1 # Number of cells in each MeshBlock, X3-dir | ||
|
||
<physics> | ||
gas = true | ||
dust = true | ||
coagulation = true | ||
|
||
<gas> | ||
cfl = 0.9 | ||
gamma = 1.00001 | ||
iso_sound_speed = 0.05 # code unit | ||
|
||
<dust> | ||
cfl = 0.9 | ||
nspecies = 121 | ||
size_input = logspace | ||
|
||
scr_level = 1 # for reconstruction | ||
|
||
surface_density_flag = true # surface or volume density | ||
grain_density = 1.25 # dust internal density g/cc | ||
min_size = 1e-5 #cm | ||
max_size = 10.0 #cm | ||
|
||
<dust/coagulation> | ||
vfrag = 1000.0 #cm/s | ||
coag_int = 1 | ||
coag_use_adaptiveStep = false | ||
coag_mom_preserve = false | ||
coag_info_out = true | ||
|
||
<problem> | ||
nInit_dust = 11 # number of dust species initially | ||
dust_to_gas = 0.01 | ||
nstep1Coag = 10 | ||
mstar = 1.0 # central star masss (m_sun) | ||
r0_length = 10.0 # 1 code unit (AU) | ||
rho0 = 2e-5 # code unit value of 1 m_star/r0_length^2 | ||
const_coag_omega = true # using omega at r0_length | ||
|
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,107 @@ | ||
# ======================================================================================== | ||
# (C) (or copyright) 2023-2024. Triad National Security, LLC. All rights reserved. | ||
# | ||
# This program was produced under U.S. Government contract 89233218CNA000001 for Los | ||
# Alamos National Laboratory (LANL), which is operated by Triad National Security, LLC | ||
# for the U.S. Department of Energy/National Nuclear Security Administration. All rights | ||
# in the program are reserved by Triad National Security, LLC, and the U.S. Department | ||
# of Energy/National Nuclear Security Administration. The Government is granted for | ||
# itself and others acting on its behalf a nonexclusive, paid-up, irrevocable worldwide | ||
# license in this material to reproduce, prepare derivative works, distribute copies to | ||
# the public, perform publicly and display publicly, and to permit others to do so. | ||
# ======================================================================================== | ||
|
||
<artemis> | ||
problem = dust_coagulation # name of the pgen | ||
coordinates = cartesian # coordinate system | ||
|
||
<parthenon/job> | ||
problem_id = coag # problem ID: basename of output filenames | ||
|
||
|
||
<parthenon/output0> | ||
file_type = hst | ||
dt = 0.628 | ||
|
||
<parthenon/output1> | ||
variables = gas.prim.density, & | ||
dust.prim.density | ||
file_type = hdf5 # tab data dump | ||
dt = 62.8 # time increment between outputs | ||
|
||
<parthenon/output2> | ||
file_type = rst | ||
dt = 628 | ||
|
||
<parthenon/time> | ||
nlim = 5 # cycle limit | ||
tlim = 6280. # time limit | ||
integrator = rk2 # time integration algorithm | ||
ncycle_out = 1 # interval for stdout summary info | ||
|
||
<parthenon/mesh> | ||
nghost = 2 | ||
refinement = none | ||
# numlevel = 1 | ||
|
||
nx1 = 16 # Number of zones in X1-direction | ||
x1min = 1.35e15 # minimum value of X1 | ||
x1max = 1.64e15 # maximum value of X1 | ||
ix1_bc = outflow # Inner-X1 boundary condition flag | ||
ox1_bc = outflow # Outer-X1 boundary condition flag | ||
|
||
nx2 = 1 # Number of zones in X2-direction | ||
x2min = 0.0 # minimum value of X2 | ||
x2max = 6.283185307179586 # maximum value of X2 | ||
ix2_bc = periodic # Inner-X2 boundary condition flag | ||
ox2_bc = periodic # Outer-X2 boundary condition flag | ||
|
||
nx3 = 1 # Number of zones in X3-direction | ||
x3min = -0.5 # minimum value of X3 | ||
x3max = 0.5 # maximum value of X3 | ||
ix3_bc = periodic # Inner-X3 boundary condition flag | ||
ox3_bc = periodic # Outer-X3 boundary condition flag | ||
|
||
<parthenon/meshblock> | ||
nx1 = 16 # Number of cells in each MeshBlock, X1-dir | ||
nx2 = 1 # Number of cells in each MeshBlock, X2-dir | ||
nx3 = 1 # Number of cells in each MeshBlock, X3-dir | ||
|
||
<physics> | ||
gas = true | ||
dust = true | ||
coagulation = true | ||
|
||
<gas> | ||
cfl = 0.9 | ||
gamma = 1.00001 | ||
iso_sound_speed = 0.05 # code unit | ||
|
||
<dust> | ||
cfl = 0.9 | ||
nspecies = 121 | ||
size_input = logspace | ||
|
||
scr_level = 1 # for reconstruction | ||
|
||
surface_density_flag = false # surface or volume density | ||
grain_density = 1.25 # dust internal density g/cc | ||
min_size = 1e-5 #cm | ||
max_size = 10.0 #cm | ||
|
||
<dust/coagulation> | ||
vfrag = 1000.0 #cm/s | ||
coag_int = 1 | ||
coag_use_adaptiveStep = false | ||
coag_mom_preserve = false | ||
coag_info_out = true | ||
|
||
<problem> | ||
nInit_dust = 11 # number of dust species initially | ||
dust_to_gas = 0.01 | ||
nstep1Coag = 1 | ||
mstar = 1.0 # central star masss (m_sun) | ||
r0_length = 10.0 # 1 code unit (AU) | ||
rho0 = 2e-5 # code unit value of 1 m_star/r0_length^2 | ||
const_coag_omega = true # using omega at r0_length | ||
|
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,91 @@ | ||
# ======================================================================================== | ||
# (C) (or copyright) 2023-2024. Triad National Security, LLC. All rights reserved. | ||
# | ||
# This program was produced under U.S. Government contract 89233218CNA000001 for Los | ||
# Alamos National Laboratory (LANL), which is operated by Triad National Security, LLC | ||
# for the U.S. Department of Energy/National Nuclear Security Administration. All rights | ||
# in the program are reserved by Triad National Security, LLC, and the U.S. Department | ||
# of Energy/National Nuclear Security Administration. The Government is granted for | ||
# itself and others acting on its behalf a nonexclusive, paid-up, irrevocable worldwide | ||
# license in this material to reproduce, prepare derivative works, distribute copies to | ||
# the public, perform publicly and display publicly, and to permit others to do so. | ||
# ======================================================================================== | ||
|
||
<artemis> | ||
problem = dust_collision # name of the pgen | ||
coordinates = cartesian # coordinate system | ||
|
||
<parthenon/job> | ||
problem_id = dc_B # problem ID: basename of output filenames | ||
|
||
<parthenon/output1> | ||
variables = gas.prim.density, & | ||
gas.prim.velocity, & | ||
gas.prim.pressure, & | ||
dust.prim.density, & | ||
dust.prim.velocity | ||
file_type = hdf5 # tab data dump | ||
dt = 0.05 # time increment between outputs | ||
|
||
<parthenon/time> | ||
nlim = -1 # cycle limit | ||
tlim = 0.05 # time limit | ||
integrator = rk2 # time integration algorithm | ||
ncycle_out = 1 # interval for stdout summary info | ||
dt_user = 0.005 | ||
|
||
<parthenon/mesh> | ||
nghost = 2 | ||
refinement = none | ||
# numlevel = 1 | ||
|
||
nx1 = 16 # Number of zones in X1-direction | ||
x1min = 0.0 # minimum value of X1 | ||
x1max = 1.0 # maximum value of X1 | ||
ix1_bc = periodic # Inner-X1 boundary condition flag | ||
ox1_bc = periodic # Outer-X1 boundary condition flag | ||
|
||
nx2 = 1 # Number of zones in X2-direction | ||
x2min = -0.5 # minimum value of X2 | ||
x2max = 0.5 # maximum value of X2 | ||
ix2_bc = periodic # Inner-X2 boundary condition flag | ||
ox2_bc = periodic # Outer-X2 boundary condition flag | ||
|
||
nx3 = 1 # Number of zones in X3-direction | ||
x3min = -0.5 # minimum value of X3 | ||
x3max = 0.5 # maximum value of X3 | ||
ix3_bc = periodic # Inner-X3 boundary condition flag | ||
ox3_bc = periodic # Outer-X3 boundary condition flag | ||
|
||
<parthenon/meshblock> | ||
nx1 = 16 # Number of cells in each MeshBlock, X1-dir | ||
nx2 = 1 # Number of cells in each MeshBlock, X2-dir | ||
nx3 = 1 # Number of cells in each MeshBlock, X3-dir | ||
|
||
<physics> | ||
gas = true | ||
dust = true | ||
drag = true | ||
|
||
<gas> | ||
cfl = 0.9 | ||
gamma = 1.4 | ||
iso_sound_speed = 0.1 | ||
|
||
<dust> | ||
cfl = 0.9 | ||
nspecies = 2 | ||
|
||
sizes = 1.0, 1.0 | ||
|
||
<dust/stopping_time> | ||
type = constant | ||
tau = 0.01, 0.001 # for iprob = 1 | ||
#tau = 2.0, 1.0 # for iprob = 2 | ||
|
||
<drag> | ||
type = simple_dust | ||
|
||
|
||
<problem> | ||
iprob = 1 # 1 or 2 |
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
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a pure drag input problem and so is out of scope for this PR unless I'm misunderstanding, so this input file and
pgen/dust_collision.hpp
should be removed.