added results_prefix field in input json

DataAnalyticsEngineering · Nov 5, 2024 · fed1280 · fed1280
1 parent e185190
commit fed1280
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/include/reader.h b/include/reader.h
@@ -13,6 +13,7 @@ class Reader {
     // contents of input file:
     char                           ms_filename[4096];    // Name of Micro-structure hdf5 file
     char                           ms_datasetname[4096]; // Absolute path of Micro-structure in hdf5 file
+    char                           results_prefix[4096];
     int                            n_mat;
     json                           materialProperties;
     double                         TOL;

diff --git a/include/solver.h b/include/solver.h
@@ -463,6 +463,10 @@ void Solver<howmany>::postprocess(Reader reader, const char resultsFileName[], i
         printf(") \n\n");
     }
 
+    // Concatenate reader.ms_datasetname and reader.results_prefix into reader.ms_datasetname
+    strcat(reader.ms_datasetname, "/");
+    strcat(reader.ms_datasetname, reader.results_prefix);
+
     // Write results to results h5 file
     auto writeData = [&](const char *resultName, const char *resultPrefix, auto *data, hsize_t *dims, int ndims) {
         if (std::find(reader.resultsToWrite.begin(), reader.resultsToWrite.end(), resultName) != reader.resultsToWrite.end()) {

diff --git a/src/reader.cpp b/src/reader.cpp
@@ -63,6 +63,12 @@ void Reader ::ReadInputFile(char fn[])
         strcpy(ms_filename, j["ms_filename"].get<string>().c_str());
         strcpy(ms_datasetname, j["ms_datasetname"].get<string>().c_str());
 
+        if (j.contains("results_prefix")) {
+            strcpy(results_prefix, j["results_prefix"].get<string>().c_str());
+        } else {
+            strcpy(results_prefix, "");
+        }
+
         L = j["ms_L"].get<vector<double>>();
 
         errorParameters = j["error_parameters"];