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

Modifying EOS.H with moisture #1263

Merged
merged 2 commits into from
Oct 10, 2023
Merged

Modifying EOS.H with moisture #1263

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c03e4b
Changes to EOS.H with moisture
Oct 10, 2023
4a20716
Change all functions in EOS.H to work with moisture
Oct 10, 2023
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
39 changes: 26 additions & 13 deletions Source/EOS.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@
* @params[in] rhotheta density times potential temperature theta
*/
AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
amrex::Real getTgivenRandRTh(const amrex::Real rho, const amrex::Real rhotheta)
amrex::Real getTgivenRandRTh(const amrex::Real rho, const amrex::Real rhotheta, const amrex::Real qv=0.0)
{
amrex::Real p_loc = p_0 * std::pow(R_d * rhotheta * ip_0, Gamma);
return p_loc / (R_d * rho);
// rho and rhotheta are dry values. We should be using moist value of theta when using moisture
// theta_m = theta * (1 + R_v/R_d*qv)
amrex::Real p_loc = p_0 * std::pow(R_d * rhotheta * (1.0 + R_v/R_d*qv) * ip_0, Gamma);
// p = rho_d * R_d * T_v (not T)
// T_v = T * (1 + R_v/R_d*qv)
return p_loc / (R_d * rho * (1.0 + R_v/R_d*qv) );
}

/**
Expand All @@ -27,9 +31,11 @@ amrex::Real getTgivenRandRTh(const amrex::Real rho, const amrex::Real rhotheta)
* @params[in] rd0cp ratio of R_d to c_p
*/
AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
amrex::Real getThgivenRandT(const amrex::Real rho, const amrex::Real T, const amrex::Real rdOcp)
amrex::Real getThgivenRandT(const amrex::Real rho, const amrex::Real T, const amrex::Real rdOcp, const amrex::Real qv=0.0)
{
amrex::Real p_loc = rho * R_d * T;
// p = rho_d * R_d * T_moist
amrex::Real p_loc = rho * R_d * T * (1.0 + R_v/R_d*qv);
// theta_d = T * (p0/p)^(R_d/C_p)
return T * std::pow((p_0/p_loc),rdOcp);
}

Expand Down Expand Up @@ -65,9 +71,11 @@ amrex::Real getPgivenRTh(const amrex::Real rhotheta, const amrex::Real qv = 0.)
* @params[in] rd0cp ratio of R_d to c_p
*/
AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
amrex::Real getRhogivenThetaPress (const amrex::Real theta, const amrex::Real p, const amrex::Real rdOcp)
amrex::Real getRhogivenThetaPress (const amrex::Real theta, const amrex::Real p, const amrex::Real rdOcp, const amrex::Real qv=0.0)
{
return std::pow(p_0, rdOcp) * std::pow(p, iGamma) / (R_d * theta);
// We should be using moist value of theta when using moisture
// theta_m = theta * (1 + R_v/R_d*qv)
return std::pow(p_0, rdOcp) * std::pow(p, iGamma) / (R_d * theta * (1.0 + R_v/R_d*qv) );
}

/**
Expand All @@ -78,9 +86,11 @@ amrex::Real getRhogivenThetaPress (const amrex::Real theta, const amrex::Real p,
* @params[in] rd0cp ratio of R_d to c_p
*/
AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
amrex::Real getdPdRgivenConstantTheta(const amrex::Real rho, const amrex::Real theta)
amrex::Real getdPdRgivenConstantTheta(const amrex::Real rho, const amrex::Real theta, const amrex::Real qv=0.0)
{
return Gamma * p_0 * std::pow( (R_d * theta * ip_0), Gamma) * std::pow(rho, Gamma-1.0) ;
// We should be using moist value of theta when using moisture
// theta_m = theta * (1 + R_v/R_d*qv)
return Gamma * p_0 * std::pow( (R_d * theta * (1.0 + R_v/R_d*qv) * ip_0), Gamma) * std::pow(rho, Gamma-1.0) ;
}

/**
Expand All @@ -102,10 +112,12 @@ amrex::Real getExnergivenP(const amrex::Real P, const amrex::Real rdOcp)
* @params[in] rd0cp ratio of R_d to c_p
*/
AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
amrex::Real getExnergivenRTh(const amrex::Real rhotheta, const amrex::Real rdOcp)
amrex::Real getExnergivenRTh(const amrex::Real rhotheta, const amrex::Real rdOcp, const amrex::Real qv=0.0 )
{
// Exner function pi in terms of (rho theta)
return std::pow(R_d * rhotheta * ip_0, Gamma * rdOcp);
// We should be using moist value of theta when using moisture
// theta_m = theta * (1 + R_v/R_d*qv)
return std::pow(R_d * rhotheta * (1.0 + R_v/R_d*qv) * ip_0, Gamma * rdOcp);
}

/**
Expand All @@ -114,11 +126,12 @@ amrex::Real getExnergivenRTh(const amrex::Real rhotheta, const amrex::Real rdOcp
* @params[in] p pressure
*/
AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
amrex::Real getRhoThetagivenP(const amrex::Real p)
amrex::Real getRhoThetagivenP(const amrex::Real p, const amrex::Real qv=0.0)
{
// diagnostic relation for the full pressure
// see https://erf.readthedocs.io/en/latest/theory/NavierStokesEquations.html
return std::pow(p*std::pow(p_0, Gamma-1), iGamma) * iR_d;
// For cases with mositure theta = theta_m / (1 + R_v/R_d*qv)
return std::pow(p*std::pow(p_0, Gamma-1), iGamma) * iR_d / (1.0 + R_v/R_d*qv) ;
}

#endif
Expand Down