[Commits] [svn:einsteintoolkit] incoming/PITTNullCode/SphericalHarmonicReconGen/src/ (Rev. 99)
reisswig at tapir.caltech.edu
reisswig at tapir.caltech.edu
Thu Oct 24 16:33:15 CDT 2013
User: reisswig
Date: 2013/10/24 04:33 PM
Modified:
/PITTNullCode/SphericalHarmonicReconGen/src/
sph_database.cc, sph_database.hh, startup.cc
Log:
PITTNullCode/SphericalHarmonicReconGen: Adjust verbosity.
File Changes:
Directory: /PITTNullCode/SphericalHarmonicReconGen/src/
=======================================================
File [modified]: sph_database.cc
Delta lines: +9 -5
===================================================================
--- PITTNullCode/SphericalHarmonicReconGen/src/sph_database.cc 2013-10-22 19:58:44 UTC (rev 98)
+++ PITTNullCode/SphericalHarmonicReconGen/src/sph_database.cc 2013-10-24 21:33:14 UTC (rev 99)
@@ -7,11 +7,12 @@
SPH_db_ASCII::SPH_db_ASCII(const string& fname_,
+ const bool verbose_,
const int cached_timesteps,
const int col_time_,
const int col_iteration_,
const int col_radius_)
- : SPH_database(cached_timesteps), _fname(fname_),
+ : SPH_database(cached_timesteps, verbose_), _fname(fname_),
_col_time(col_time_), _col_iteration(col_iteration_), _col_radius(col_radius_)
{
file.open(fname_.c_str());
@@ -40,7 +41,7 @@
str << "Time-step not strictly monotonic: time[" << i-1 << "] = " << _times[i-1] << ", time[" << i << "] = " << _times[i];
CCTK_WARN(0, str.str().c_str());
}
- if (fabs(_times[i] - _times[i-1] - _delta_t) >= 1e-8)
+ if (verbose && fabs(_times[i] - _times[i-1] - _delta_t) >= 1e-8)
{
_delta_t = _times[i]-_times[i-1];
cout << "SPH_db_ASCII " << _fname << ": t = " << _times[i-1] << ", delta_t = " << _delta_t << endl;
@@ -470,6 +471,7 @@
SPH_db_DAT::SPH_db_DAT(const string& fname_,
+ const bool verbose_,
const int cached_timesteps,
const int lmax_,
const int col_time_,
@@ -478,7 +480,7 @@
const int col_lmax_,
const int col_n_variables_,
const int col_data_)
- : SPH_database(cached_timesteps), _fname(fname_),
+ : SPH_database(cached_timesteps, verbose_), _fname(fname_),
_col_time(col_time_), _col_iteration(col_iteration_), _col_radius(col_radius_), _col_lmax(col_lmax_),
_col_n_variables(col_n_variables_), _col_data(col_data_), columns_assigned(0)
{
@@ -890,8 +892,9 @@
SPH_db_SpEC_H5::SPH_db_SpEC_H5(const string& fname_,
+ const bool verbose_,
const int cached_timesteps)
- : SPH_database(cached_timesteps), _fname(fname_)
+ : SPH_database(cached_timesteps, verbose_), _fname(fname_)
{
// open file
file = H5Fopen(_fname.c_str(), H5F_ACC_RDONLY, H5P_DEFAULT);
@@ -1100,8 +1103,9 @@
SPH_db_SpEC_H5_v2::SPH_db_SpEC_H5_v2(const string& fname_,
+ const bool verbose_,
const int cached_timesteps)
- : SPH_database(cached_timesteps), _fname(fname_)
+ : SPH_database(cached_timesteps, verbose), _fname(fname_)
{
// open file
file = H5Fopen(_fname.c_str(), H5F_ACC_RDONLY, H5P_DEFAULT);
File [modified]: sph_database.hh
Delta lines: +8 -3
===================================================================
--- PITTNullCode/SphericalHarmonicReconGen/src/sph_database.hh 2013-10-22 19:58:44 UTC (rev 98)
+++ PITTNullCode/SphericalHarmonicReconGen/src/sph_database.hh 2013-10-24 21:33:14 UTC (rev 99)
@@ -42,13 +42,13 @@
: _times(vector<CCTK_REAL>(0)), _iterations(vector<CCTK_INT>(0)), _radii(0),
cache(1), cached_first_timestep(0), setup_cache(true),
_delta_t(0), _lmax(0), _n_spheres(0),
- _n_variables(0) { };
+ _n_variables(0), verbose(false) { };
- SPH_database(const size_t cached_timesteps)
+ SPH_database(const size_t cached_timesteps, const bool verbose_)
: _times(vector<CCTK_REAL>(0)),_iterations(vector<CCTK_INT>(0)), _radii(0),
cache(cached_timesteps), cached_first_timestep(0), setup_cache(true),
_delta_t(0), _lmax(0), _n_spheres(0),
- _n_variables(0) { assert(cached_timesteps >= 1); };
+ _n_variables(0), verbose(verbose_) { assert(cached_timesteps >= 1); };
virtual ~SPH_database() { };
@@ -113,6 +113,7 @@
// number of variables
int _n_variables;
+ bool verbose;
};
@@ -123,6 +124,7 @@
{
public :
SPH_db_ASCII(const string& fname_,
+ const bool verbose,
const int cached_timesteps,
const int col_time_,
const int col_iteration_,
@@ -203,6 +205,7 @@
{
public :
SPH_db_DAT(const string& fname_,
+ const bool verbose,
const int cached_timesteps,
const int lmax_,
const int col_time_,
@@ -292,6 +295,7 @@
{
public :
SPH_db_SpEC_H5(const string& fname_,
+ const bool verbose,
const int cached_timesteps);
virtual ~SPH_db_SpEC_H5();
@@ -347,6 +351,7 @@
{
public :
SPH_db_SpEC_H5_v2(const string& fname_,
+ const bool verbose,
const int cached_timesteps);
virtual ~SPH_db_SpEC_H5_v2();
File [modified]: startup.cc
Delta lines: +4 -4
===================================================================
--- PITTNullCode/SphericalHarmonicReconGen/src/startup.cc 2013-10-22 19:58:44 UTC (rev 98)
+++ PITTNullCode/SphericalHarmonicReconGen/src/startup.cc 2013-10-24 21:33:14 UTC (rev 99)
@@ -119,13 +119,13 @@
{
CCTK_INFO(string(string("Parsing ")+pathname+fnames[i]).c_str());
if (CCTK_EQUALS(format, "ASCII"))
- SHR::db[i] = new SHR::SPH_db_ASCII(pathname+fnames[i], cached_timesteps+1, column_time, column_iteration, column_radius);
+ SHR::db[i] = new SHR::SPH_db_ASCII(pathname+fnames[i], verbose, cached_timesteps+1, column_time, column_iteration, column_radius);
if (CCTK_EQUALS(format, "DAT"))
- SHR::db[i] = new SHR::SPH_db_DAT(pathname+fnames[i], cached_timesteps+1, lmaxInFile, column_time, column_iteration, column_radius, column_lmax, column_n_variables, column_data);
+ SHR::db[i] = new SHR::SPH_db_DAT(pathname+fnames[i], verbose, cached_timesteps+1, lmaxInFile, column_time, column_iteration, column_radius, column_lmax, column_n_variables, column_data);
if (CCTK_EQUALS(format, "SpEC-H5"))
- SHR::db[i] = new SHR::SPH_db_SpEC_H5(pathname+fnames[i], cached_timesteps+1);
+ SHR::db[i] = new SHR::SPH_db_SpEC_H5(pathname+fnames[i], verbose, cached_timesteps+1);
if (CCTK_EQUALS(format, "SpEC-H5-v2"))
- SHR::db[i] = new SHR::SPH_db_SpEC_H5_v2(pathname+fnames[i], cached_timesteps+1);
+ SHR::db[i] = new SHR::SPH_db_SpEC_H5_v2(pathname+fnames[i], verbose, cached_timesteps+1);
// check if timestep-size found in file matches characteristic timestep!
if (fabs(SHR::db[i]->delta_t()-CCTK_DELTA_TIME) > 1e-8)
More information about the Commits
mailing list