Skip to content

Updates to DEBUG diagnostic code #163

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

Merged
michael-petersen merged 1 commit into from
Oct 1, 2025
Merged

Updates to DEBUG diagnostic code #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions exputil/orbit_trans.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void SphericalOrbit::compute_freq(void)
xmin = ZFRAC*model->get_min_radius();
xmax = model->get_max_radius();

// Functor whose zero locates radius of circular orbit with energy EE
// Functor whose zero locates radius of circular orbit
//
auto Ecirc = [&](double r)
{
Expand Down Expand Up @@ -123,7 +123,7 @@ void SphericalOrbit::compute_freq(void)
if (dudr>0.0) jmax = sqrt(r_circ*r_circ*r_circ*dudr);
else jmax = 0.0;

// Functor whose zero locates turning points for orbit (EE,JJ)
// Functor whose zero locates turning points for orbit
//
auto denom = [&](double r)
{
Expand Down Expand Up @@ -266,7 +266,7 @@ void SphericalOrbit::compute_freq(void)
ostringstream msg;

msg << "\t\tdenominator [1] out of bounds" << endl;
msg << "E=" << EE << " K=" << KK <<
msg << "E=" << energy << " K=" << kappa <<
" r=" << r << " i=" << i << "/" << FRECS << " val=" << tmp2 << endl;

tmp2 = 2.0*(energy-model->get_pot(r_peri)) -
Expand Down Expand Up @@ -299,7 +299,7 @@ void SphericalOrbit::compute_freq(void)
ostringstream msg;

msg << "\t\t denominator [2] out of bounds" << endl;
msg << "\t\tE=" << EE << " K=" << KK <<
msg << "\t\tE=" << energy << " K=" << kappa <<
" r=" << r << " i=" << i << "/" << FRECS << " val=" << tmp2 << endl;

tmp2 = 2.0*(energy-model->get_pot(r_peri)) -
Expand Down
4 changes: 2 additions & 2 deletions exputil/realize_model.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ AxiSymModel::PSret AxiSymModel::gen_point_3d()
if (gen_firstime) {

#ifdef DEBUG
orb = SphericalOrbit(this);
orb = SphericalOrbit(this->shared_from_this());
#endif

double tol = 1.0e-5;
Expand Down Expand Up @@ -741,7 +741,7 @@ AxiSymModel::PSret AxiSymModel::gen_point_3d_iso
gen_lastr = r;

#ifdef DEBUG
std::cout << "gen_point_3d_iso[" << ModelID << "]: " << rmin
std::cout << "gen_point_3d_iso[" << ModelID << "]: " << get_min_radius()
<< ", " << get_max_radius() << std::endl;
#endif

Expand Down
2 changes: 0 additions & 2 deletions src/ParticleFerry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,6 @@ void ParticleFerry::BufferSend()
MPI_Send(&buf[0], totchar, MPI_CHAR, _to, 3, MPI_COMM_WORLD);
#ifdef DEBUG
cout << "ParticleFerry: process " << myid << " send, tot=" << itotcount << endl;
bufferKeyCheck();
#endif
ibufcount = bufpos = 0; // Reset counter and position
}
Expand All @@ -378,6 +377,5 @@ void ParticleFerry::BufferRecv()
MPI_Recv(&buf[0], bufpos, MPI_CHAR, _from, 3, MPI_COMM_WORLD, &s);
#ifdef DEBUG
cout << "ParticleFerry: process " << myid << " recv, tot=" << itotcount-1+ibufcount << endl;
bufferKeyCheck();
#endif
}
1 change: 1 addition & 0 deletions utils/Analysis/KDcyltest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
#include <map>

// System libs
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
1 change: 1 addition & 0 deletions utils/Analysis/KL_cyl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include <Eigen/Eigen>

// System libs
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
1 change: 1 addition & 0 deletions utils/Analysis/KL_sph.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
// Progress barp
#include <Progress.H>
// System libs
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
1 change: 1 addition & 0 deletions utils/Analysis/cross_validation_cyl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
#include <Progress.H>

// System libs
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
1 change: 1 addition & 0 deletions utils/Analysis/cross_validation_cyl2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
#include <cxxopts.H>

// System libs
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
1 change: 1 addition & 0 deletions utils/Analysis/cross_validation_sph.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@


// System libs
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
1 change: 1 addition & 0 deletions utils/Analysis/cross_validation_sph2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ using namespace std;


// System libs
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
1 change: 1 addition & 0 deletions utils/Analysis/diskeof.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
#include <cxxopts.H> // Command-line parser

// System libs
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
1 change: 1 addition & 0 deletions utils/Analysis/diskfreqs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include <string>

// System libs
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
1 change: 1 addition & 0 deletions utils/Analysis/diskprof.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include <yaml-cpp/yaml.h> // YAML support

// System libs
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
1 change: 1 addition & 0 deletions utils/Analysis/diskprof_coef.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
#include <yaml-cpp/yaml.h> // YAML support

// System libs
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
1 change: 1 addition & 0 deletions utils/Analysis/gas2dcyl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
using namespace std;

// System libs
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
1 change: 1 addition & 0 deletions utils/Analysis/haloprof.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
using namespace std;

// System libs
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
1 change: 1 addition & 0 deletions utils/Analysis/haloprof_coef.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include <cmath>

// System libs
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
1 change: 1 addition & 0 deletions utils/Analysis/mssaprof_disk.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#include <yaml-cpp/yaml.h> // YAML support

// System libs
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
1 change: 1 addition & 0 deletions utils/Analysis/mssaprof_halo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#include <set>

// System libs
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
1 change: 1 addition & 0 deletions utils/Analysis/pspbox.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
using namespace std;

// System libs
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
1 change: 1 addition & 0 deletions utils/Analysis/psphisto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#include <cmath>

// System libs
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
1 change: 1 addition & 0 deletions utils/Analysis/slabprof.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include <string>

// System libs
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
1 change: 1 addition & 0 deletions utils/Analysis/sphprof.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#include <memory>

// System libs
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
2 changes: 1 addition & 1 deletion utils/ICs/initial2d.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ main(int ac, char **av)
std::cout << "Processor " << myid << ": n_particlesH=" << n_particlesH
<< std::endl
<< "Processor " << myid << ": n_particlesD=" << n_particlesD
<< std::endl
<< std::endl;
#endif

if (nhalo + ndisk <= 0) {
Expand Down