Skip to content
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.

Sign up for GitHub

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

fix divu in cylindrical coord #2983

Merged
merged 4 commits into from
Oct 24, 2024
Merged

fix divu in cylindrical coord #2983

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f86b06e
fix divu
zhichen3 Oct 24, 2024
d482c3c
update benchmark
zhichen3 Oct 24, 2024
ba3c94b
update benchmark
zhichen3 Oct 24, 2024
7c0baf3
update benchmark
zhichen3 Oct 24, 2024
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
6 changes: 3 additions & 3 deletions Exec/science/flame_wave/ci-benchmarks/grid_diag.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# COLUMN 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
# TIMESTEP TIME MASS XMOM YMOM ZMOM ANG. MOM. X ANG. MOM. Y ANG. MOM. Z KIN. ENERGY INT. ENERGY GAS ENERGY GRAV. ENERGY TOTAL ENERGY CENTER OF MASS X-LOC CENTER OF MASS Y-LOC CENTER OF MASS Z-LOC CENTER OF MASS X-VEL CENTER OF MASS Y-VEL CENTER OF MASS Z-VEL MAXIMUM TEMPERATURE MAXIMUM DENSITY MAXIMUM T_S / T_E
0 0.0000000000000000e+00 1.4700685690736437e+20 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 2.9163021935541997e+37 2.9163021935541997e+37 0.0000000000000000e+00 2.9163021935541997e+37 2.7306641645125415e+04 6.8087525965685256e+02 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 1.3928678114307070e+09 3.0715027784567930e+07 0.0000000000000000e+00
1 5.9806047036494849e-08 1.4700700110495903e+20 3.3564221217849212e+23 7.2876252590226133e+23 1.2612378556916341e+20 3.1318391966955516e+23 -2.7141686347841742e+24 1.9066097493127676e+28 7.8605324800324878e+29 2.9163081863790706e+37 2.9163082649843738e+37 0.0000000000000000e+00 2.9163082649843738e+37 2.7306641717925955e+04 6.8087482283157317e+02 0.0000000000000000e+00 2.2831716153358752e+03 4.9573321027203638e+03 8.5794407491595881e-01 1.3929561431310942e+09 3.0715326643212341e+07 3.3873763041849706e-04
2 1.2559269877663918e-07 1.4700717750115462e+20 7.0484895445039834e+23 1.5304335700823335e+24 5.5619061962888426e+20 1.3810900989697918e+24 -1.1969287484132617e+25 4.0039912979259806e+28 3.0853275723280981e+30 2.9163145904135894e+37 2.9163148989463411e+37 0.0000000000000000e+00 2.9163148989463411e+37 2.7306641954244522e+04 6.8087461718998338e+02 0.0000000000000000e+00 4.7946567401095926e+03 1.0410604407871944e+04 3.7834249257966728e+00 1.3933944939675827e+09 3.0715562157563787e+07 3.3857586854903492e-04
0 0.0000000000000000e+00 1.4700685690736437e+20 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 2.9163021935542002e+37 2.9163021935542002e+37 0.0000000000000000e+00 2.9163021935542002e+37 2.7306641645125415e+04 6.8087525965685256e+02 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 1.3928678114307070e+09 3.0715027784567930e+07 0.0000000000000000e+00
1 5.9806047036494849e-08 1.4700700110495906e+20 3.3564221215682663e+23 7.2876252589700282e+23 1.2612378556613637e+20 3.1318391966822103e+23 -2.7141686347877250e+24 1.9066097493137787e+28 7.8605324805800087e+29 2.9163081863790947e+37 2.9163082649843960e+37 0.0000000000000000e+00 2.9163082649843960e+37 2.7306641717925955e+04 6.8087482283158545e+02 0.0000000000000000e+00 2.2831716151884975e+03 4.9573321026845915e+03 8.5794407489536750e-01 1.3929529135480993e+09 3.0715326539046615e+07 3.3873763053659893e-04
2 1.2559269877663918e-07 1.4700717750115469e+20 7.0484895413349955e+23 1.5304335700222110e+24 5.5619061951391924e+20 1.3810900989078098e+24 -1.1969287484149683e+25 4.0039912979433335e+28 3.0853275736000402e+30 2.9163145904136995e+37 2.9163148989464469e+37 0.0000000000000000e+00 2.9163148989464469e+37 2.7306641954244507e+04 6.8087461719003704e+02 0.0000000000000000e+00 4.7946567379539219e+03 1.0410604407462963e+04 3.7834249250146343e+00 1.3933796339167778e+09 3.0715561813912578e+07 3.3857586859032947e-04
4 changes: 2 additions & 2 deletions Exec/science/flame_wave/ci-benchmarks/species_diag.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# COLUMN 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
# TIMESTEP TIME Mass He4 Mass C12 Mass O16 Mass Ne20 Mass Mg24 Mass Si28 Mass S32 Mass Ar36 Mass Ca40 Mass Ti44 Mass Cr48 Mass Fe52 Mass Ni56
0 0.0000000000000000e+00 2.8142378112400895e-15 7.3932235330395157e-24 7.3932235330395157e-24 7.3932235330395157e-24 7.3932235330395157e-24 7.3932235330395157e-24 7.3932235330395157e-24 7.3932235330395157e-24 7.3932235330395157e-24 7.3932235330395157e-24 7.3932235330395157e-24 7.3932235330395157e-24 7.1117997526547418e-14
1 5.9806047036494849e-08 2.8142323856670446e-15 5.4329394398418374e-21 7.4194443455948811e-24 7.3934514829832856e-24 7.3935541949306949e-24 7.3933935989353088e-24 7.3932321468740865e-24 7.3932312019180345e-24 7.3932308328287333e-24 7.3932307869392985e-24 7.3932307850741519e-24 7.3932307849933044e-24 7.1118070045957103e-14
2 1.2559269877663918e-07 2.8142264165381050e-15 1.1401993450709496e-20 7.4929528148974785e-24 7.3944694290388374e-24 7.3939305042586412e-24 7.3935838894001731e-24 7.3932425308122493e-24 7.3932405326301655e-24 7.3932397568503098e-24 7.3932396603620498e-24 7.3932396564405566e-24 7.3932396562705492e-24 7.1118158758588142e-14
1 5.9806047036494849e-08 2.8142323856669329e-15 5.4329394301108243e-21 7.4195616772977835e-24 7.3934563085761406e-24 7.3935543157080566e-24 7.3933936202722519e-24 7.3932321470153177e-24 7.3932312019198565e-24 7.3932308328290155e-24 7.3932307869393088e-24 7.3932307850741519e-24 7.3932307849933058e-24 7.1118070045957103e-14
2 1.2559269877663918e-07 2.8142264165373055e-15 1.1401993989593343e-20 7.4932008456176646e-24 7.3944834988025936e-24 7.3939310950724389e-24 7.3935839364933538e-24 7.3932425310845922e-24 7.3932405326334510e-24 7.3932397568508212e-24 7.3932396603620689e-24 7.3932396564405595e-24 7.3932396562705536e-24 7.1118158758588154e-14
46 changes: 23 additions & 23 deletions Exec/science/wdmerger/ci-benchmarks/wdmerger_collision_2D.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
plotfile = plt00086
time = 1.25
variables minimum value maximum value
density 8.6936468335e-05 19568007.309
xmom -5.4959005475e+14 1.3559838981e+14
ymom -2.5540206053e+15 2.5540214496e+15
density 8.694033804e-05 19441641.375
xmom -5.4953770416e+14 1.3594264808e+14
ymom -2.4933243003e+15 2.4933250525e+15
zmom 0 0
rho_E 7.4987846833e+11 5.0676543192e+24
rho_e 7.1083104678e+11 5.0648015049e+24
Temp 242292.44287 1409581841.1
rho_He4 8.6936468335e-17 3.5973411848
rho_C12 3.4774587333e-05 7826946.398
rho_O16 5.2161881e-05 11740633.889
rho_Ne20 8.6936468335e-17 181819.49413
rho_Mg24 8.6936468335e-17 1190.7712386
rho_Si28 8.6936468335e-17 6.6817951193
rho_S32 8.6936468335e-17 0.00019451843176
rho_Ar36 8.6936468335e-17 1.9568007618e-05
rho_Ca40 8.6936468335e-17 1.9568007341e-05
rho_Ti44 8.6936468335e-17 1.9568007318e-05
rho_Cr48 8.6936468335e-17 1.9568007318e-05
rho_Fe52 8.6936468335e-17 1.9568007318e-05
rho_Ni56 8.6936468335e-17 1.9568007318e-05
phiGrav -5.8709462562e+17 -2.3375498549e+16
grav_x -685026429.13 -51428.265677
grav_y -739654246.49 739654206.24
rho_E 7.4973602188e+11 5.0768248381e+24
rho_e 7.1068648975e+11 5.0744783675e+24
Temp 242282.60875 1404450633
rho_He4 8.694033804e-17 3.398107367
rho_C12 3.4776135215e-05 7775850.9372
rho_O16 5.2164202823e-05 11664450.012
rho_Ne20 8.694033804e-17 172485.53661
rho_Mg24 8.694033804e-17 1043.054254
rho_Si28 8.694033804e-17 5.9869390726
rho_S32 8.694033804e-17 0.00016459246891
rho_Ar36 8.694033804e-17 1.9441643669e-05
rho_Ca40 8.694033804e-17 1.9441641398e-05
rho_Ti44 8.694033804e-17 1.9441641384e-05
rho_Cr48 8.694033804e-17 1.9441641384e-05
rho_Fe52 8.694033804e-17 1.9441641384e-05
rho_Ni56 8.694033804e-17 1.9441641384e-05
phiGrav -5.870743119e+17 -2.337549858e+16
grav_x -685044085.4 -51428.268861
grav_y -739591083.78 739591039.26
grav_z 0 0
rho_enuc -4.7815621457e+12 7.6360058391e+23
rho_enuc -9.1467286367e+12 7.1503781236e+23

11 changes: 5 additions & 6 deletions Source/hydro/advection_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,6 @@ Castro::divu(const Box& bx,

if (i == 0) {
ux = 0.0_rt;
vy = 0.0_rt; // is this part correct?
} else {
Real rl = (i - 0.5_rt) * dx[0] + problo[0];
Real rr = (i + 0.5_rt) * dx[0] + problo[0];
Expand All @@ -282,13 +281,13 @@ Castro::divu(const Box& bx,

// Take 1/r d/dr(r*u)
ux = (rr * ur - rl * ul) * dxinv / rc;
}

// These are transverse averages in the x-direction
Real vb = 0.5_rt * (q_arr(i,j-1,k,QV) + q_arr(i-1,j-1,k,QV));
Real vt = 0.5_rt * (q_arr(i,j,k,QV) + q_arr(i-1,j,k,QV));
// These are transverse averages in the x-direction
Real vb = 0.5_rt * (q_arr(i,j-1,k,QV) + q_arr(i-1,j-1,k,QV));
Real vt = 0.5_rt * (q_arr(i,j,k,QV) + q_arr(i-1,j,k,QV));

vy = (vt - vb) * dyinv;
}
vy = (vt - vb) * dyinv;

} else {

Expand Down
Loading