Commit 9db49646 authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Use XI scale factor when computing wavelength referred to VIV variable

parent d7ff893b

src/cluster/cluster.cpp

+2 −1
Original line number Diff line number Diff line
@@ -781,7 +781,8 @@ int cluster_jxi488_cycle( 
  // Dynamic order check

  const int max_li = gconf->li;

  const int max_le = gconf->le;

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

  double xi_factor = (sconf->reference_variable_name.compare("XIV") == 0) ? xi : 1.0;

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

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

  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;

src/inclusion/inclusion.cpp

+2 −1
Original line number Diff line number Diff line
@@ -745,7 +745,8 @@ int inclusion_jxi488_cycle( 
  // Dynamic order check

  const int max_li = gconf->li;

  const int max_le = gconf->le;

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

  double xi_factor = (sconf->reference_variable_name.compare("XIV") == 0) ? xi : 1.0;

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

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

  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;