Commit 36202ffd authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Put refinement set up information under the iteration data constructors

parent 8fea6ecc

src/cluster/cluster.cpp

+0 −5
Original line number Diff line number Diff line
@@ -317,12 +317,7 @@ void cluster(const string& config_file, const string& data_file, const string& o 


      // do the first iteration on jxi488 separately, since it seems to be different from the others

      int jxi488 = 1;

      // In the first iteration, if refinement is enabled, determine the number of refinement iterations required to arrive at the target accuracy (if achievable in a reasonable number of iterations)

      cid->refinemode = 2;

      // maxrefiters and accuracygoal should be configurable and preferably set somewhere else

      cid->maxrefiters = 20;

      int initialmaxrefiters = cid->maxrefiters;

      cid->accuracygoal = 1e-6;

      chrono::time_point<chrono::high_resolution_clock> start_iter_1 = chrono::high_resolution_clock::now();

#ifdef USE_NVTX

      nvtxRangePush("First iteration");

src/inclusion/inclusion.cpp

+6 −5
Original line number Diff line number Diff line
@@ -302,6 +302,12 @@ InclusionIterationData::InclusionIterationData(GeometryConfiguration *gconf, Sca 
#else

  proc_device = 0;

#endif



  // In the first iteration, if refinement is enabled, determine the number of refinement iterations required to arrive at the target accuracy (if achievable in a reasonable number of iterations)

  refinemode = 2;

  // maxrefiters and accuracygoal should be configurable and preferably set somewhere else

  maxrefiters = 20;

  accuracygoal = 1e-6;

}



InclusionIterationData::InclusionIterationData(const InclusionIterationData& rhs) {
@@ -961,12 +967,7 @@ void inclusion(const string& config_file, const string& data_file, const string& 
      

      // do the first iteration on jxi488 separately, since it seems to be different from the others

      int jxi488 = 1;

      // In the first iteration, if refinement is enabled, determine the number of refinement iterations required to arrive at the target accuracy (if achievable in a reasonable number of iterations)

      cid->refinemode = 2;

      // maxrefiters and accuracygoal should be configurable and preferably set somewhere else

      cid->maxrefiters = 20;

      int initialmaxrefiters = cid->maxrefiters;

      cid->accuracygoal = 1e-6;

      

      chrono::time_point<chrono::high_resolution_clock> start_iter_1 = chrono::high_resolution_clock::now();

#ifdef USE_NVTX

src/libnptm/Commons.cpp

+6 −0
Original line number Diff line number Diff line
@@ -160,6 +160,12 @@ ClusterIterationData::ClusterIterationData(GeometryConfiguration *gconf, Scatter 
#else

  proc_device = 0;

#endif



  // In the first iteration, if refinement is enabled, determine the number of refinement iterations required to arrive at the target accuracy (if achievable in a reasonable number of iterations)

  refinemode = 2;

  // maxrefiters and accuracygoal should be configurable and preferably set somewhere else

  maxrefiters = 20;

  accuracygoal = 1e-6;

}



ClusterIterationData::ClusterIterationData(const ClusterIterationData& rhs) {