Commit edf41beb authored by David Deepwell's avatar David Deepwell
Browse files

Change order of compute_Background_PE optional arguments

The dimensional rho option should not be after the mapping options
since the mapping options will need to be specified for an
unmapped dimensional density case. This now makes the optional
argument ordering more logical.
parent f69389d7
...@@ -296,7 +296,7 @@ bool compare_pairs( pair<double, double> a, pair<double, double> b ) { ...@@ -296,7 +296,7 @@ bool compare_pairs( pair<double, double> a, pair<double, double> b ) {
// Compute Background Potential Energy (BPE) // Compute Background Potential Energy (BPE)
void compute_Background_PE(double & BPE_tot, TArrayn::DTArray & rho, void compute_Background_PE(double & BPE_tot, TArrayn::DTArray & rho,
int Nx, int Ny, int Nz, double Lx, double Ly, double Lz, double g, int Nx, int Ny, int Nz, double Lx, double Ly, double Lz, double g,
double rho_0, int iter, bool mapped, Array<double,1> hill, bool dimensional_rho) { double rho_0, int iter, bool dimensional_rho, bool mapped, Array<double,1> hill) {
// Tensor variables for indexing // Tensor variables for indexing
blitz::firstIndex ii; blitz::firstIndex ii;
blitz::secondIndex jj; blitz::secondIndex jj;
......
...@@ -42,7 +42,7 @@ void dissipation(TArrayn::DTArray & diss, TArrayn::DTArray & u, TArrayn::DTArray ...@@ -42,7 +42,7 @@ void dissipation(TArrayn::DTArray & diss, TArrayn::DTArray & u, TArrayn::DTArray
// Background Potential Energy (BPE) // Background Potential Energy (BPE)
void compute_Background_PE(double & BPE_tot, TArrayn::DTArray & rho, int Nx, int Ny, int Nz, void compute_Background_PE(double & BPE_tot, TArrayn::DTArray & rho, int Nx, int Ny, int Nz,
double Lx, double Ly, double Lz, double g, double rho_0, int iter, double Lx, double Ly, double Lz, double g, double rho_0, int iter,
bool mapped = false, Array<double,1> hill = Array<double,1>(), bool dimensional_rho = false); bool dimensional_rho = false, bool mapped = false, Array<double,1> hill = Array<double,1>());
// Internal energy converted to BPE // Internal energy converted to BPE
void compute_BPE_from_internal(double & phi_i, TArrayn::DTArray & rho, void compute_BPE_from_internal(double & phi_i, TArrayn::DTArray & rho,
double kappa_rho, double rho_0, double g, int Nz, double kappa_rho, double rho_0, double g, int Nz,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment