Skip to content

Commit

Permalink
Use eos_re_t in places where it is sufficient (#1559)
Browse files Browse the repository at this point in the history
  • Loading branch information
maxpkatz authored Jan 30, 2021
1 parent e5caa15 commit 62a6112
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions Source/driver/Castro.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1374,7 +1374,7 @@ Castro::initData ()
Real v = S_arr(i,j,k,UMY) * rhoInv;
Real w = S_arr(i,j,k,UMZ) * rhoInv;

eos_t eos_state;
eos_re_t eos_state;
eos_state.rho = S_arr(i,j,k,URHO);
eos_state.T = S_arr(i,j,k,UTEMP);
eos_state.e = S_arr(i,j,k,UEINT) * rhoInv - 0.5_rt * (u*u + v*v + w*w);
Expand Down Expand Up @@ -3829,7 +3829,7 @@ Castro::reset_internal_energy(const Box& bx,
Real Wp = u(i,j,k,UMZ) * rhoInv;
Real ke = 0.5_rt * (Up * Up + Vp * Vp + Wp * Wp);

eos_t eos_state;
eos_re_t eos_state;

eos_state.rho = u(i,j,k,URHO);
eos_state.T = lsmall_temp;
Expand Down Expand Up @@ -4146,7 +4146,7 @@ Castro::computeTemp(

Real rhoInv = 1.0_rt / u(i,j,k,URHO);

eos_t eos_state;
eos_re_t eos_state;

eos_state.rho = u(i,j,k,URHO);
eos_state.T = u(i,j,k,UTEMP); // Initial guess for the EOS
Expand Down
8 changes: 4 additions & 4 deletions Source/radiation/MGFLD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ void Radiation::eos_opacity_emissivity(const MultiFab& S_new,
{
Real rhoInv = 1.e0_rt / S_new_arr(i,j,k,URHO);

eos_t eos_state;
eos_re_t eos_state;
eos_state.rho = S_new_arr(i,j,k,URHO);
eos_state.T = temp_arr(i,j,k);
for (int n = 0; n < NumSpec; ++n) {
Expand Down Expand Up @@ -873,7 +873,7 @@ void Radiation::update_matter(MultiFab& rhoe_new, MultiFab& temp_new,
{
Real rhoInv = 1.e0_rt / S_new_arr(i,j,k,URHO);

eos_t eos_state;
eos_re_t eos_state;
eos_state.rho = S_new_arr(i,j,k,URHO);
eos_state.T = S_new_arr(i,j,k,UTEMP);
eos_state.e = Tp_n(i,j,k) * rhoInv;
Expand Down Expand Up @@ -918,7 +918,7 @@ void Radiation::update_matter(MultiFab& rhoe_new, MultiFab& temp_new,

Real rhoInv = 1.e0_rt / S_new_arr(i,j,k,URHO);

eos_t eos_state;
eos_re_t eos_state;
eos_state.rho = S_new_arr(i,j,k,URHO);
eos_state.T = Tp_n(i,j,k);
for (int n = 0; n < NumSpec; ++n) {
Expand Down Expand Up @@ -1578,7 +1578,7 @@ void Radiation::bisect_matter(MultiFab& rhoe_new, MultiFab& temp_new,
{
Real rhoInv = 1.e0_rt / state(i,j,k,URHO);

eos_t eos_state;
eos_re_t eos_state;
eos_state.rho = state(i,j,k,URHO);
eos_state.T = temp(i,j,k);
for (int n = 0; n < NumSpec; ++n) {
Expand Down
10 changes: 5 additions & 5 deletions Source/radiation/Radiation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1166,7 +1166,7 @@ void Radiation::state_update(MultiFab& state, MultiFab& frhoes)
{
Real rhoInv = 1.e0_rt / state_arr(i,j,k,URHO);

eos_t eos_state;
eos_re_t eos_state;
eos_state.rho = state_arr(i,j,k,URHO);
eos_state.T = state_arr(i,j,k,UTEMP);
eos_state.e = state_arr(i,j,k,UEINT) * rhoInv;
Expand Down Expand Up @@ -1388,7 +1388,7 @@ void Radiation::get_c_v(FArrayBox& c_v, FArrayBox& temp, FArrayBox& state,
{
Real rhoInv = 1.e0_rt / state_arr(i,j,k,URHO);

eos_t eos_state;
eos_re_t eos_state;
eos_state.rho = state_arr(i,j,k,URHO);
eos_state.T = temp_arr(i,j,k);
for (int n = 0; n < NumSpec; ++n) {
Expand Down Expand Up @@ -1460,7 +1460,7 @@ void Radiation::get_planck_and_temp(MultiFab& fkp,
{
Real rhoInv = 1.e0_rt / state_arr(i,j,k,URHO);

eos_t eos_state;
eos_re_t eos_state;
eos_state.rho = state_arr(i,j,k,URHO);
eos_state.T = state_arr(i,j,k,UTEMP);
eos_state.e = temp_arr(i,j,k) * rhoInv;
Expand Down Expand Up @@ -1571,7 +1571,7 @@ void Radiation::get_rosseland(MultiFab& kappa_r,
{
Real rhoInv = 1.e0_rt / state_arr(i,j,k,URHO);

eos_t eos_state;
eos_re_t eos_state;
eos_state.rho = state_arr(i,j,k,URHO);
eos_state.T = state_arr(i,j,k,UTEMP);
eos_state.e = state_arr(i,j,k,UEINT) * rhoInv;
Expand Down Expand Up @@ -2524,7 +2524,7 @@ void Radiation::get_rosseland_v_dcf(MultiFab& kappa_r, MultiFab& v, MultiFab& dc
{
Real rhoInv = 1.e0_rt / S_arr(i,j,k,URHO);

eos_t eos_state;
eos_re_t eos_state;
eos_state.rho = S_arr(i,j,k,URHO);
eos_state.T = S_arr(i,j,k,UTEMP);
eos_state.e = S_arr(i,j,k,UEINT) * rhoInv;
Expand Down

0 comments on commit 62a6112

Please sign in to comment.