From 698a15d7f94b04563f9207e1e3f06957ca19db79 Mon Sep 17 00:00:00 2001 From: shimwell Date: Thu, 10 Mar 2022 21:00:53 +0000 Subject: [PATCH 1/4] writing files to output folder --- src/output.cpp | 5 ++++- src/summary.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/output.cpp b/src/output.cpp index 401ad8338d..132f153bf5 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -576,9 +576,12 @@ void write_tallies() if (model::tallies.empty()) return; + // Set filename for tallies_out + filename = fmt::format("{}tallies.out", settings::path_output, w); + // Open the tallies.out file. std::ofstream tallies_out; - tallies_out.open("tallies.out", std::ios::out | std::ios::trunc); + tallies_out.open(filename, std::ios::out | std::ios::trunc); // Loop over each tally. for (auto i_tally = 0; i_tally < model::tallies.size(); ++i_tally) { diff --git a/src/summary.cpp b/src/summary.cpp index fc81ac7bb8..213ce94372 100644 --- a/src/summary.cpp +++ b/src/summary.cpp @@ -22,8 +22,11 @@ void write_summary() // Display output message write_message("Writing summary.h5 file...", 5); + // Set filename for summary file + filename = fmt::format("{}summary.h5", settings::path_output, w); + // Create a new file using default properties. - hid_t file = file_open("summary.h5", 'w'); + hid_t file = file_open(filename, 'w'); write_header(file); write_nuclides(file); From e14de1600abd4ffb67f0a5390d826f1baefaa930 Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Thu, 10 Mar 2022 21:08:46 +0000 Subject: [PATCH 2/4] removing ,w from filename --- src/output.cpp | 2 +- src/summary.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/output.cpp b/src/output.cpp index 132f153bf5..e277f4f627 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -577,7 +577,7 @@ void write_tallies() return; // Set filename for tallies_out - filename = fmt::format("{}tallies.out", settings::path_output, w); + filename = fmt::format("{}tallies.out", settings::path_output); // Open the tallies.out file. std::ofstream tallies_out; diff --git a/src/summary.cpp b/src/summary.cpp index 213ce94372..3075f621f6 100644 --- a/src/summary.cpp +++ b/src/summary.cpp @@ -23,7 +23,7 @@ void write_summary() write_message("Writing summary.h5 file...", 5); // Set filename for summary file - filename = fmt::format("{}summary.h5", settings::path_output, w); + filename = fmt::format("{}summary.h5", settings::path_output); // Create a new file using default properties. hid_t file = file_open(filename, 'w'); From 1b6a341878f0e46c70ca39f7c7f50a758c301fd8 Mon Sep 17 00:00:00 2001 From: shimwell Date: Thu, 10 Mar 2022 21:30:41 +0000 Subject: [PATCH 3/4] declared filename before use --- src/output.cpp | 1 + src/summary.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/output.cpp b/src/output.cpp index e277f4f627..5c6f2b677e 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -577,6 +577,7 @@ void write_tallies() return; // Set filename for tallies_out + std::string filename; filename = fmt::format("{}tallies.out", settings::path_output); // Open the tallies.out file. diff --git a/src/summary.cpp b/src/summary.cpp index 3075f621f6..1915fde334 100644 --- a/src/summary.cpp +++ b/src/summary.cpp @@ -23,6 +23,7 @@ void write_summary() write_message("Writing summary.h5 file...", 5); // Set filename for summary file + std::string filename; filename = fmt::format("{}summary.h5", settings::path_output); // Create a new file using default properties. From c8de525c001cd9787b9f875442071ab258408b01 Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Fri, 11 Mar 2022 15:36:44 +0000 Subject: [PATCH 4/4] Suggestions from review by @paulromano Co-authored-by: Paul Romano --- src/output.cpp | 3 +-- src/summary.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/output.cpp b/src/output.cpp index 5c6f2b677e..58f081f676 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -577,8 +577,7 @@ void write_tallies() return; // Set filename for tallies_out - std::string filename; - filename = fmt::format("{}tallies.out", settings::path_output); + std::string filename = fmt::format("{}tallies.out", settings::path_output); // Open the tallies.out file. std::ofstream tallies_out; diff --git a/src/summary.cpp b/src/summary.cpp index 1915fde334..b3ea0254e6 100644 --- a/src/summary.cpp +++ b/src/summary.cpp @@ -23,8 +23,7 @@ void write_summary() write_message("Writing summary.h5 file...", 5); // Set filename for summary file - std::string filename; - filename = fmt::format("{}summary.h5", settings::path_output); + std::string filename = fmt::format("{}summary.h5", settings::path_output); // Create a new file using default properties. hid_t file = file_open(filename, 'w');