Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] incoming/PITTNullCode/SphericalHarmonicReconGen/src/ (Rev. 99)
by reisswig＠tapir.caltech.edu 24 Oct '13

24 Oct '13

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)

1 0

[Carpet] branch, master, updated. carpet-6-init-384-gae71ad5
by Carpet git repositories 24 Oct '13

24 Oct '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via ae71ad5e952a892c7b4a326daa078bccf6e4393b (commit) from 63c7615a27857f00a602b6ab5ccff2cc512bf503 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ae71ad5e952a892c7b4a326daa078bccf6e4393b Author: Roland Haas <roland.haas(a)physics.gatech.edu> Date: Thu Oct 24 00:54:15 2013 -0700 LoopControl: provide omp_get_max_threads fallback ----------------------------------------------------------------------- Summary of changes: Carpet/LoopControl/src/loopcontrol.cc | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[svn:einsteintoolkit] TwoPunctures/trunk/src/ (Rev. 135)
by rhaas＠tapir.caltech.edu 23 Oct '13

23 Oct '13

User: rhaas Date: 2013/10/23 11:00 AM Modified: /trunk/src/ TP_utilities.c Log: correct amount of memory allocated in d3tensor had mixed up depth and length before File Changes: Directory: /trunk/src/ ====================== File [modified]: TP_utilities.c Delta lines: +1 -1 =================================================================== --- trunk/src/TP_utilities.c 2013-07-11 13:30:09 UTC (rev 134) +++ trunk/src/TP_utilities.c 2013-10-23 16:00:15 UTC (rev 135) @@ -112,7 +112,7 @@ CCTK_WARN (CCTK_WARN_ABORT, "allocation failure (2) in dmatrix()"); /* get all memory for the tensor in on chunk */ - retval[0][0] = malloc(sizeof(CCTK_REAL)*(nrh-nrl+1)*(nch-ncl+1)*(nrh-nrl+1)); + retval[0][0] = malloc(sizeof(CCTK_REAL)*(nrh-nrl+1)*(nch-ncl+1)*(ndh-ndl+1)); if(retval[0][0] == NULL) CCTK_WARN (CCTK_WARN_ABORT, "allocation failure (3) in dmatrix()");

1 0

[Carpet] branch, master, updated. carpet-6-init-383-g63c7615
by Carpet git repositories 22 Oct '13

22 Oct '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via 63c7615a27857f00a602b6ab5ccff2cc512bf503 (commit) from 666a5538cfde2a95339e5e9155e00457fd4b0185 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 63c7615a27857f00a602b6ab5ccff2cc512bf503 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Tue Oct 22 21:53:20 2013 -0400 CarpetInter2: Avoid const warnings ----------------------------------------------------------------------- Summary of changes: Carpet/CarpetInterp2/src/fasterp.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[Carpet] branch, master, updated. carpet-6-init-382-g666a553
by Carpet git repositories 22 Oct '13

22 Oct '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via 666a5538cfde2a95339e5e9155e00457fd4b0185 (commit) from 8237792551e9f5f9ca95e98d78a709b5722ed25f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 666a5538cfde2a95339e5e9155e00457fd4b0185 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Tue Oct 22 17:49:39 2013 -0400 CarpetInterp2: Make code compile when CARPETINTERP2_CHECK is not set ----------------------------------------------------------------------- Summary of changes: Carpet/CarpetInterp2/src/fasterp.cc | 70 +++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 31 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[svn:einsteintoolkit] incoming/ (Rev. 98)
by rhaas＠tapir.caltech.edu 22 Oct '13

22 Oct '13

User: rhaas Date: 2013/10/22 02:58 PM Removed: /IDFileHydro/ Modified: / README Log: remove IDFileHydro since it is included in HydroBase File Changes: Directory: / ============ File [modified]: README Delta lines: +1 -1 =================================================================== --- README 2013-07-11 07:13:56 UTC (rev 97) +++ README 2013-10-22 19:58:44 UTC (rev 98) @@ -3,7 +3,7 @@ ADMDerivatives deleted; is included in Llama CartesianCoordinates deleted; is included in CTGamma CoreCollapseControl Roland Haas; needs documentation and testsuites -IDFileHydro Roland Haas; analog to IDFileADM +IDFileHydro deleted; code moved into HydroBase in rev 64 of HydroBase MemSpeed Erik Schnetter, accepted into CactusUtils SphericalHarmonicReconGen (PITTNull), Christian Reisswig; ready to be included. Roland provided testcases. Christian R. still needs to write basic doc. SphericalSlice Christian Reisswig; needs testsuites. This is currently included in Llama.

1 0

[svn:einsteintoolkit] SphericalHarmonicRecon/branches/tapir/ (Rev. 22)
by rhaas＠tapir.caltech.edu 22 Oct '13

22 Oct '13

User: rhaas Date: 2013/10/22 01:27 PM Added: /branches/tapir/ Log: create tapir branch

1 0

[svn:einsteintoolkit] SphericalHarmonicDecomp/branches/tapir/ (Rev. 13)
by rhaas＠tapir.caltech.edu 22 Oct '13

22 Oct '13

User: rhaas Date: 2013/10/22 01:27 PM Added: /branches/tapir/ Log: create tapir branch

1 0

[svn:einsteintoolkit] NullVars/branches/tapir/ (Rev. 14)
by rhaas＠tapir.caltech.edu 22 Oct '13

22 Oct '13

User: rhaas Date: 2013/10/22 01:27 PM Added: /branches/tapir/ Log: create tapir branch

1 0

[svn:einsteintoolkit] NullSHRExtract/branches/tapir/ (Rev. 15)
by rhaas＠tapir.caltech.edu 22 Oct '13

22 Oct '13

User: rhaas Date: 2013/10/22 01:27 PM Added: /branches/tapir/ Log: create tapir branch

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits