diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2012-03-01 14:37:33 -0500 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2012-03-01 14:37:33 -0500 |
| commit | 017a5eec9c79118d178e3c18ba138318094ee31c (patch) | |
| tree | 3391bdd10bbddfb027ea718ddeddee2f3e9cc203 | |
| parent | 7e5ff140ac41e6bea6701a08a0437e94c37ba92a (diff) | |
| parent | 6d3b75da46282c8157962e34bccb1bd43d0ac67f (diff) | |
Merge
| -rw-r--r-- | Carpet/Carpet/src/Recompose.cc | 4 | ||||
| -rw-r--r-- | Carpet/CarpetRegrid2/src/regrid.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Carpet/Carpet/src/Recompose.cc b/Carpet/Carpet/src/Recompose.cc index 7d83ce02f..d20e5fd0b 100644 --- a/Carpet/Carpet/src/Recompose.cc +++ b/Carpet/Carpet/src/Recompose.cc @@ -1059,12 +1059,12 @@ namespace Carpet { min_active.AT(rl) = min (min_active.AT(rl), num_active_per_proc.AT(p)); max_active.AT(rl) = max (max_active.AT(rl), num_active_per_proc.AT(p)); avg_active.AT(rl) += num_active_per_proc.AT(p); - sdv_active.AT(rl) += pow (num_active_per_proc.AT(p), 2); + sdv_active.AT(rl) += ipow (num_active_per_proc.AT(p), 2); } avg_active.AT(rl) /= dist::size(); sdv_active.AT(rl) /= dist::size(); sdv_active.AT(rl) = - sqrt (max (rzero, sdv_active.AT(rl) - pow (avg_active.AT(rl), 2))); + sqrt (max (rzero, sdv_active.AT(rl) - ipow (avg_active.AT(rl), 2))); } // for rl // Output diff --git a/Carpet/CarpetRegrid2/src/regrid.cc b/Carpet/CarpetRegrid2/src/regrid.cc index 5df3fc57a..df4e10b76 100644 --- a/Carpet/CarpetRegrid2/src/regrid.cc +++ b/Carpet/CarpetRegrid2/src/regrid.cc @@ -89,7 +89,7 @@ namespace CarpetRegrid2 { double(this->_radius.at(rl)[2])); found_error = true; } - if (any (rad < 0.0)) { + if (any (rad < CCTK_REAL(0))) { CCTK_VWarn (CCTK_WARN_ABORT, __LINE__, __FILE__, CCTK_THORNSTRING, "The radius of refinement level %d of region %d is [%g,%g,%g], which is non-negative", rl, n + 1, |