fixed some postprocess issues

prisms-center · Nov 14, 2024 · ca4b4b1 · ca4b4b1
1 parent 9fcb873
commit ca4b4b1
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 29 deletions.
diff --git a/include/userInputParameters.h b/include/userInputParameters.h
@@ -275,12 +275,8 @@ class userInputParameters
   unsigned int              pp_number_of_variables;
   unsigned int              num_integrated_fields;
   bool                      postProcessingRequired;
-  std::vector<bool>         pp_calc_integral;
   std::vector<unsigned int> integrated_field_indices;
 
-  std::vector<std::string> pp_var_name;
-  std::vector<fieldType>   pp_var_type;
-
   // Variable and residual info
   std::vector<variable_info> pp_varInfoList;
   std::vector<variable_info> pp_baseVarInfoList;

diff --git a/include/variableAttributeLoader.h b/include/variableAttributeLoader.h
@@ -36,7 +36,6 @@ struct variableAttributes
   bool        need_hessian_PP            = false;
   bool        need_value_nucleation      = false;
   bool        nucleating_variable        = false;
-  std::string name_pp                    = "";
   fieldType   var_type_PP                = UNDEFINED_FIELD;
   bool        output_integral            = false;
   bool        need_value_residual_PP     = false;

diff --git a/src/matrixfree/outputResults.cc b/src/matrixfree/outputResults.cc
@@ -84,24 +84,20 @@ MatrixFreePDE<dim, degree>::outputResults()
               output_file << currentTime;
             }
 
-          for (unsigned int i = 0; i < userInputs.pp_number_of_variables; i++)
+          for (const auto &[pp_index, pp_variable] : var_attributes.pp_attributes)
             {
-              if (userInputs.pp_calc_integral[i])
+              if (pp_variable.calc_integral)
                 {
                   double integrated_field;
-                  computeIntegral(integrated_field, i, postProcessedSet);
-                  pcout << "Integrated value of "
-                        << userInputs.pp_var_name[userInputs.integrated_field_indices[i]]
-                        << ": " << integrated_field << std::endl;
+                  computeIntegral(integrated_field, pp_index, postProcessedSet);
+                  pcout << "Integrated value of " << pp_variable.name << ": "
+                        << integrated_field << std::endl;
                   if (Utilities::MPI::this_mpi_process(MPI_COMM_WORLD) == 0)
                     {
-                      output_file
-                        << "\t"
-                        << userInputs.pp_var_name[userInputs.integrated_field_indices[i]]
-                        << "\t" << integrated_field;
+                      output_file << "\t" << pp_variable.name << "\t" << integrated_field;
                     }
                   integrated_postprocessed_fields.at(
-                    userInputs.integrated_field_indices[i]) = integrated_field;
+                    userInputs.integrated_field_indices[pp_index]) = integrated_field;
                 }
             }
           if (Utilities::MPI::this_mpi_process(MPI_COMM_WORLD) == 0)
@@ -113,8 +109,7 @@ MatrixFreePDE<dim, degree>::outputResults()
         }
 
       // Add the postprocessed fields to data_out
-      for (unsigned int fieldIndex = 0; fieldIndex < userInputs.pp_number_of_variables;
-           fieldIndex++)
+      for (const auto &[fieldIndex, pp_variable] : var_attributes.pp_attributes)
         {
           // mark field as scalar/vector
           unsigned int components;
@@ -123,9 +118,8 @@ MatrixFreePDE<dim, degree>::outputResults()
               components = 1;
               std::vector<DataComponentInterpretation::DataComponentInterpretation>
                 dataType(components, DataComponentInterpretation::component_is_scalar);
-              std::vector<std::string> solutionNames(
-                components,
-                userInputs.pp_var_name[fieldIndex].c_str());
+              std::vector<std::string> solutionNames(components,
+                                                     pp_variable.name.c_str());
               // add field to data_out
               data_out.add_data_vector(*dofHandlersSet[0],
                                        *postProcessedSet[fieldIndex],
@@ -138,9 +132,8 @@ MatrixFreePDE<dim, degree>::outputResults()
               std::vector<DataComponentInterpretation::DataComponentInterpretation>
                                        dataType(components,
                          DataComponentInterpretation::component_is_part_of_vector);
-              std::vector<std::string> solutionNames(
-                components,
-                userInputs.pp_var_name[fieldIndex].c_str());
+              std::vector<std::string> solutionNames(components,
+                                                     pp_variable.name.c_str());
               // add field to data_out
               data_out.add_data_vector(*dofHandlersSet[0],
                                        *postProcessedSet[fieldIndex],

diff --git a/src/userInputParameters/loadVariableAttributes.cc b/src/userInputParameters/loadVariableAttributes.cc
@@ -149,7 +149,7 @@ userInputParameters<dim>::loadVariableAttributes(
   num_integrated_fields = 0;
   for (const auto &[pp_index, pp_variable] : variable_attributes.pp_attributes)
     {
-      if (pp_calc_integral[pp_index])
+      if (pp_variable.calc_integral)
         {
           num_integrated_fields++;
           integrated_field_indices.push_back(pp_index);

diff --git a/src/variableAttributeLoader/variableAttributeLoader.cc b/src/variableAttributeLoader/variableAttributeLoader.cc
@@ -165,7 +165,7 @@ variableAttributeLoader::set_variable_name(const unsigned int &index,
     }
   else
     {
-      attributes[index].name_pp = name;
+      pp_attributes[index].name = name;
     }
 }
 
@@ -179,7 +179,7 @@ variableAttributeLoader::set_variable_type(const unsigned int &index,
     }
   else
     {
-      attributes[index].var_type_PP = var_type;
+      pp_attributes[index].var_type_PP = var_type;
     }
 }
 
@@ -223,7 +223,7 @@ variableAttributeLoader::set_dependencies_value_term_RHS(const unsigned int &ind
     }
   else
     {
-      attributes[index].dependencies_value_PP =
+      pp_attributes[index].dependencies_value_PP =
         std::set<std::string>(dependencies_set.begin(), dependencies_set.end());
     }
 }
@@ -242,7 +242,7 @@ variableAttributeLoader::set_dependencies_gradient_term_RHS(
     }
   else
     {
-      attributes[index].dependencies_gradient_PP =
+      pp_attributes[index].dependencies_gradient_PP =
         std::set<std::string>(dependencies_set.begin(), dependencies_set.end());
     }
 }