Skip to content

Commit

Permalink
Formatting. (erf-model#1278)
Browse files Browse the repository at this point in the history
  • Loading branch information
@AMLattanzi
AMLattanzi authored Oct 27, 2023
1 parent 4c792f9 commit e6779fc
Show file tree
Hide file tree
Showing 17 changed files with 555 additions and 580 deletions.
26 changes: 13 additions & 13 deletions Source/Derive.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

namespace derived {

void erf_derrhodivide(
void erf_derrhodivide (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
const amrex::FArrayBox& datfab,
const int scalar_index);

void erf_dernull(
void erf_dernull (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int dcomp,
Expand All @@ -23,7 +23,7 @@ void erf_dernull(
const int* bcrec,
const int level);

void erf_derpres(
void erf_derpres (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int dcomp,
Expand All @@ -34,7 +34,7 @@ void erf_derpres(
const int* bcrec,
const int level);

void erf_dersoundspeed(
void erf_dersoundspeed (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int dcomp,
Expand All @@ -45,7 +45,7 @@ void erf_dersoundspeed(
const int* bcrec,
const int level);

void erf_dertemp(
void erf_dertemp (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int dcomp,
Expand All @@ -56,7 +56,7 @@ void erf_dertemp(
const int* bcrec,
const int level);

void erf_dertheta(
void erf_dertheta (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int dcomp,
Expand All @@ -67,7 +67,7 @@ void erf_dertheta(
const int* bcrec,
const int level);

void erf_derscalar(
void erf_derscalar (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int dcomp,
Expand All @@ -78,7 +78,7 @@ void erf_derscalar(
const int* bcrec,
const int level);

void erf_derKE(
void erf_derKE (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int dcomp,
Expand All @@ -89,7 +89,7 @@ void erf_derKE(
const int* bcrec,
const int level);

void erf_derQKE(
void erf_derQKE (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int dcomp,
Expand All @@ -101,7 +101,7 @@ void erf_derQKE(
const int level);

#if defined(ERF_USE_MOISTURE)
void erf_derQt(
void erf_derQt (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int dcomp,
Expand All @@ -112,7 +112,7 @@ void erf_derQt(
const int* bcrec,
const int level);

void erf_derQp(
void erf_derQp (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int dcomp,
Expand All @@ -123,7 +123,7 @@ void erf_derQp(
const int* bcrec,
const int level);
#elif defined(ERF_USE_WARM_NO_PRECIP)
void erf_derQv(
void erf_derQv (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int dcomp,
Expand All @@ -133,7 +133,7 @@ void erf_derQv(
amrex::Real time,
const int* bcrec,
const int level);
void erf_derQc(
void erf_derQc (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int dcomp,
Expand Down
26 changes: 13 additions & 13 deletions Source/Derive.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace derived {
* @params[in] datfab array of data used to construct derived quantity
* @params[in] scalar_index index of quantity to be divided by density
*/
void erf_derrhodivide(
void erf_derrhodivide (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
const amrex::FArrayBox& datfab,
Expand All @@ -34,7 +34,7 @@ void erf_derrhodivide(
* Placeholder function that does nothing
*/
void
erf_dernull(
erf_dernull (
const amrex::Box& /*bx*/,
amrex::FArrayBox& /*derfab*/,
int /*dcomp*/,
Expand All @@ -54,7 +54,7 @@ erf_dernull(
* @params[in] datfab array of data used to construct derived quantity
*/
void
erf_derpres(
erf_derpres (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int /*dcomp*/,
Expand Down Expand Up @@ -92,7 +92,7 @@ erf_derpres(
* @params[in] datfab array of data used to construct derived quantity
*/
void
erf_dersoundspeed(
erf_dersoundspeed (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int /*dcomp*/,
Expand Down Expand Up @@ -125,7 +125,7 @@ erf_dersoundspeed(
* @params[in] datfab array of data used to construct derived quantity
*/
void
erf_dertemp(
erf_dertemp (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int /*dcomp*/,
Expand Down Expand Up @@ -155,7 +155,7 @@ erf_dertemp(
* @params[in] datfab array of data used to construct derived quantity
*/
void
erf_dertheta(
erf_dertheta (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int /*dcomp*/,
Expand All @@ -177,7 +177,7 @@ erf_dertheta(
* @params[in] datfab array of data used to construct derived quantity
*/
void
erf_derscalar(
erf_derscalar (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int /*dcomp*/,
Expand All @@ -199,7 +199,7 @@ erf_derscalar(
* @params[in] datfab array of data used to construct derived quantity
*/
void
erf_derKE(
erf_derKE (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int /*dcomp*/,
Expand All @@ -221,7 +221,7 @@ erf_derKE(
* @params[in] datfab array of data used to construct derived quantity
*/
void
erf_derQKE(
erf_derQKE (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int /*dcomp*/,
Expand All @@ -244,7 +244,7 @@ erf_derQKE(
* @params[in] datfab array of data used to construct derived quantity
*/
void
erf_derQt(
erf_derQt (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int /*dcomp*/,
Expand All @@ -266,7 +266,7 @@ erf_derQt(
* @params[in] datfab array of data used to construct derived quantity
*/
void
erf_derQp(
erf_derQp (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int /*dcomp*/,
Expand All @@ -288,7 +288,7 @@ erf_derQp(
* @params[in] datfab array of data used to construct derived quantity
*/
void
erf_derQv(
erf_derQv (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int /*dcomp*/,
Expand All @@ -309,7 +309,7 @@ erf_derQv(
* @params[in] datfab array of data used to construct derived quantity
*/
void
erf_derQc(
erf_derQc (
const amrex::Box& bx,
amrex::FArrayBox& derfab,
int /*dcomp*/,
Expand Down
10 changes: 5 additions & 5 deletions Source/ERF.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,17 @@ public:
// constructor - reads in parameters from inputs file
// - sizes multilevel arrays and data structures
ERF ();
~ERF() override;
~ERF () override;

// Declare a default move constructor so we ensure the destructor is
// not called when we return an object of this class by value
ERF(ERF&&) noexcept = delete;
ERF (ERF&&) noexcept = delete;

// Declare a default move assignment operator
ERF& operator=(ERF&& other) noexcept = delete;

// Delete the copy constructor
ERF(const ERF& other) = delete;
ERF (const ERF& other) = delete;
//
// Delete the copy assignment operator
ERF& operator=(const ERF& other) = delete;
Expand Down Expand Up @@ -315,7 +315,7 @@ private:
///////////////////////////

// read in some parameters from inputs file
void ReadParameters();
void ReadParameters ();

// set covered coarse cells to be the average of overlying fine cells
void AverageDown ();
Expand Down Expand Up @@ -755,7 +755,7 @@ private:
amrex::Gpu::DeviceVector<amrex::Real> d_havg_qc;
#endif

void refinement_criteria_setup();
void refinement_criteria_setup ();

std::unique_ptr<WriteBndryPlanes> m_w2d = nullptr;
std::unique_ptr<ReadBndryPlanes> m_r2d = nullptr;
Expand Down
2 changes: 1 addition & 1 deletion Source/ERF_Tagging.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ ERF::ErrorEst (int level, TagBoxArray& tags, Real time, int /*ngrow*/)
*/

void
ERF::refinement_criteria_setup()
ERF::refinement_criteria_setup ()
{
if (max_level > 0)
{
Expand Down
2 changes: 1 addition & 1 deletion Source/ERF_make_new_level.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ ERF::update_terrain_arrays (int lev, Real time)
}

void
ERF::initialize_integrator(int lev, MultiFab& cons_mf, MultiFab& vel_mf)
ERF::initialize_integrator (int lev, MultiFab& cons_mf, MultiFab& vel_mf)
{
const BoxArray& ba(cons_mf.boxArray());
const DistributionMapping& dm(cons_mf.DistributionMap());
Expand Down
16 changes: 8 additions & 8 deletions Source/Initialization/ERF_init1d.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ using namespace amrex;
* the effects of Rayleigh Damping.
*/
void
ERF::initRayleigh()
ERF::initRayleigh ()
{
AMREX_ALWAYS_ASSERT(solverChoice.use_rayleigh_damping);

Expand Down Expand Up @@ -68,7 +68,7 @@ ERF::initRayleigh()
we are currently restarting from a checkpoint file.
*/
void
ERF::setRayleighRefFromSounding(bool restarting)
ERF::setRayleighRefFromSounding (bool restarting)
{
// If we are restarting then we haven't read the input_sounding file yet
// so we need to read it here
Expand Down Expand Up @@ -123,7 +123,7 @@ ERF::setRayleighRefFromSounding(bool restarting)
* hydrostatic equilibrium.
*/
void
ERF::initHSE(int lev)
ERF::initHSE (int lev)
{
MultiFab r_hse (base_state[lev], make_alias, 0, 1); // r_0 is first component
MultiFab p_hse (base_state[lev], make_alias, 1, 1); // p_0 is second component
Expand All @@ -138,7 +138,7 @@ ERF::initHSE(int lev)
}

void
ERF::initHSE()
ERF::initHSE ()
{
AMREX_ALWAYS_ASSERT(!init_sounding_ideal);
for (int lev = 0; lev <= finest_level; lev++)
Expand All @@ -158,10 +158,10 @@ ERF::initHSE()
* @param[in] z_nd Pointer to MultiFab storing node centered z-coordinates
*/
void
ERF::erf_enforce_hse(int lev,
MultiFab& dens, MultiFab& pres, MultiFab& pi,
std::unique_ptr<MultiFab>& z_cc,
std::unique_ptr<MultiFab>& z_nd)
ERF::erf_enforce_hse (int lev,
MultiFab& dens, MultiFab& pres, MultiFab& pi,
std::unique_ptr<MultiFab>& z_cc,
std::unique_ptr<MultiFab>& z_nd)
{
amrex::Real l_gravity = solverChoice.gravity;
bool l_use_terrain = solverChoice.use_terrain;
Expand Down
14 changes: 7 additions & 7 deletions Source/Initialization/ERF_init_from_input_sounding.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
using namespace amrex;

void
init_bx_scalars_from_input_sounding( const amrex::Box &bx,
init_bx_scalars_from_input_sounding (const amrex::Box &bx,
amrex::Array4<amrex::Real> const &state,
amrex::GeometryData const &geomdata,
InputSoundingData const &inputSoundingData);
void
init_bx_scalars_from_input_sounding_hse( const amrex::Box &bx,
init_bx_scalars_from_input_sounding_hse (const amrex::Box &bx,
amrex::Array4<amrex::Real> const &state,
amrex::Array4<amrex::Real> const &r_hse_arr,
amrex::Array4<amrex::Real> const &p_hse_arr,
Expand All @@ -26,7 +26,7 @@ init_bx_scalars_from_input_sounding_hse( const amrex::Box &bx,
InputSoundingData const &inputSoundingData);

void
init_bx_velocities_from_input_sounding( const amrex::Box &bx,
init_bx_velocities_from_input_sounding (const amrex::Box &bx,
amrex::Array4<amrex::Real> const &x_vel,
amrex::Array4<amrex::Real> const &y_vel,
amrex::Array4<amrex::Real> const &z_vel,
Expand All @@ -40,7 +40,7 @@ init_bx_velocities_from_input_sounding( const amrex::Box &bx,
* @param lev Integer specifying the current level
*/
void
ERF::init_from_input_sounding(int lev)
ERF::init_from_input_sounding (int lev)
{
// We only want to read the file once -- here we fill one FArrayBox (per variable) that spans the domain
if (lev == 0) {
Expand Down Expand Up @@ -108,7 +108,7 @@ ERF::init_from_input_sounding(int lev)
* @param inputSoundingData InputSoundingData object we are to initialize from
*/
void
init_bx_scalars_from_input_sounding( const amrex::Box &bx,
init_bx_scalars_from_input_sounding (const amrex::Box &bx,
amrex::Array4<amrex::Real> const &state,
amrex::GeometryData const &geomdata,
InputSoundingData const &inputSoundingData)
Expand Down Expand Up @@ -167,7 +167,7 @@ init_bx_scalars_from_input_sounding( const amrex::Box &bx,
* @param inputSoundingData InputSoundingData object we are to initialize from
*/
void
init_bx_scalars_from_input_sounding_hse( const amrex::Box &bx,
init_bx_scalars_from_input_sounding_hse (const amrex::Box &bx,
amrex::Array4<amrex::Real> const &state,
amrex::Array4<amrex::Real> const &r_hse_arr,
amrex::Array4<amrex::Real> const &p_hse_arr,
Expand Down Expand Up @@ -255,7 +255,7 @@ init_bx_scalars_from_input_sounding_hse( const amrex::Box &bx,
* @param inputSoundingData InputSoundingData object we are to initialize from
*/
void
init_bx_velocities_from_input_sounding( const amrex::Box &bx,
init_bx_velocities_from_input_sounding (const amrex::Box &bx,
amrex::Array4<amrex::Real> const &x_vel,
amrex::Array4<amrex::Real> const &y_vel,
amrex::Array4<amrex::Real> const &z_vel,
Expand Down
Loading

0 comments on commit e6779fc

Please sign in to comment.