From 3492d8630447f847ccc04860d491221d05974354 Mon Sep 17 00:00:00 2001 From: MFraters Date: Tue, 18 Oct 2022 10:47:08 -0700 Subject: [PATCH] Change last LPO's to CPO's. --- ...A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png} | Bin ...A-B-C-Axis_Batlow_g1_sp301_t00002.00000.png} | Bin ...tlow_g1_sp301_mcfull_t00002.00000_km100.png} | Bin ...tlow_g1_sp301_mcfull_t00002.00000_km100.png} | Bin examples/example_experiment_1/statistics | 10 +++++----- src/configuration/pole_figure_configuration.rs | 4 ++-- src/lib.rs | 16 ++++++++-------- tests/run_test_example_1.rs | 16 ++++++++-------- 8 files changed, 23 insertions(+), 23 deletions(-) rename examples/example_experiment_1/CPO_figures/{weighted_LPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png => weighted_CPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png} (100%) rename examples/example_experiment_1/CPO_figures/{weighted_LPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00002.00000.png => weighted_CPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00002.00000.png} (100%) rename examples/example_experiment_1/{particle_LPO_figures/weighted_LPO_elastic_oli_ens_A-B-C-Axis_batlow_g1_sp301_mcfull_t00002.00000_km100.png => particle_CPO_figures/weighted_CPO_elastic_oli_ens_A-B-C-Axis_batlow_g1_sp301_mcfull_t00002.00000_km100.png} (100%) rename examples/example_experiment_1/{particle_LPO_figures/weighted_LPO_no-elastic_oli_ens_A-B-C-Axis_batlow_g1_sp301_mcfull_t00002.00000_km100.png => particle_CPO_figures/weighted_CPO_no-elastic_oli_ens_A-B-C-Axis_batlow_g1_sp301_mcfull_t00002.00000_km100.png} (100%) diff --git a/examples/example_experiment_1/CPO_figures/weighted_LPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png b/examples/example_experiment_1/CPO_figures/weighted_CPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png similarity index 100% rename from examples/example_experiment_1/CPO_figures/weighted_LPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png rename to examples/example_experiment_1/CPO_figures/weighted_CPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png diff --git a/examples/example_experiment_1/CPO_figures/weighted_LPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00002.00000.png b/examples/example_experiment_1/CPO_figures/weighted_CPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00002.00000.png similarity index 100% rename from examples/example_experiment_1/CPO_figures/weighted_LPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00002.00000.png rename to examples/example_experiment_1/CPO_figures/weighted_CPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00002.00000.png diff --git a/examples/example_experiment_1/particle_LPO_figures/weighted_LPO_elastic_oli_ens_A-B-C-Axis_batlow_g1_sp301_mcfull_t00002.00000_km100.png b/examples/example_experiment_1/particle_CPO_figures/weighted_CPO_elastic_oli_ens_A-B-C-Axis_batlow_g1_sp301_mcfull_t00002.00000_km100.png similarity index 100% rename from examples/example_experiment_1/particle_LPO_figures/weighted_LPO_elastic_oli_ens_A-B-C-Axis_batlow_g1_sp301_mcfull_t00002.00000_km100.png rename to examples/example_experiment_1/particle_CPO_figures/weighted_CPO_elastic_oli_ens_A-B-C-Axis_batlow_g1_sp301_mcfull_t00002.00000_km100.png diff --git a/examples/example_experiment_1/particle_LPO_figures/weighted_LPO_no-elastic_oli_ens_A-B-C-Axis_batlow_g1_sp301_mcfull_t00002.00000_km100.png b/examples/example_experiment_1/particle_CPO_figures/weighted_CPO_no-elastic_oli_ens_A-B-C-Axis_batlow_g1_sp301_mcfull_t00002.00000_km100.png similarity index 100% rename from examples/example_experiment_1/particle_LPO_figures/weighted_LPO_no-elastic_oli_ens_A-B-C-Axis_batlow_g1_sp301_mcfull_t00002.00000_km100.png rename to examples/example_experiment_1/particle_CPO_figures/weighted_CPO_no-elastic_oli_ens_A-B-C-Axis_batlow_g1_sp301_mcfull_t00002.00000_km100.png diff --git a/examples/example_experiment_1/statistics b/examples/example_experiment_1/statistics index 75c3f1e..f6b4af0 100644 --- a/examples/example_experiment_1/statistics +++ b/examples/example_experiment_1/statistics @@ -1,5 +1,5 @@ -# timestep_size time particle_LPO -0.5 0 particle_LPO -0.5 0.5 particle_LPO -0.5 1.0 particle_LPO -0.5 1.5 particle_LPO +# timestep_size time particle_CPO +0.5 0 particle_CPO +0.5 0.5 particle_CPO +0.5 1.0 particle_CPO +0.5 1.5 particle_CPO diff --git a/src/configuration/pole_figure_configuration.rs b/src/configuration/pole_figure_configuration.rs index 3fa9986..9e6b9c4 100644 --- a/src/configuration/pole_figure_configuration.rs +++ b/src/configuration/pole_figure_configuration.rs @@ -62,7 +62,7 @@ pub struct PoleFiguresConfiguration { /// Optional value of the prefix where to write out the produced pole figures. The program will add a postfix containing /// informatio about individual variables and settings such as the timestep and axes, etc. - /// The default value is `weighted_LPO`. + /// The default value is `weighted_CPO`. #[serde(default = "figure_output_prefix")] pub figure_output_prefix: String, @@ -111,7 +111,7 @@ impl Default for PoleFiguresConfiguration { particle_data_file_prefix: "particle_CPO/particles".to_string(), grain_data_file_prefix: "particle_CPO/weighted_CPO".to_string(), figure_output_dir: "CPO_figures/".to_string(), - figure_output_prefix: "weighted_LPO".to_string(), + figure_output_prefix: "weighted_CPO".to_string(), color_scale: ColorGradient::Batlow, elastisity_header: true, small_figure: false, diff --git a/src/lib.rs b/src/lib.rs index 96394ca..069710b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -20,7 +20,7 @@ //! # CPO analyzer //! -//! This crate contains tools to analyzer Crystal/Lattice Preffered Orientation (CPO/LPO) data. It is currently +//! This crate contains tools to analyzer Crystal/Lattice Preffered Orientation (CPO/CPO) data. It is currently //! only able to crate sets of polefigures from ASPECT CPO data, but other type of inputs and plots of analysis //! are in the scope of this crate. //! @@ -213,11 +213,11 @@ pub fn process_configuration(config: Config) -> Result<(), Box Result<(), Box Result<(), Box Result<(), Box Result<(), Box Result<(), Box Result<(), Box> { let cmd = Command::new("compare") .arg("-metric") .arg("AE") - .arg("examples/example_experiment_1/CPO_figures/weighted_LPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png") - .arg("examples/example_experiment_1/CPO_figures/weighted_LPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png") + .arg("examples/example_experiment_1/CPO_figures/weighted_CPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png") + .arg("examples/example_experiment_1/CPO_figures/weighted_CPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png") .arg("null") .ok(); if cmd.is_ok() { Command::new("compare") .arg("-metric") .arg("AE") - .arg("examples/example_experiment_1/CPO_figures/weighted_LPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png") - .arg("examples/example_experiment_1/test_results_binary/weighted_LPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png") + .arg("examples/example_experiment_1/CPO_figures/weighted_CPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png") + .arg("examples/example_experiment_1/test_results_binary/weighted_CPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png") .arg("null") .assert() .success(); @@ -72,16 +72,16 @@ fn test_binary() -> Result<(), Box> { let cmd = Command::new("compare") .arg("-metric") .arg("AE") - .arg("examples/example_experiment_1/CPO_figures/weighted_LPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png") - .arg("examples/example_experiment_1/CPO_figures/weighted_LPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png") + .arg("examples/example_experiment_1/CPO_figures/weighted_CPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png") + .arg("examples/example_experiment_1/CPO_figures/weighted_CPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png") .arg("null") .ok(); if cmd.is_ok() { Command::new("compare") .arg("-metric") .arg("AE") - .arg("examples/example_experiment_1/CPO_figures/weighted_LPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png") - .arg("examples/example_experiment_1/test_results_binary/weighted_LPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png") + .arg("examples/example_experiment_1/CPO_figures/weighted_CPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png") + .arg("examples/example_experiment_1/test_results_binary/weighted_CPO_elastic_oli_ens_A-B-C-Axis_Batlow_g1_sp301_t00001.00000.png") .arg("null") .assert() .success();