Commit 44a396f3 authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Suppress outdated low-order warnings

parent 059493f4

src/cluster/cluster.cpp

+2 −12
Original line number Diff line number Diff line
@@ -762,12 +762,7 @@ int cluster_jxi488_cycle( 
  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) {

    if (recommended_li > cid->c1->li) {

      message = "WARNING: internal order " + to_string(cid->c1->li) + " for scale iteration "

	+ to_string(jxi488) + " too low (recommended order is " + to_string(recommended_li)

	+ ").\n";

      logger->log(message, LOG_WARN);

    } else if (recommended_li < cid->c1->li) {

    if (recommended_li < cid->c1->li) {

      if (gconf->dyn_order_flag > 0) {

	message = "INFO: lowering internal order from " + to_string(cid->c1->li) + " to "

	  + to_string(recommended_li) + " for scale iteration " + to_string(jxi488) + ".\n";
@@ -778,12 +773,7 @@ int cluster_jxi488_cycle( 
	logger->log(message, LOG_WARN);

      }

    }

    if (recommended_le > cid->c1->le) {

      message = "WARNING: external order " + to_string(cid->c1->le) + " for scale iteration "

	+ to_string(jxi488) + " too low (recommended order is " + to_string(recommended_le)

	+ ").\n";

      logger->log(message, LOG_WARN);

    } else if (recommended_le < cid->c1->le) {

    if (recommended_le < cid->c1->le) {

      if (gconf->dyn_order_flag > 0) {

	message = "INFO: lowering external order from " + to_string(cid->c1->le) + " to "

	  + to_string(recommended_le) + " for scale iteration " + to_string(jxi488) + ".\n";

src/inclusion/inclusion.cpp

+2 −12
Original line number Diff line number Diff line
@@ -752,12 +752,7 @@ int inclusion_jxi488_cycle(int jxi488, ScattererConfiguration *sconf, GeometryCo 
  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) {

    if (recommended_li > cid->c1->li) {

      message = "WARNING: internal order " + to_string(cid->c1->li) + " for scale iteration "

	+ to_string(jxi488) + " too low (recommended order is " + to_string(recommended_li)

	+ ").\n";

      logger->log(message, LOG_WARN);

    } else if (recommended_li < cid->c1->li) {

    if (recommended_li < cid->c1->li) {

      if (gconf->dyn_order_flag > 0) {

	message = "INFO: lowering internal order from " + to_string(cid->c1->li) + " to "

	  + to_string(recommended_li) + " for scale iteration " + to_string(jxi488) + ".\n";
@@ -768,12 +763,7 @@ int inclusion_jxi488_cycle(int jxi488, ScattererConfiguration *sconf, GeometryCo 
	logger->log(message, LOG_WARN);

      }

    }

    if (recommended_le > cid->c1->le) {

      message = "WARNING: external order " + to_string(cid->c1->le) + " for scale iteration "

	+ to_string(jxi488) + " too low (recommended order is " + to_string(recommended_le)

	+ ").\n";

      logger->log(message, LOG_WARN);

    } else if (recommended_le < cid->c1->le) {

    if (recommended_le < cid->c1->le) {

      if (gconf->dyn_order_flag > 0) {

	message = "INFO: lowering external order from " + to_string(cid->c1->le) + " to "

	  + to_string(recommended_le) + " for scale iteration " + to_string(jxi488) + ".\n";

src/sphere/sphere.cpp

+1 −6
Original line number Diff line number Diff line
@@ -568,12 +568,7 @@ int sphere_jxi488_cycle( 
  double size_par_lm = 2.0 * pi * sqrt(exdc) * sconf->get_max_radius() / alamb;

  int recommended_lm = 4 + (int)ceil(size_par_lm + 4.05 * pow(size_par_lm, 1.0 / 3.0));

  if (recommended_lm != l_max) {

    if (recommended_lm > max_lm) {

      message = "WARNING: internal order " + to_string(max_lm) + " for scale iteration "

	+ to_string(jxi488) + " too low (recommended order is " + to_string(recommended_lm)

	+ ").\n";

      logger->log(message, LOG_WARN);

    } else if (recommended_lm < max_lm) {

    if (recommended_lm < max_lm) {

      if (gconf->dyn_order_flag > 0) {

	int new_lm = recommended_lm;

	message = "INFO: lowering internal order from " + to_string(max_lm) + " to "