From f4285d423613b06da6dd54080bab1e3b03884ea3 Mon Sep 17 00:00:00 2001 From: "Martin D. Weinberg" Date: Tue, 30 Sep 2025 14:10:26 -0400 Subject: [PATCH] Bring DEBUG preprocessor blocks up to date --- exputil/orbit_trans.cc | 8 ++++---- exputil/realize_model.cc | 4 ++-- src/ParticleFerry.cc | 2 -- utils/Analysis/KDcyltest.cc | 1 + utils/Analysis/KL_cyl.cc | 1 + utils/Analysis/KL_sph.cc | 1 + utils/Analysis/cross_validation_cyl.cc | 1 + utils/Analysis/cross_validation_cyl2.cc | 1 + utils/Analysis/cross_validation_sph.cc | 1 + utils/Analysis/cross_validation_sph2.cc | 1 + utils/Analysis/diskeof.cc | 1 + utils/Analysis/diskfreqs.cc | 1 + utils/Analysis/diskprof.cc | 1 + utils/Analysis/diskprof_coef.cc | 1 + utils/Analysis/gas2dcyl.cc | 1 + utils/Analysis/haloprof.cc | 1 + utils/Analysis/haloprof_coef.cc | 1 + utils/Analysis/mssaprof_disk.cc | 1 + utils/Analysis/mssaprof_halo.cc | 1 + utils/Analysis/pspbox.cc | 1 + utils/Analysis/psphisto.cc | 1 + utils/Analysis/slabprof.cc | 1 + utils/Analysis/sphprof.cc | 1 + utils/ICs/initial2d.cc | 2 +- 24 files changed, 27 insertions(+), 9 deletions(-) diff --git a/exputil/orbit_trans.cc b/exputil/orbit_trans.cc index e968b35b2..55804e01f 100644 --- a/exputil/orbit_trans.cc +++ b/exputil/orbit_trans.cc @@ -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) { @@ -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) { @@ -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)) - @@ -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)) - diff --git a/exputil/realize_model.cc b/exputil/realize_model.cc index 14ffc230c..9254db50b 100644 --- a/exputil/realize_model.cc +++ b/exputil/realize_model.cc @@ -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; @@ -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 diff --git a/src/ParticleFerry.cc b/src/ParticleFerry.cc index 30aa3d7c0..2678118b0 100644 --- a/src/ParticleFerry.cc +++ b/src/ParticleFerry.cc @@ -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 } @@ -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 } diff --git a/utils/Analysis/KDcyltest.cc b/utils/Analysis/KDcyltest.cc index edf29c8bb..e84c626db 100644 --- a/utils/Analysis/KDcyltest.cc +++ b/utils/Analysis/KDcyltest.cc @@ -42,6 +42,7 @@ #include // System libs +#include #include #include diff --git a/utils/Analysis/KL_cyl.cc b/utils/Analysis/KL_cyl.cc index ec7f4755d..55ecc0939 100644 --- a/utils/Analysis/KL_cyl.cc +++ b/utils/Analysis/KL_cyl.cc @@ -45,6 +45,7 @@ #include // System libs +#include #include #include diff --git a/utils/Analysis/KL_sph.cc b/utils/Analysis/KL_sph.cc index a9d205839..ff6f35814 100644 --- a/utils/Analysis/KL_sph.cc +++ b/utils/Analysis/KL_sph.cc @@ -45,6 +45,7 @@ // Progress barp #include // System libs +#include #include #include diff --git a/utils/Analysis/cross_validation_cyl.cc b/utils/Analysis/cross_validation_cyl.cc index b5264ef58..201343ece 100644 --- a/utils/Analysis/cross_validation_cyl.cc +++ b/utils/Analysis/cross_validation_cyl.cc @@ -46,6 +46,7 @@ #include // System libs +#include #include #include diff --git a/utils/Analysis/cross_validation_cyl2.cc b/utils/Analysis/cross_validation_cyl2.cc index 05ff3d5cd..958ff2d42 100644 --- a/utils/Analysis/cross_validation_cyl2.cc +++ b/utils/Analysis/cross_validation_cyl2.cc @@ -50,6 +50,7 @@ #include // System libs +#include #include #include diff --git a/utils/Analysis/cross_validation_sph.cc b/utils/Analysis/cross_validation_sph.cc index 3a12c79b9..ea822a28c 100644 --- a/utils/Analysis/cross_validation_sph.cc +++ b/utils/Analysis/cross_validation_sph.cc @@ -43,6 +43,7 @@ // System libs +#include #include #include diff --git a/utils/Analysis/cross_validation_sph2.cc b/utils/Analysis/cross_validation_sph2.cc index c52b60704..396b24a6f 100644 --- a/utils/Analysis/cross_validation_sph2.cc +++ b/utils/Analysis/cross_validation_sph2.cc @@ -46,6 +46,7 @@ using namespace std; // System libs +#include #include #include diff --git a/utils/Analysis/diskeof.cc b/utils/Analysis/diskeof.cc index df36500a8..4c2d471c0 100644 --- a/utils/Analysis/diskeof.cc +++ b/utils/Analysis/diskeof.cc @@ -52,6 +52,7 @@ #include // Command-line parser // System libs +#include #include #include diff --git a/utils/Analysis/diskfreqs.cc b/utils/Analysis/diskfreqs.cc index 5f7fb72bb..ee70147a9 100644 --- a/utils/Analysis/diskfreqs.cc +++ b/utils/Analysis/diskfreqs.cc @@ -38,6 +38,7 @@ #include // System libs +#include #include #include diff --git a/utils/Analysis/diskprof.cc b/utils/Analysis/diskprof.cc index 254e48cd0..42dc5de89 100644 --- a/utils/Analysis/diskprof.cc +++ b/utils/Analysis/diskprof.cc @@ -43,6 +43,7 @@ #include // YAML support // System libs +#include #include #include diff --git a/utils/Analysis/diskprof_coef.cc b/utils/Analysis/diskprof_coef.cc index 08b945e6f..8d37ac5a3 100644 --- a/utils/Analysis/diskprof_coef.cc +++ b/utils/Analysis/diskprof_coef.cc @@ -42,6 +42,7 @@ #include // YAML support // System libs +#include #include #include diff --git a/utils/Analysis/gas2dcyl.cc b/utils/Analysis/gas2dcyl.cc index 1fd2e6722..ea1309ebf 100644 --- a/utils/Analysis/gas2dcyl.cc +++ b/utils/Analysis/gas2dcyl.cc @@ -40,6 +40,7 @@ using namespace std; // System libs +#include #include #include diff --git a/utils/Analysis/haloprof.cc b/utils/Analysis/haloprof.cc index 5fcddab97..30aa1f6c7 100644 --- a/utils/Analysis/haloprof.cc +++ b/utils/Analysis/haloprof.cc @@ -41,6 +41,7 @@ using namespace std; // System libs +#include #include #include diff --git a/utils/Analysis/haloprof_coef.cc b/utils/Analysis/haloprof_coef.cc index d68cda372..cedd297ac 100644 --- a/utils/Analysis/haloprof_coef.cc +++ b/utils/Analysis/haloprof_coef.cc @@ -40,6 +40,7 @@ #include // System libs +#include #include #include diff --git a/utils/Analysis/mssaprof_disk.cc b/utils/Analysis/mssaprof_disk.cc index a73f56bcf..37e9f2bb8 100644 --- a/utils/Analysis/mssaprof_disk.cc +++ b/utils/Analysis/mssaprof_disk.cc @@ -41,6 +41,7 @@ #include // YAML support // System libs +#include #include #include diff --git a/utils/Analysis/mssaprof_halo.cc b/utils/Analysis/mssaprof_halo.cc index 7f20af866..a879c5283 100644 --- a/utils/Analysis/mssaprof_halo.cc +++ b/utils/Analysis/mssaprof_halo.cc @@ -41,6 +41,7 @@ #include // System libs +#include #include #include diff --git a/utils/Analysis/pspbox.cc b/utils/Analysis/pspbox.cc index 41aa86531..2d6194fe8 100644 --- a/utils/Analysis/pspbox.cc +++ b/utils/Analysis/pspbox.cc @@ -40,6 +40,7 @@ using namespace std; // System libs +#include #include #include diff --git a/utils/Analysis/psphisto.cc b/utils/Analysis/psphisto.cc index cf04001b7..07286bb77 100644 --- a/utils/Analysis/psphisto.cc +++ b/utils/Analysis/psphisto.cc @@ -39,6 +39,7 @@ #include // System libs +#include #include #include diff --git a/utils/Analysis/slabprof.cc b/utils/Analysis/slabprof.cc index b3e482ed6..a033405b1 100644 --- a/utils/Analysis/slabprof.cc +++ b/utils/Analysis/slabprof.cc @@ -37,6 +37,7 @@ #include // System libs +#include #include #include diff --git a/utils/Analysis/sphprof.cc b/utils/Analysis/sphprof.cc index 10fbba276..107cdd239 100644 --- a/utils/Analysis/sphprof.cc +++ b/utils/Analysis/sphprof.cc @@ -39,6 +39,7 @@ #include // System libs +#include #include #include diff --git a/utils/ICs/initial2d.cc b/utils/ICs/initial2d.cc index 106d4e7b5..2aa723059 100644 --- a/utils/ICs/initial2d.cc +++ b/utils/ICs/initial2d.cc @@ -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) {