Skip to content

Commit

Permalink
Merge branch 'development' into rm_actual_rhs
Browse files Browse the repository at this point in the history
  • Loading branch information
@maxpkatz
maxpkatz authored Aug 9, 2023
2 parents e39b1b5 + 48b65b7 commit 94a29f8
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 20 deletions.
20 changes: 10 additions & 10 deletions Exec/hydro_tests/Sedov/ci-benchmarks/grid_diag.out
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# COLUMN 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
# TIMESTEP TIME MASS XMOM YMOM ZMOM ANG. MOM. X ANG. MOM. Y ANG. MOM. Z KIN. ENERGY INT. ENERGY GAS 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
0 0.0000000000000000 1.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 9.9540123498075317e-01 9.9540123498075317e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 1.6844909478137644e-03 1.0000000000000000e+00
1 3.2340315269509180e-07 1.0000000000000000e+00 4.9929899935204420e-23 9.7893212101932719e-22 1.1150758320747774e-21 -5.8564543164087229e-25 -2.0070552009916963e-25 2.3892682404197791e-25 8.9703654836411039e-05 9.9531153132591343e-01 9.9540123498075073e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 4.9929899935204420e-23 9.7893212101932719e-22 1.1150758320747774e-21 1.6858365601187205e-03 1.0027049946567383e+00
2 6.7914662065969288e-07 1.0000000000000000e+00 -1.1158652869447283e-22 6.0061993424450258e-22 -2.7886185185832650e-21 4.3240311672957427e-24 -8.4696261649767703e-25 1.5395577253132659e-24 3.8423927161269461e-04 9.9501699570913438e-01 9.9540123498074762e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 -1.1158652869447283e-22 6.0061993424450258e-22 -2.7886185185832650e-21 1.6864495062059968e-03 1.0056668439067880e+00
3 1.0704644354207541e-06 1.0000000000000000e+00 -4.0287572237025100e-22 -6.7098878056306248e-22 2.1234934225641719e-22 1.3173436939170799e-23 2.7189532737695737e-26 -1.2107111007412133e-25 9.2349575408761124e-04 9.9447773922665816e-01 9.9540123498074684e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 -4.0287572237025100e-22 -6.7098878056306248e-22 2.1234934225641719e-22 1.6861149214870039e-03 1.0089335120072900e+00
4 1.5009140316579215e-06 1.0000000000000000e+00 4.7609563153197017e-22 7.7112631559282402e-22 3.1147001504997673e-21 -2.6530913088839060e-23 9.3337651509231354e-26 -8.7130004653856358e-26 1.7500938097544522e-03 9.9365114117099396e-01 9.9540123498074795e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 4.7609563153197017e-22 7.7112631559282402e-22 3.1147001504997673e-21 1.6845834827060515e-03 1.0125508345508307e+00
5 1.9744085875188056e-06 1.0000000000000000e+00 -2.3271518640690968e-21 -2.5647398094289528e-21 6.4728981022429456e-21 -3.1803070123077590e-23 -1.0952295359424102e-24 4.3749416437873281e-24 2.9086825411941161e-03 9.9249255243955481e-01 9.9540123498074884e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 -2.3271518640690968e-21 -2.5647398094289528e-21 6.4728981022429456e-21 1.6815708968173030e-03 1.0165662472922896e+00
6 2.4952525989657783e-06 1.0000000000000000e+00 5.5226455020453059e-22 -5.1998047563368342e-21 2.4420707592004308e-21 -2.2136041350130503e-23 4.2402405795856489e-25 -3.1716966330848431e-25 4.4448819499973494e-03 9.9095635303074925e-01 9.9540123498074495e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.5226455020453059e-22 -5.1998047563368342e-21 2.4420707592004308e-21 1.6767596950311417e-03 1.0210296903903961e+00
7 3.0681810115574480e-06 1.0000000000000000e+00 -1.1497981252829891e-21 7.9727923608579947e-22 -5.9715981306415299e-21 5.3719684581425005e-23 8.7208790843202246e-24 -5.2370342228606984e-24 6.4039159816232207e-03 9.8899731899912302e-01 9.9540123498074584e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 -1.1497981252829891e-21 7.9727923608579947e-22 -5.9715981306415299e-21 1.6698040876624970e-03 1.0259931723139593e+00
8 3.6984022654082848e-06 1.0000000000000000e+00 -1.8634447895113457e-21 -3.9825980142816663e-21 -1.5836161813831826e-20 5.2751699298114429e-23 -5.3489500739774609e-26 1.1585675873543907e-24 8.8286338414316368e-03 9.8657260113931156e-01 9.9540123498074518e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 -1.8634447895113457e-21 -3.9825980142816663e-21 -1.5836161813831826e-20 1.6603389989929885e-03 1.0315138742878078e+00
9 4.3916456446442054e-06 1.0000000000000000e+00 2.3478219828395107e-21 7.2787637852545987e-21 1.9416989223323700e-20 3.7014880190616822e-23 5.3876681082098975e-24 2.4231015788993597e-24 1.1756864058453916e-02 9.8364437092228918e-01 9.9540123498074484e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 2.3478219828395107e-21 7.2787637852545987e-21 1.9416989223323700e-20 1.6479961257582934e-03 1.0376448504870353e+00
10 5.1542133618037184e-06 1.0000000000000000e+00 7.9282773648941868e-21 -1.2111253618238125e-20 9.1835817601068558e-21 -1.1567373581611758e-23 1.2834446639596728e-24 -1.2396760168577233e-24 1.5220109474180586e-02 9.8018112550656189e-01 9.9540123498073985e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 7.9282773648941868e-21 -1.2111253618238125e-20 9.1835817601068558e-21 1.6324217890666801e-03 1.0444094800687724e+00
1 3.2340315269509180e-07 1.0000000000000000e+00 -1.2207196712653843e-22 -2.4091738146955404e-21 1.5915318696162594e-21 -6.8657515920158759e-26 -6.1490168351429670e-25 3.2333634833518791e-26 8.9703654836411012e-05 9.9531153132591343e-01 9.9540123498075073e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 -1.2207196712653843e-22 -2.4091738146955404e-21 1.5915318696162594e-21 1.6858365601187205e-03 1.0027049946567383e+00
2 6.7914662065969288e-07 1.0000000000000000e+00 -4.8211172704689422e-22 -1.0918949986942682e-21 7.0508219992330420e-22 -1.8798232765775811e-24 8.0820625471129870e-25 -1.7707803610263417e-24 3.8423927161269466e-04 9.9501699570913438e-01 9.9540123498074762e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 -4.8211172704689422e-22 -1.0918949986942682e-21 7.0508219992330420e-22 1.6864495062059968e-03 1.0056668439067880e+00
3 1.0704644354207541e-06 1.0000000000000000e+00 -2.9813388912628283e-22 -1.7291596040867426e-21 2.2238460006813763e-21 4.4807723826432593e-24 3.0419916181484195e-26 -1.1783993498209245e-25 9.2349575408761178e-04 9.9447773922665816e-01 9.9540123498074684e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 -2.9813388912628283e-22 -1.7291596040867426e-21 2.2238460006813763e-21 1.6861149214870039e-03 1.0089335120072900e+00
4 1.5009140316579215e-06 1.0000000000000000e+00 -2.6671276071627604e-22 -4.3077618329457170e-21 6.9296581549033018e-21 -2.6527676273992766e-23 9.3336073910876310e-26 -7.4206885132030372e-26 1.7500938097544530e-03 9.9365114117099396e-01 9.9540123498074795e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 -2.6671276071627604e-22 -4.3077618329457170e-21 6.9296581549033018e-21 1.6845834827060515e-03 1.0125508345508307e+00
5 1.9744085875188056e-06 1.0000000000000000e+00 -6.3474023010839024e-22 6.1825381679055237e-22 3.7233505624731776e-21 -3.5880805610691169e-23 -1.1210820872774543e-24 1.0791438906531501e-24 2.9086825411941174e-03 9.9249255243955481e-01 9.9540123498074884e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 -6.3474023010839024e-22 6.1825381679055237e-22 3.7233505624731776e-21 1.6815708968173030e-03 1.0165662472922896e+00
6 2.4952525989657783e-06 1.0000000000000000e+00 4.4390570719101193e-22 -1.0690619556219678e-20 7.5297281244317040e-22 -1.1369743223782199e-23 4.2401143682164562e-25 1.3501162573798219e-24 4.4448819499973494e-03 9.9095635303074925e-01 9.9540123498074495e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 4.4390570719101193e-22 -1.0690619556219678e-20 7.5297281244317040e-22 1.6767596950311417e-03 1.0210296903903961e+00
7 3.0681810115574480e-06 1.0000000000000000e+00 -3.0275386923141278e-22 -9.7740599041581691e-21 -1.8250246124797069e-20 5.5490393562904503e-23 2.0517353992307376e-24 2.2076165308714793e-24 6.4039159816232216e-03 9.8899731899912302e-01 9.9540123498074584e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 -3.0275386923141278e-22 -9.7740599041581691e-21 -1.8250246124797069e-20 1.6698040876624970e-03 1.0259931723139593e+00
8 3.6984022654082848e-06 1.0000000000000000e+00 4.6592651304257016e-22 -1.2889643298859528e-20 -1.4545711576146026e-20 6.7925382270759017e-23 -9.8406768440403449e-25 1.1069192797156519e-24 8.8286338414316386e-03 9.8657260113931156e-01 9.9540123498074518e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 4.6592651304257016e-22 -1.2889643298859528e-20 -1.4545711576146026e-20 1.6603389989929885e-03 1.0315138742878078e+00
9 4.3916456446442054e-06 1.0000000000000000e+00 -4.1823443920858115e-22 7.3054338996609584e-21 2.0290640598217802e-20 -1.2460430777904047e-23 -2.1087571564470760e-24 2.3714027788715768e-24 1.1756864058453918e-02 9.8364437092228918e-01 9.9540123498074484e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 -4.1823443920858115e-22 7.3054338996609584e-21 2.0290640598217802e-20 1.6479961257582934e-03 1.0376448504870353e+00
10 5.1542133618037184e-06 1.0000000000000000e+00 4.5534321718228044e-21 1.4546635379088815e-21 -3.5217185637262915e-21 -3.4521685783548119e-23 1.1802490584677388e-24 -1.3430736079428157e-24 1.5220109474180588e-02 9.8018112550656189e-01 9.9540123498073985e-01 5.0000000000000000e-01 5.0000000000000000e-01 5.0000000000000000e-01 4.5534321718228044e-21 1.4546635379088815e-21 -3.5217185637262915e-21 1.6324217890666801e-03 1.0444094800687724e+00
6 changes: 3 additions & 3 deletions Exec/mhd_tests/OrszagTang/ci-benchmarks/OrszagTang-3d.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
density 0.22099460191 0.22100305489
xmom -0.2210626652 0.2210626652
ymom -0.2211744105 0.2211744105
zmom -1.1753951844e-20 1.5217693252e-20
zmom -1.1112777205e-20 1.3812384798e-20
rho_E 0.19805685456 0.46260143162
rho_e 0.19794567403 0.19795835472
Temp 7.2178028693e-09 7.21798941e-09
rho_X 0.22099460191 0.22100305489
pressure 0.1326236016 0.13263209766
x_velocity -1.0002839593 1.0002839593
y_velocity -1.0007881112 1.0007881112
z_velocity -5.3185354342e-20 6.8858396278e-20
z_velocity -5.0284094514e-20 6.2499529347e-20
B_x -0.28206060038 0.28206060038
B_y -0.28220293547 0.28220293547
B_z -1.1261901695e-18 1.6240199973e-18
B_z -1.1952718863e-18 1.3425972844e-18

11 changes: 4 additions & 7 deletions Util/exact_riemann/README → Util/exact_riemann/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,10 @@ generate exact solutions to the Riemann problem for comparison with
Castro shocktube output. Several inputs files for Helmholtz EOS-based
shocktubes are provided.

This solver is used in Zingale & Katz (2014), and more details are
given there.
This solver is used in Zingale & Katz (2015):

To build the solver, simply type 'make' in this directory.
https://ui.adsabs.harvard.edu/abs/2015ApJS..216...31Z/abstract

and more details are given there.

Note: at the moment, we compile in a network from Microphysics, but
we don't use an integrator. This is not needed since the GPackage.mak
in the network has the network dependent code blocked out with an
`ifneq ($(USE_REACT), FALSE)`
To build the solver, simply type 'make' in this directory.

0 comments on commit 94a29f8

Please sign in to comment.