Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
7710d23
update an action to some later versions
zingale Apr 18, 2022
dcfb770
Merge branch 'development' of github.com:amrex-astro/Castro into deve…
zingale Apr 20, 2022
11e513f
Merge branch 'development' of github.com:amrex-astro/Castro into deve…
zingale Apr 22, 2022
a9517e7
use one-sided stencils when necessary
zingale Apr 22, 2022
9665212
finish syncing
zingale Apr 24, 2022
51ac6c8
fix compilation
zingale Apr 24, 2022
e22e9eb
some diag
zingale Apr 25, 2022
c33b128
Merge branch 'development' of github.com:amrex-astro/Castro into deve…
zingale Apr 25, 2022
7113ef7
Merge branch 'development' into ppm_one_sided_second
zingale Apr 25, 2022
baeb2dc
add some protection on the parabola values
zingale Apr 26, 2022
7c23762
Merge branch 'ppm_one_sided_second' of github.com:zingale/Castro into…
zingale Apr 26, 2022
83a5120
add more reflect enforcement
zingale Apr 26, 2022
45fb00a
Merge branch 'development' into ppm_one_sided_second
zingale May 12, 2022
8a1aa1b
Merge branch 'development' into ppm_one_sided_second
zingale May 19, 2022
7fae1f7
some merge fixes
zingale May 19, 2022
66e9350
more merge fixes
zingale May 19, 2022
e427532
Merge branch 'development' into ppm_one_sided_second
zingale May 27, 2022
59c1424
more merging
zingale May 27, 2022
cb56c00
more fixing
zingale May 27, 2022
00e05ec
add reflect
zingale May 27, 2022
0a2ec8f
Merge branch 'development' into ppm_one_sided_second
zingale Jul 24, 2022
9995481
fix one-sided + pslope
zingale Jul 25, 2022
0a4044b
change centering of source terms
zingale Jul 25, 2022
5d0cf53
Merge branch 'development' into ppm_one_sided_second
zingale Jul 26, 2022
31d1855
fix array sizes
zingale Jul 26, 2022
02629fc
Merge branch 'development' into ppm_one_sided_second
zingale Aug 11, 2022
fa86a98
Merge branch 'development' into ppm_one_sided_second
zingale Dec 20, 2022
648ee4c
Merge branch 'development' into ppm_one_sided_second
zingale Feb 10, 2023
bdeb306
Merge branch 'development' into ppm_one_sided_second
zingale Feb 15, 2023
97dc5a0
Merge branch 'development' into ppm_one_sided_second
zingale Feb 28, 2023
97186b1
Merge branch 'development' into ppm_one_sided_second
zingale Apr 15, 2023
4ad48f2
sync
zingale Apr 16, 2023
1b53f57
Merge branch 'development' into ppm_one_sided_second
zingale Apr 16, 2023
ff8fcf7
fix
zingale Apr 16, 2023
4e87524
implement the axisymmetric versions of the one-sided diffs
zingale Apr 16, 2023
ac349f0
Merge branch 'development' into ppm_one_sided_second
zingale Apr 16, 2023
23db908
Merge branch 'development' into ppm_one_sided_second
zingale May 16, 2023
7b6ec93
Merge branch 'development' into ppm_one_sided_second
zingale May 25, 2023
0a7c575
more work on the one-sided stuff
zingale May 26, 2023
e6fd73b
fix 1d cylindrical Sedov
zingale May 26, 2023
1cb82f1
Merge branch 'fix_sedov_1d_cyl' into ppm_one_sided_second
zingale May 26, 2023
4d1a825
fix the area / volume factors for 1-d cylindrical
zingale May 26, 2023
0636b9d
Merge branch 'fix_1d_cyl_consup' into ppm_one_sided_second
zingale May 26, 2023
1be898e
Merge branch 'development' into ppm_one_sided_second
zingale May 30, 2023
c083e3d
Merge branch 'ppm_one_sided_second' of github.com:zingale/Castro into…
zingale May 30, 2023
c989b5d
fix composition
zingale May 30, 2023
29df0eb
Merge branch 'development' into ppm_one_sided_second
zingale Aug 19, 2024
d074a64
fix build
zingale Aug 19, 2024
822056e
Merge branch 'development' into ppm_one_sided_second
zingale Oct 24, 2024
147854b
fix compilation
zingale Oct 24, 2024
68702e3
Merge branch 'development' into ppm_one_sided_second
zingale Oct 24, 2024
c8ecaa1
Merge branch 'development' into ppm_one_sided_second
zingale Nov 17, 2024
a136c57
Merge branch 'development' into ppm_one_sided_second
zingale Jun 25, 2025
6eddd54
Merge branch 'development' into ppm_one_sided_second
zingale Jul 28, 2025
b51afb0
remove axisymmetric
zingale Jul 28, 2025
6474c63
fix clang-tidy
zingale Jul 28, 2025
2ce79e4
more updates
zingale Jul 28, 2025
6489122
this should work
zingale Jul 28, 2025
0f5c0f9
update
zingale Jul 28, 2025
48a294f
update CI
zingale Jul 28, 2025
d636f4a
fix allocation in mhd
zingale Jul 28, 2025
3461d0d
more updates
zingale Jul 28, 2025
9ebdaa8
use load_stencil to PPM / MHD
zingale Jul 28, 2025
1289109
convert the PLM too
zingale Jul 28, 2025
cbee740
simplify what is passed through
zingale Aug 2, 2025
8bf7a12
fix
zingale Aug 2, 2025
1d784e3
more cleaning
zingale Aug 3, 2025
295659a
more stencil work
zingale Aug 3, 2025
1b7bcb8
fix
zingale Aug 3, 2025
7583540
do passive stencil
zingale Aug 3, 2025
54df4ed
fix name clash
zingale Aug 3, 2025
cb00efa
fix
zingale Aug 3, 2025
9c4cd7c
fix indexing
zingale Aug 3, 2025
a534013
disable some hacks
zingale Aug 3, 2025
08ea27b
Merge branch 'mhd_load_stencil' into ppm_one_sided_second
zingale Aug 3, 2025
6f3ac21
update
zingale Aug 3, 2025
dd8d658
Merge branch 'development' into mhd_load_stencil
zingale Aug 3, 2025
df142a2
Merge branch 'mhd_load_stencil' into ppm_one_sided_second
zingale Aug 3, 2025
02b9043
more fixes
zingale Aug 3, 2025
07ad247
Merge branch 'mhd_load_stencil' into ppm_one_sided_second
zingale Aug 3, 2025
5d8bf91
more fixes
zingale Aug 4, 2025
b4880ab
Merge branch 'mhd_load_stencil' into ppm_one_sided_second
zingale Aug 4, 2025
20fd93c
fix stencil
zingale Aug 4, 2025
5b0f8be
another fix
zingale Aug 4, 2025
8184043
Merge branch 'mhd_load_stencil' into ppm_one_sided_second
zingale Aug 4, 2025
9a9d15b
finish first pass
zingale Aug 4, 2025
dd194d1
revert
zingale Aug 4, 2025
9c0746c
simplify
zingale Aug 6, 2025
e4f9a75
Merge branch 'development' into mhd_load_stencil
zingale Aug 6, 2025
ebb8158
Merge branch 'mhd_load_stencil' into ppm_one_sided_second
zingale Aug 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Exec/science/flame_wave/ci-benchmarks/job_info_params.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
castro.hybrid_hydro = 0
castro.ppm_type = 1
castro.ppm_do_limiting = 1
castro.ppm_one_sided_stencils = 0
castro.mhd_limit_characteristic = 1
castro.ppm_temp_fix = 0
castro.plm_iorder = 2
Expand Down
3 changes: 3 additions & 0 deletions Source/driver/_cpp_parameters
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ ppm_type int 1
# do we limit the ppm parabola?
ppm_do_limiting bool 1

# do we use one-sided stencils at reflecting boundaries?
ppm_one_sided_stencils bool 0

# For MHD + PLM, do we limit on characteristic or primitive variables
mhd_limit_characteristic bool 1

Expand Down
41 changes: 21 additions & 20 deletions Source/hydro/Castro_mol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Castro::mol_plm_reconstruct(const Box& bx,
Real s[nslp];
Real flat = flatn_arr(i,j,k);

load_stencil(q_arr, idir, i, j, k, n, s);
load_stencil(q_arr, reconstruction::Centering::zone_centered, idir, i, j, k, n, s);

// normal velocity?
bool vtest = n == QU+idir;
Expand Down Expand Up @@ -83,9 +83,9 @@ Castro::mol_plm_reconstruct(const Box& bx,
(idir == 1 && j == domhi[1]) ||
(idir == 2 && k == domhi[2]));

load_stencil(q_arr, idir, i, j, k, QPRES, s);
load_stencil(q_arr, idir, i, j, k, QRHO, trho);
load_stencil(src_q_arr, idir, i, j, k, QU+idir, src);
load_stencil(q_arr, reconstruction::Centering::zone_centered, idir, i, j, k, QPRES, s);
load_stencil(q_arr, reconstruction::Centering::zone_centered, idir, i, j, k, QRHO, trho);
load_stencil(src_q_arr, reconstruction::Centering::zone_centered, idir, i, j, k, QU+idir, src);

Real dp = dq(i,j,k,QPRES);
pslope(trho, s, src, flat, lo_bc_test, hi_bc_test, dx[idir], dp);
Expand Down Expand Up @@ -164,8 +164,9 @@ Castro::mol_ppm_reconstruct(const Box& bx,
Real sm;
Real sp;

load_stencil(q_arr, idir, i, j, k, n, s);
ppm_reconstruct(s, flat, sm, sp);
load_stencil(q_arr, reconstruction::Centering::zone_centered, idir, i, j, k, n, s);
ppm_reconstruct(s, reconstruction::Centering::zone_centered,
flat, sm, sp);

if (idir == 0) {
// right state at i-1/2
Expand Down Expand Up @@ -351,7 +352,7 @@ Castro::compute_flux_from_q(const Box& bx,
//

int iu, iv1, iv2;
int im1, im2, im3;
int imx1, imx2, imx3;

auto coord = geom.Coord();
auto mom_check = mom_flux_has_p(idir, idir, coord);
Expand All @@ -360,25 +361,25 @@ Castro::compute_flux_from_q(const Box& bx,
iu = QU;
iv1 = QV;
iv2 = QW;
im1 = UMX;
im2 = UMY;
im3 = UMZ;
imx1 = UMX;
imx2 = UMY;
imx3 = UMZ;

} else if (idir == 1) {
iu = QV;
iv1 = QU;
iv2 = QW;
im1 = UMY;
im2 = UMX;
im3 = UMZ;
imx1 = UMY;
imx2 = UMX;
imx3 = UMZ;

} else {
iu = QW;
iv1 = QU;
iv2 = QV;
im1 = UMZ;
im2 = UMX;
im3 = UMY;
imx1 = UMZ;
imx2 = UMX;
imx3 = UMY;
}

#ifdef HYBRID_MOMENTUM
Expand All @@ -395,12 +396,12 @@ Castro::compute_flux_from_q(const Box& bx,
// Compute fluxes, order as conserved state (not q)
F(i,j,k,URHO) = qint(i,j,k,QRHO)*u_adv;

F(i,j,k,im1) = F(i,j,k,URHO)*qint(i,j,k,iu);
F(i,j,k,imx1) = F(i,j,k,URHO)*qint(i,j,k,iu);
if (mom_check) {
F(i,j,k,im1) += qint(i,j,k,QPRES);
F(i,j,k,imx1) += qint(i,j,k,QPRES);
}
F(i,j,k,im2) = F(i,j,k,URHO)*qint(i,j,k,iv1);
F(i,j,k,im3) = F(i,j,k,URHO)*qint(i,j,k,iv2);
F(i,j,k,imx2) = F(i,j,k,URHO)*qint(i,j,k,iv1);
F(i,j,k,imx3) = F(i,j,k,URHO)*qint(i,j,k,iv2);

Real rhoetot = rhoeint + 0.5_rt * qint(i,j,k,QRHO)*
(qint(i,j,k,iu)*qint(i,j,k,iu) +
Expand Down
Loading