Skip to content

Commit

Permalink
Develop rebase.
Browse files Browse the repository at this point in the history
  • Loading branch information
AMLattanzi committed Nov 28, 2023
2 parents f747532 + a9892e7 commit 567b9ed
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Exec/SquallLine_2D/prob.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ void compute_rho(const Real z, const Real pressure, Real &theta, Real& rho, Real
q_v = vapor_mixing_ratio(z, pressure, T_b, RH);
rho = pressure/(R_d*T_b*(1.0 + R_v_by_R_d*q_v));
rho = rho*(1.0 + q_v);
T_dp = compute_dewpoint_temperature(z, pressure, T_b, RH);
T_dp = compute_dewpoint_temperature(z, pressure, T_b, RH);
}

double compute_F(const Real p_k, const Real p_k_minus_1, Real &theta_k, Real& rho_k, Real& q_v_k,
Expand Down
7 changes: 3 additions & 4 deletions Source/ERF.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -965,11 +965,10 @@ ERF::ReadParameters ()
pp.query("moisture_model", moisture_model);
if (moisture_model == "SAM") {
micro.SetModel<SAM>();
}
else if (moisture_model == "Kessler") {
} else if (moisture_model == "Kessler") {
micro.SetModel<Kessler>();
}
else {
} else {
micro.SetModel<NullMoist>();
amrex::Print() << "WARNING: Compiled with moisture but using NullMoist model!\n";
}
#endif
Expand Down

0 comments on commit 567b9ed

Please sign in to comment.