diff --git a/src/main.cc b/src/main.cc index 214e735..fcb0dbe 100644 --- a/src/main.cc +++ b/src/main.cc @@ -654,7 +654,7 @@ int main(int argc, const char *argv[]) //... displacement the_poisson_solver->gradient(icoord, u, data_forIO); double dispmax = compute_finest_absmax(data_forIO); - music::ilog.Print("max. %c-displacement of HR particles is %f [mean dx]", 'x' + icoord, dispmax * (double)(1ll << data_forIO.levelmax())); + music::ilog.Print("\t - max. %c-displacement of HR particles is %f [mean dx]", 'x' + icoord, dispmax * (double)(1ll << data_forIO.levelmax())); coarsen_density(rh_Poisson, data_forIO, false); //... compute counter-mode to minimize advection errors @@ -784,14 +784,13 @@ int main(int argc, const char *argv[]) //... velocity kick to keep refined region centered? double sigv = compute_finest_sigma(data_forIO); - music::ilog.Print("sigma of %c-velocity of high-res particles is %f", 'x' + icoord, sigv); + music::ulog.Print("sigma of %c-velocity of high-res particles is %f", 'x' + icoord, sigv); double meanv = compute_finest_mean(data_forIO); - music::ilog.Print("mean of %c-velocity of high-res particles is %f", 'x' + icoord, meanv); music::ulog.Print("mean of %c-velocity of high-res particles is %f", 'x' + icoord, meanv); double maxv = compute_finest_absmax(data_forIO); - music::ilog.Print("max of abs of %c-velocity of high-res particles is %f", 'x' + icoord, maxv); + music::ulog.Print("max of abs of %c-velocity of high-res particles is %f", 'x' + icoord, maxv); coarsen_density(rh_Poisson, data_forIO, false); @@ -854,14 +853,13 @@ int main(int argc, const char *argv[]) data_forIO *= cosmo_vfact; double sigv = compute_finest_sigma(data_forIO); - music::ilog.Print("sigma of %c-velocity of high-res DM is %f", 'x' + icoord, sigv); + music::ulog.Print("sigma of %c-velocity of high-res DM is %f", 'x' + icoord, sigv); double meanv = compute_finest_mean(data_forIO); - music::ilog.Print("mean of %c-velocity of high-res particles is %f", 'x' + icoord, meanv); music::ulog.Print("mean of %c-velocity of high-res particles is %f", 'x' + icoord, meanv); double maxv = compute_finest_absmax(data_forIO); - music::ilog.Print("max of abs of %c-velocity of high-res particles is %f", 'x' + icoord, maxv); + music::ulog.Print("max of abs of %c-velocity of high-res particles is %f", 'x' + icoord, maxv); coarsen_density(rh_Poisson, data_forIO, false); @@ -913,14 +911,13 @@ int main(int argc, const char *argv[]) data_forIO *= cosmo_vfact; double sigv = compute_finest_sigma(data_forIO); - music::ilog.Print("sigma of %c-velocity of high-res baryons is %f", 'x' + icoord, sigv); + music::ulog.Print("sigma of %c-velocity of high-res baryons is %f", 'x' + icoord, sigv); double meanv = compute_finest_mean(data_forIO); - music::ilog.Print("mean of %c-velocity of high-res baryons is %f", 'x' + icoord, meanv); music::ulog.Print("mean of %c-velocity of high-res baryons is %f", 'x' + icoord, meanv); double maxv = compute_finest_absmax(data_forIO); - music::ilog.Print("max of abs of %c-velocity of high-res baryons is %f", 'x' + icoord, maxv); + music::ulog.Print("max of abs of %c-velocity of high-res baryons is %f", 'x' + icoord, maxv); coarsen_density(rh_Poisson, data_forIO, false); @@ -1033,14 +1030,13 @@ int main(int argc, const char *argv[]) double sigv = compute_finest_sigma(data_forIO); double meanv = compute_finest_mean(data_forIO); - music::ilog.Print("mean of %c-velocity of high-res particles is %f", 'x' + icoord, meanv); music::ulog.Print("mean of %c-velocity of high-res particles is %f", 'x' + icoord, meanv); double maxv = compute_finest_absmax(data_forIO); - music::ilog.Print("max of abs of %c-velocity of high-res particles is %f", 'x' + icoord, maxv); + music::ulog.Print("max of abs of %c-velocity of high-res particles is %f", 'x' + icoord, maxv); - music::ilog << " - velocity component " << icoord << " : sigma = " << sigv << std::endl; - music::ilog << " - velocity component " << icoord << " : mean = " << meanv << std::endl; + music::ilog << "\t - velocity component " << icoord << " : sigma = " << sigv << std::endl; + music::ilog << "\t - velocity component " << icoord << " : mean = " << meanv << std::endl; coarsen_density(rh_Poisson, data_forIO, false); @@ -1131,14 +1127,13 @@ int main(int argc, const char *argv[]) double sigv = compute_finest_sigma(data_forIO); double meanv = compute_finest_mean(data_forIO); - music::ilog.Print("mean of %c-velocity of high-res baryons is %f", 'x' + icoord, meanv); music::ulog.Print("mean of %c-velocity of high-res baryons is %f", 'x' + icoord, meanv); double maxv = compute_finest_absmax(data_forIO); - music::ilog.Print("max of abs of %c-velocity of high-res baryons is %f", 'x' + icoord, maxv); + music::ulog.Print("max of abs of %c-velocity of high-res baryons is %f", 'x' + icoord, maxv); - music::ilog << " - velocity component " << icoord << " : sigma = " << sigv << std::endl; - music::ilog << " - velocity component " << icoord << " : mean = " << meanv << std::endl; + music::ilog << "\t - velocity component " << icoord << " : sigma = " << sigv << std::endl; + music::ilog << "\t - velocity component " << icoord << " : mean = " << meanv << std::endl; coarsen_density(rh_Poisson, data_forIO, false); @@ -1243,7 +1238,7 @@ int main(int argc, const char *argv[]) the_poisson_solver->gradient(icoord, u1, data_forIO); double dispmax = compute_finest_absmax(data_forIO); - music::ilog.Print("max. %c-displacement of HR particles is %f [mean dx]", 'x' + icoord, dispmax * (double)(1ll << data_forIO.levelmax())); + music::ilog.Print("\t - max. %c-displacement of HR particles is %f [mean dx]", 'x' + icoord, dispmax * (double)(1ll << data_forIO.levelmax())); coarsen_density(rh_Poisson, data_forIO, false); diff --git a/src/plugins/region_ellipsoid.cc b/src/plugins/region_ellipsoid.cc index d8181d4..6d37c4f 100644 --- a/src/plugins/region_ellipsoid.cc +++ b/src/plugins/region_ellipsoid.cc @@ -723,9 +723,12 @@ public: pellip_[levelmax_]->get_center(c); pellip_[levelmax_]->get_matrix(A); - music::ilog.Print("Region center for ellipsoid determined at\n\t xc = ( %f %f %f )", c[0], c[1], c[2]); - music::ilog.Print("Ellipsoid matrix determined as\n\t ( %f %f %f )\n\t A = ( %f %f %f )\n\t ( %f %f %f )", - A[0], A[1], A[2], A[3], A[4], A[5], A[6], A[7], A[8]); + music::ilog << "Region center for ellipsoid determined at" << std::endl + <<"\t xc = ( " << c[0] << " " << c[1] << " " << c[2] << " )" << std::endl; + music::ilog << "Ellipsoid matrix determined as" <