-
Notifications
You must be signed in to change notification settings - Fork 12
Dust Coagulation v2 #92
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
Open
pdmullen
wants to merge
51
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
Changes from 46 commits
Commits
Show all changes
51 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 22cf399
modified coagulation input file for cgs unit
shengtai dd8b375
Merge branch 'develop' of github.com:lanl/artemis into sli/dust
shengtai 3a99ba0
Merge branch 'develop' of github.com:lanl/artemis into sli/dust
shengtai 8e80417
Added CI test for dust coagulation and paml file for coagulation
shengtai df9baa0
Add 4D par_for_outer to ArtemisUtils.hpp, rewrite coagulation using t…
shengtai c6f02e5
fixed a typo in CI routine coagulation.py
shengtai f4866cf
add compress=on to CMakePresets.json
shengtai 55edfc6
add reference data file for coagulation CI test
shengtai c60e520
fixed a bug in CI routine coagulation.py
shengtai 6fec291
fixed a bug in coagulation.py
shengtai c22e675
Merge branch 'develop' of github.com:lanl/artemis into sli/dust
shengtai 7dbe6b6
using develop branch submodule
shengtai 6a7faa7
modified .gitmodules
shengtai 0f99bfb
change the submodules
shengtai 0b53da6
using old commit of parthenon 9b045ae
shengtai f5f20d1
update submodule to be consistent with develop branch
shengtai fb760a6
move rho0 factor from units/mass to problem session
shengtai 4dafd75
Merge remote-tracking branch 'origin/develop' into sli/dust
shengtai d99ae9c
merge with origin/develop
shengtai 6d6393f
rewrite to dust size conversion
shengtai 0626fe5
replace external with develop/external
shengtai eeabe97
remove old external
shengtai bad23a3
updated submodules
shengtai 0e1eab0
fixed a bug in coagulation call in dust.cpp and modified exponential …
shengtai 7876d2c
Merge branch 'develop' of github.com:lanl/artemis into sli/dust
shengtai c132fd1
modified for logr grid
shengtai 94fbecc
Coagulation edits part I
pdmullen 7be00a2
clang-format 18 vs 20
pdmullen 37a096f
Remove trailing commas in CMakePresets.json
pdmullen e2baac4
Merge remote-tracking branch 'origin/sli/dust' into pdmullen/coag-v2
pdmullen 0a5d72b
Merge pull request #91 from lanl/pdmullen/coag-v2
pdmullen 160197d
Remove coag ncalls and enforce do_gas with coag
pdmullen 7775e7a
Thread gas_params through coagulation
pdmullen 4ee353a
Introduce a KernelParams struct for coagulation
pdmullen 051726c
Update src/dust/coagulation/coagulation.hpp
pdmullen 75f41a7
Update src/dust/coagulation/coagulation.hpp
pdmullen 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
This file contains hidden or 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 hidden or 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 hidden or 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 = coag # name of the pgen | ||
coordinates = cartesian # coordinate system | ||
length = 1.495978707e14 # 10AU in cgs unit | ||
mass = 1.988416e33 # central-star mass (M_sun) in cgs unit | ||
time = 1.5871820329271033e8 # cgs unit in year/(2*pi)*(r0**3/mstar)**0.5 | ||
temperature = 2.4753531e4 # kevin (vel**2/kb*mu*mp) | ||
physical_units = cgs # physical unit 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 # hdf5 data dump | ||
dt = 62.8 # time increment between outputs | ||
|
||
<parthenon/output2> | ||
file_type = rst | ||
dt = 628.0 | ||
|
||
<parthenon/time> | ||
nlim = -1 # cycle limit | ||
tlim = 3768.0 # time limit | ||
integrator = rk2 # time integration algorithm | ||
ncycle_out = 10 # interval for stdout summary info | ||
|
||
<parthenon/mesh> | ||
nghost = 2 | ||
refinement = none | ||
|
||
nx1 = 16 # Number of zones in X1-direction | ||
x1min = 9.0 # minimum value of X1 | ||
x1max = 11.0 # 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 # gas cfl number | ||
gamma = 1.00001 # adiabatic index | ||
mu = 2.3 # mean molecular weight | ||
|
||
<dust> | ||
cfl = 0.9 # dust cfl number | ||
dfloor = 2.0e-25 # density floor=1e-20*rho0 | ||
nspecies = 121 # number of dust size | ||
size_input = logspace # dust size distribution | ||
scr_level = 1 # for hier. scratch registers | ||
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_adaptive_step = false | ||
coag_mom_preserve = false | ||
coag_info_out = true | ||
nstep_coag = 10 # number of steps for one coagulation call | ||
const_coag_omega = true # using omega at r0_length | ||
surface_density_flag = true # surface or volume density | ||
|
||
<problem> | ||
h0 = 0.05 # scaled height at r0 | ||
rho0 = 2.0e-5 # rh0 = sigma_0/sqrt(2*pi)/h0 | ||
ninit_dust = 11 # number of dust species initially | ||
dust_to_gas = 0.01 # init dust-to-gas ratio |
This file contains hidden or 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 = coag # name of the pgen | ||
coordinates = cartesian # coordinate system | ||
length = 1.495978707e14 # 10AU in cgs unit | ||
mass = 1.988416e33 # central-star mass (M_sun) in cgs unit | ||
time = 1.5871820329271033e8 # cgs unit in year/(2*pi)*(r0**3/mstar)**0.5 | ||
temperature = 2.4753531e4 # kevin (vel**2/kb*mu*mp) | ||
physical_units = cgs # physical unit 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 # hdf5 data dump | ||
dt = 62.8 # time increment between outputs | ||
|
||
<parthenon/output2> | ||
file_type = rst | ||
dt = 628.0 | ||
|
||
<parthenon/time> | ||
nlim = -1 # cycle limit | ||
tlim = 3768.0 # time limit | ||
integrator = rk2 # time integration algorithm | ||
ncycle_out = 10 # interval for stdout summary info | ||
|
||
<parthenon/mesh> | ||
nghost = 2 | ||
refinement = none | ||
|
||
nx1 = 16 # Number of zones in X1-direction | ||
x1min = 9.0 # minimum value of X1 | ||
x1max = 11.0 # 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 # gas cfl number | ||
gamma = 1.00001 # adiabatic index | ||
mu = 2.3 # mean molecular weight | ||
|
||
<dust> | ||
cfl = 0.9 # dust cfl number | ||
dfloor = 1.59577e-24 # density floor=1e-20*rho0 | ||
nspecies = 121 # number of dust size | ||
size_input = logspace # dust size distribution | ||
scr_level = 1 # for hier. scratch registers | ||
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_adaptive_step = false | ||
coag_mom_preserve = false | ||
coag_info_out = true | ||
nstep_coag = 10 # number of steps for one coagulation call | ||
const_coag_omega = true # using omega at r0_length | ||
surface_density_flag = false # surface or volume density | ||
|
||
<problem> | ||
h0 = 0.05 # scaled height at r0 | ||
rho0 = 1.59577e-4 # rh0 = sigma_0/sqrt(2*pi)/h0 | ||
ninit_dust = 11 # number of dust species initially | ||
dust_to_gas = 0.01 # init dust-to-gas ratio |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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.
Uh oh!
There was an error while loading. Please reload this page.