Commit 66b6ab16 authored by frey_m's avatar frey_m
Browse files

Merge branch '528-add-missing-enable_amr' into 'master'

Resolve "Add missing ENABLE_AMR"

Closes #528

See merge request !347
parents 0bb74580 2137b213
...@@ -1911,7 +1911,12 @@ size_t PartBunchBase<T, Dim>::calcMoments() { ...@@ -1911,7 +1911,12 @@ size_t PartBunchBase<T, Dim>::calcMoments() {
std::vector<double> loc_moments(4 * Dim + Dim * ( 2 * Dim + 1 )); std::vector<double> loc_moments(4 * Dim + Dim * ( 2 * Dim + 1 ));
long int totalNum = this->getTotalNum(); long int totalNum = this->getTotalNum();
if (!Options::amr && OpalData::getInstance()->isInOPALCyclMode()) { if (
#ifdef ENABLE_AMR
!Options::amr &&
#endif
OpalData::getInstance()->isInOPALCyclMode())
{
/* FIXME After issue 287 is resolved this shouldn't be necessary /* FIXME After issue 287 is resolved this shouldn't be necessary
* anymore * anymore
*/ */
......
...@@ -149,11 +149,13 @@ namespace Options { ...@@ -149,11 +149,13 @@ namespace Options {
extern int version; extern int version;
#ifdef ENABLE_AMR #ifdef ENABLE_AMR
/// Enable AMR if true
extern bool amr; extern bool amr;
/// The frequency to dump AMR grid data and particles into file /// The frequency to dump AMR grid data and particles into file
extern int amrYtDumpFreq; extern int amrYtDumpFreq;
/// After how many steps the AMR grid hierarchy is updated
extern int amrRegridFreq; extern int amrRegridFreq;
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment