Commit 31f6a086 authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Switch to USE_DYN_ORDERS runtime option

parent 760a1b48

src/libnptm/Configuration.cpp

+7 −17
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ GeometryConfiguration* GeometryConfiguration::from_legacy(const std::string& fil 
      }

    }

    if (str_target.size() > 14) {

      if (str_target.substr(0, 14).compare("USE_DYN_ORDER=") == 0) {

      if (str_target.substr(0, 14).compare("USE_DYN_ORDERS=") == 0) {

	regex_search(str_target, m, re);

	short dyn_order_flag = (short)stoi(m.str());

	conf->_dyn_order_flag = dyn_order_flag;
@@ -362,21 +362,11 @@ GeometryConfiguration* GeometryConfiguration::from_legacy(const std::string& fil 
}



ScattererConfiguration::ScattererConfiguration(

					       int nsph,

					       int configs, 

					       double *scale_vector,

					       int nxi,

					       const std::string& variable_name,

					       int *iog_vector,

					       double *ros_vector,

					       int *nshl_vector,

					       double **rcf_vector,

					       int dielectric_func_type,

					       dcomplex ***dc_matrix,

					       bool is_external,

					       double ex,

					       double w,

					       double x

  int nsph, int configs, double *scale_vector, int nxi,

  const std::string& variable_name, int *iog_vector,

  double *ros_vector, int *nshl_vector, double **rcf_vector,

  int dielectric_func_type, dcomplex ***dc_matrix, bool is_external,

  double ex, double w, double x

) {

  _number_of_spheres = nsph;

  _configurations = configs;