Commit 215ea3ac authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Relax super-Wiscombe convergence criterium

parent 287f322b

src/cluster/cluster.cpp

+5 −4
Original line number Diff line number Diff line
@@ -244,10 +244,11 @@ void cluster(const string& config_file, const string& data_file, const string& o 
	message = "INFO: using RBT for inversion.\n";

	logger->log(message);

      } else if(gconf->invert_mode == RuntimeSettings::INV_MODE_SVD) {

	//message = "INFO: using SVD for inversion.\n";

	message = "ERROR: SVD inversion mode not yet implemented!\n";

	message = "INFO: using SVD for inversion.\n";

	logger->log(message);

	exit(1);

	// message = "ERROR: SVD inversion mode not yet implemented!\n";

	// logger->err(message);

	// exit(1);

      }

      // Overlapping spheres test

      double tolerance = gconf->tolerance;
@@ -808,7 +809,7 @@ int cluster_jxi488_cycle( 
  const int max_le = gconf->le;

  const double alamb = 2.0 * pi / cid->vk;

  double size_par_li = 2.0 * pi * sqrt(exdc) * sconf->get_max_radius() / alamb;

  int recommended_li = 4 + (int)ceil(size_par_li + 4.05 * pow(size_par_li, 1.0 / 3.0));

  int recommended_li = 2 + (int)ceil(size_par_li + 4.05 * pow(size_par_li, 1.0 / 3.0));

  double size_par_le = 2.0 * pi * sqrt(exdc) * sconf->get_particle_radius(gconf) / alamb;

  int recommended_le = 1 + (int)ceil(size_par_le + 11.0 * pow(size_par_le, 1.0 / 3.0));

  if (recommended_li != cid->c1->li || recommended_le != cid->c1->le) {

src/inclusion/inclusion.cpp

+1 −1
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ int inclusion_jxi488_cycle(int jxi488, ScattererConfiguration *sconf, GeometryCo 
  const int max_le = gconf->le;

  const double alamb = 2.0 * pi / cid->vk;

  double size_par_li = 2.0 * pi * sqrt(exdc) * sconf->get_max_radius() / alamb;

  int recommended_li = 4 + (int)ceil(size_par_li + 4.05 * pow(size_par_li, 1.0 / 3.0));

  int recommended_li = 2 + (int)ceil(size_par_li + 4.05 * pow(size_par_li, 1.0 / 3.0));

  double size_par_le = 2.0 * pi * sqrt(exdc) * sconf->get_particle_radius(gconf) / alamb;

  int recommended_le = 1 + (int)ceil(size_par_le + 11.0 * pow(size_par_le, 1.0 / 3.0));

  if (recommended_li != cid->c1->li || recommended_le != cid->c1->le) {