Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 110 additions & 27 deletions src/input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -492,31 +492,6 @@ pub fn process_input_file<T: Geometry>(input: <T as Geometry>::InputFileFormat)
}
}

//Check that particle arrays are equal length
assert_eq!(particle_parameters.Z.len(), particle_parameters.m.len(),
"Input error: particle input arrays of unequal length.");
assert_eq!(particle_parameters.Z.len(), particle_parameters.E.len(),
"Input error: particle input arrays of unequal length.");
assert_eq!(particle_parameters.Z.len(), particle_parameters.pos.len(),
"Input error: particle input arrays of unequal length.");
assert_eq!(particle_parameters.Z.len(), particle_parameters.dir.len(),
"Input error: particle input arrays of unequal length.");

if particle_parameters.interaction_index.len() <= 1 {
particle_parameters.interaction_index = vec![0; particle_parameters.Z.len()];
}

//Check that interaction indices are all within interaction matrices
assert!(material.interaction_index.iter().max().unwrap() < &options.interaction_potential.len(),
"Input error: interaction matrix too small for material interaction indices. If interaction
matrix is not specified, interaction_indices should be a vector of as many zeroes as there
are material species.");
assert!(particle_parameters.interaction_index.iter().max().unwrap() < &options.interaction_potential.len(),
"Input error: interaction matrix too small for particle interaction indices.");

//N is the number of distinct particles.
let N = particle_parameters.Z.len();

//Determine the length, energy, and mass units for particle input
let length_unit: f64 = match particle_parameters.length_unit.as_str() {
"MICRON" => MICRON,
Expand Down Expand Up @@ -546,9 +521,116 @@ pub fn process_input_file<T: Geometry>(input: <T as Geometry>::InputFileFormat)
.unwrap_or_else(|_| panic!("Input errror: could nor parse mass unit {}. Use a valid float or one of AMU, KG", &particle_parameters.mass_unit.as_str())),
};

let particle_input_array: Vec<particle::ParticleInput> = {
let particle_input_array: Vec<particle::ParticleInput> = if particle_parameters.particle_input_filename != "".to_string() {

let mut particle_input_string = String::new();
let mut particle_input_file = OpenOptions::new()
.read(true)
.write(false)
.create(false)
.open(&particle_parameters.particle_input_filename)
.unwrap_or_else(|_| panic!("Input error: cannot open particle input file {}", particle_parameters.particle_input_filename));
particle_input_file.read_to_string(&mut particle_input_string).expect("Input error: failed to read particle input file to string.");

let mut particle_input: Vec<particle::ParticleInput> = Vec::new();

let particle_input_lines: Vec<&str> = particle_input_string.lines().collect();
assert!(particle_input_lines.len() > 0, "Input error: particle input file cannot have 0 lines.");

for (line_index, line) in particle_input_lines.iter().enumerate() {

let [ m,
Z,
energy,
Ec,
Es,
x,
y,
z,
ux,
uy,
uz,
i,
w,
t,
] = line.split(',')
.map(|s| s.trim())
.collect::<Vec<&str>>()
.as_slice()
.try_into()
.unwrap_or_else(|_| panic!(
"Input error: failed to read line {} of particle input file {}; ensure row has 14 values.",
line_index + 1,
particle_parameters.particle_input_filename
));

let interaction_index = i.parse::<usize>()
.unwrap_or_else(|_| panic!("Input error: failed to parse interaction index on line {} of particle input file {}", line_index + 1, particle_parameters.particle_input_filename));

assert!(interaction_index < options.interaction_potential.len(),
"Input error: interaction matrix too small for particle interaction indices.");

particle_input.push(
particle::ParticleInput {
m: m.parse::<f64>()
.unwrap_or_else(|_| panic!("Input error: failed to parse mass on line {} of particle input file {}", line_index + 1, particle_parameters.particle_input_filename))*mass_unit,
Z: Z.parse()
.unwrap_or_else(|_| panic!("Input error: failed to parse atomic number on line {} of particle input file {}", line_index + 1, particle_parameters.particle_input_filename)),
E: energy.parse::<f64>()
.unwrap_or_else(|_| panic!("Input error: failed to parse energy on line {} of particle input file {}", line_index + 1, particle_parameters.particle_input_filename))*energy_unit,
Ec: Ec.parse::<f64>()
.unwrap_or_else(|_| panic!("Input error: failed to parse cutoff energy on line {} of particle input file {}", line_index + 1, particle_parameters.particle_input_filename))*energy_unit,
Es: Es.parse::<f64>()
.unwrap_or_else(|_| panic!("Input error: failed to parse SBE on line {} of particle input file {}", line_index + 1, particle_parameters.particle_input_filename))*energy_unit,
x: x.parse::<f64>()
.unwrap_or_else(|_| panic!("Input error: failed to parse x on line {} of particle input file {}", line_index + 1, particle_parameters.particle_input_filename))*length_unit,
y: y.parse::<f64>()
.unwrap_or_else(|_| panic!("Input error: failed to parse y on line {} of particle input file {}", line_index + 1, particle_parameters.particle_input_filename))*length_unit,
z: z.parse::<f64>()
.unwrap_or_else(|_| panic!("Input error: failed to parse z on line {} of particle input file {}", line_index + 1, particle_parameters.particle_input_filename))*length_unit,
ux: ux.parse()
.unwrap_or_else(|_| panic!("Input error: failed to parse ux on line {} of particle input file {}", line_index + 1, particle_parameters.particle_input_filename)),
uy: uy.parse()
.unwrap_or_else(|_| panic!("Input error: failed to parse uy on line {} of particle input file {}", line_index + 1, particle_parameters.particle_input_filename)),
uz: uz.parse()
.unwrap_or_else(|_| panic!("Input error: failed to parse uz on line {} of particle input file {}", line_index + 1, particle_parameters.particle_input_filename)),
interaction_index: interaction_index,
weight: w.parse()
.unwrap_or_else(|_| panic!("Input error: failed to parse weight on line {} of particle input file {}", line_index + 1, particle_parameters.particle_input_filename)),
tag: t.parse()
.unwrap_or_else(|_| panic!("Input error: failed to parse tag on line {} of particle input file {}", line_index + 1, particle_parameters.particle_input_filename)),
}
)
}

particle_input
} else {

//Check that particle arrays are equal length
assert_eq!(particle_parameters.Z.len(), particle_parameters.m.len(),
"Input error: particle input arrays of unequal length.");
assert_eq!(particle_parameters.Z.len(), particle_parameters.E.len(),
"Input error: particle input arrays of unequal length.");
assert_eq!(particle_parameters.Z.len(), particle_parameters.pos.len(),
"Input error: particle input arrays of unequal length.");
assert_eq!(particle_parameters.Z.len(), particle_parameters.dir.len(),
"Input error: particle input arrays of unequal length.");

if particle_parameters.interaction_index.len() <= 1 {
particle_parameters.interaction_index = vec![0; particle_parameters.Z.len()];
}

//Check that interaction indices are all within interaction matrices
assert!(material.interaction_index.iter().max().unwrap() < &options.interaction_potential.len(),
"Input error: interaction matrix too small for material interaction indices. If interaction
matrix is not specified, interaction_indices should be a vector of as many zeroes as there
are material species.");
assert!(particle_parameters.interaction_index.iter().max().unwrap() < &options.interaction_potential.len(),
"Input error: interaction matrix too small for particle interaction indices.");

let N = particle_parameters.Z.len();

let mut particle_input: Vec<particle::ParticleInput> = Vec::new();
let mut particle_input: Vec<particle::ParticleInput> = Vec::new();

for particle_index in 0..N {
let N_ = particle_parameters.N[particle_index];
Expand Down Expand Up @@ -614,5 +696,6 @@ pub fn process_input_file<T: Geometry>(input: <T as Geometry>::InputFileFormat)
}
particle_input
};

(particle_input_array, material, options, OutputUnits {length_unit, energy_unit, mass_unit})
}
48 changes: 46 additions & 2 deletions src/particle.rs
Original file line number Diff line number Diff line change
@@ -1,24 +1,68 @@
use super::*;

// These default_* functions are a workaround to
// this issue: https://github.com/serde-rs/serde/issues/368
// in serde. Unimplemented since 2016!
fn default_vec_zero() -> Vec<usize> {
vec![0]
}

fn default_vec_empty_f64() -> Vec<f64> {
vec![]
}

fn default_vec_empty_distributions() -> Vec<Distributions> {
vec![]
}

fn default_vec_empty_distributions_triple() -> Vec<(Distributions, Distributions, Distributions)> {
vec![]
}

fn default_empty_string() -> String {
"".to_string()
}

fn default_length_unit() -> String {
"ANGSTROM".to_string()
}

fn default_energy_unit() -> String {
"EV".to_string()
}

fn default_mass_unit() -> String {
"AMU".to_string()
}

#[derive(Deserialize, Clone)]
pub struct ParticleParameters {
#[serde(default = "default_length_unit")]
pub length_unit: String,
#[serde(default = "default_energy_unit")]
pub energy_unit: String,
#[serde(default = "default_mass_unit")]
pub mass_unit: String,
#[serde(default = "default_vec_zero")]
pub N: Vec<usize>,
#[serde(default = "default_vec_empty_f64")]
pub m: Vec<f64>,
#[serde(default = "default_vec_empty_f64")]
pub Z: Vec<f64>,
#[serde(default = "default_vec_empty_distributions")]
pub E: Vec<Distributions>,
#[serde(default = "default_vec_empty_f64")]
pub Ec: Vec<f64>,
#[serde(default = "default_vec_empty_f64")]
pub Es: Vec<f64>,
#[serde(default = "default_vec_empty_distributions_triple")]
pub pos: Vec<(Distributions, Distributions, Distributions)>,
#[serde(default = "default_vec_empty_distributions_triple")]
pub dir: Vec<(Distributions, Distributions, Distributions)>,
#[serde(default = "default_vec_zero")]
pub interaction_index: Vec<usize>,
#[serde(default = "default_empty_string")]
pub particle_input_filename: String
}

#[derive(Clone, PartialEq, Debug, Copy)]
Expand Down Expand Up @@ -104,8 +148,8 @@ impl Particle {
number_collision_events: 0,
backreflected: false,
interaction_index: input.interaction_index,
weight: 1.0,
tag: 0,
weight: input.weight,
tag: input.tag,
tracked_vector: Vector::new(0.0, 0.0, 0.0),
}
}
Expand Down
Loading