Put valid conditions in global legacy module

Author: maxiludwig

apps/create_rtdfiles/4C_create_rtdfiles_wrapper.cpp

@@ -15,8 +15,8 @@
 #include "4C_fem_general_element_definition.hpp"
 #include "4C_fem_general_utils_createdis.hpp"
 #include "4C_global_data.hpp"
+#include "4C_global_legacy_module_validconditions.hpp"
 #include "4C_global_legacy_module_validmaterials.hpp"
-#include "4C_inpar_validconditions.hpp"
 #include "4C_inpar_validparameters.hpp"
 #include "4C_utils_exceptions.hpp"
 #include "4C_utils_function.hpp"
@@ -120,7 +120,7 @@ namespace RTD
       FOUR_C_THROW("failed to open file: {}", conditiondocumentationfilename);
     conditiondocumentationfile << "..\n   Created using 4C version (git SHA1):\n";
     conditiondocumentationfile << "   " << VersionControl::git_hash << "\n\n";
-    write_conditions_reference(conditiondocumentationfile, Input::valid_conditions());
+    write_conditions_reference(conditiondocumentationfile, Global::valid_conditions());
 
     write_contact_law_reference(
         conditiondocumentationfile, CONTACT::CONSTITUTIVELAW::valid_contact_constitutive_laws());

apps/global_full/4C_global_full_main.cpp

@@ -15,7 +15,6 @@
 #include "4C_global_data.hpp"
 #include "4C_global_data_read.hpp"
 #include "4C_global_legacy_module.hpp"
-#include "4C_inpar_validconditions.hpp"
 #include "4C_inpar_validparameters.hpp"
 #include "4C_io_input_file_utils.hpp"
 #include "4C_io_input_spec_builders.hpp"

apps/pre_exodus/4C_pre_exodus.cpp

@@ -13,7 +13,7 @@
 #include "4C_fem_general_utils_createdis.hpp"
 #include "4C_global_data.hpp"
 #include "4C_global_legacy_module.hpp"
-#include "4C_inpar_validconditions.hpp"
+#include "4C_global_legacy_module_validconditions.hpp"
 #include "4C_io_input_file_utils.hpp"
 #include "4C_io_input_spec_builders.hpp"
 #include "4C_pre_exodus_readbc.hpp"
@@ -124,8 +124,8 @@ namespace
 
     // print validconditions as proposal
     defaultbc << "-----------------------------------------VALIDCONDITIONS" << std::endl;
-    std::vector<Core::Conditions::ConditionDefinition> condlist = Input::valid_conditions();
-    Input::print_empty_condition_definitions(defaultbc, condlist);
+    std::vector<Core::Conditions::ConditionDefinition> condlist = Global::valid_conditions();
+    Global::print_empty_condition_definitions(defaultbc, condlist);
 
     // print valid element lines as proposal (parobjects have to be registered for doing this!)
     defaultbc << std::endl << std::endl;

apps/pre_exodus/4C_pre_exodus_writedat.cpp

@@ -10,7 +10,7 @@
 #include "4C_fem_condition_definition.hpp"
 #include "4C_fem_general_cell_type_traits.hpp"
 #include "4C_global_data_read.hpp"
-#include "4C_inpar_validconditions.hpp"
+#include "4C_global_legacy_module_validconditions.hpp"
 #include "4C_io_exodus.hpp"
 #include "4C_io_input_file_utils.hpp"
 #include "4C_io_yaml.hpp"
@@ -101,7 +101,7 @@ void EXODUS::write_dat_conditions(const std::vector<EXODUS::CondDef>& condefs,
 {
   using namespace FourC;
 
-  std::vector<Core::Conditions::ConditionDefinition> condlist = Input::valid_conditions();
+  std::vector<Core::Conditions::ConditionDefinition> condlist = Global::valid_conditions();
 
   // count how often we have one specific condition
   std::map<std::string, std::vector<int>> count_cond;

src/global_data/4C_global_data_read.cpp

@@ -17,8 +17,8 @@
 #include "4C_fem_general_utils_createdis.hpp"
 #include "4C_fem_nurbs_discretization.hpp"
 #include "4C_global_legacy_module.hpp"
+#include "4C_global_legacy_module_validconditions.hpp"
 #include "4C_global_legacy_module_validmaterials.hpp"
-#include "4C_inpar_validconditions.hpp"
 #include "4C_inpar_validparameters.hpp"
 #include "4C_io.hpp"
 #include "4C_io_exodus.hpp"
@@ -93,7 +93,7 @@ namespace
     }
 
     {
-      auto valid_conditions = Input::valid_conditions();
+      auto valid_conditions = global_legacy_module_callbacks().conditions();
       for (const auto& cond : valid_conditions)
       {
         auto condition_spec = all_of({
@@ -1558,7 +1558,7 @@ void Global::read_conditions(
   nodeset[3] = &dvol_fenode;
 
   // create list of known conditions
-  std::vector<Core::Conditions::ConditionDefinition> valid_conditions = Input::valid_conditions();
+  std::vector<Core::Conditions::ConditionDefinition> valid_conditions = Global::valid_conditions();
 
   // test for each condition definition (input file condition section)
   // - read all conditions that match the definition

src/global_legacy_module/4C_global_legacy_module.cpp

@@ -38,6 +38,7 @@
 #include "4C_fluid_functions.hpp"
 #include "4C_fluid_xfluid_functions.hpp"
 #include "4C_fluid_xfluid_functions_combust.hpp"
+#include "4C_global_legacy_module_validconditions.hpp"
 #include "4C_global_legacy_module_validmaterials.hpp"
 #include "4C_inpar_validparameters.hpp"
 #include "4C_io_input_file_utils.hpp"
@@ -505,6 +506,7 @@ ModuleCallbacks global_legacy_module_callbacks()
   callbacks.AttachFunctionDefinitions = attach_function_definitions;
   callbacks.valid_result_description_lines = valid_result_lines;
   callbacks.materials = Global::valid_materials;
+  callbacks.conditions = Global::valid_conditions;
 
   return callbacks;
 }

src/inpar/4C_inpar_validconditions.cpp …global_legacy_module_validconditions.cppsrc/inpar/4C_inpar_validconditions.cpp renamed to src/global_legacy_module/4C_global_legacy_module_validconditions.cpp src/inpar/4C_inpar_validconditions.cpp renamed to src/global_legacy_module/4C_global_legacy_module_validconditions.cpp

@@ -5,7 +5,7 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#include "4C_inpar_validconditions.hpp"
+#include "4C_global_legacy_module_validconditions.hpp"
 
 #include "4C_ale_input.hpp"
 #include "4C_beaminteraction_potential_input.hpp"
@@ -38,7 +38,7 @@
 FOUR_C_NAMESPACE_OPEN
 
 
-void Input::print_empty_condition_definitions(
+void Global::print_empty_condition_definitions(
     std::ostream& stream, std::vector<Core::Conditions::ConditionDefinition>& condlist)
 {
   for (auto& i : condlist)
@@ -47,8 +47,7 @@ void Input::print_empty_condition_definitions(
   }
 }
 
-
-namespace Input
+namespace
 {
   // collect some problem-specific conditions that do not fit in the generic sections
   void set_miscellaneous_conditions(std::vector<Core::Conditions::ConditionDefinition>& condlist)
@@ -74,12 +73,12 @@ namespace Input
 
     condlist.push_back(stclayer);
   }
-}  // namespace Input
+}  // namespace
 
 
 /*----------------------------------------------------------------------*/
 /*----------------------------------------------------------------------*/
-std::vector<Core::Conditions::ConditionDefinition> Input::valid_conditions()
+std::vector<Core::Conditions::ConditionDefinition> Global::valid_conditions()
 {
   using namespace Core::IO::InputSpecBuilders;
   std::vector<Core::Conditions::ConditionDefinition> condlist;

src/inpar/4C_inpar_validconditions.hpp …global_legacy_module_validconditions.hppsrc/inpar/4C_inpar_validconditions.hpp renamed to src/global_legacy_module/4C_global_legacy_module_validconditions.hpp src/inpar/4C_inpar_validconditions.hpp renamed to src/global_legacy_module/4C_global_legacy_module_validconditions.hpp

@@ -5,8 +5,8 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#ifndef FOUR_C_INPAR_VALIDCONDITIONS_HPP
-#define FOUR_C_INPAR_VALIDCONDITIONS_HPP
+#ifndef FOUR_C_GLOBAL_LEGACY_MODULE_VALIDCONDITIONS_HPP
+#define FOUR_C_GLOBAL_LEGACY_MODULE_VALIDCONDITIONS_HPP
 
 #include "4C_config.hpp"
 
@@ -25,16 +25,14 @@ namespace Core::Conditions
 }
 
 
-namespace Input
+namespace Global
 {
   /// construct list with all conditions and documentation
   std::vector<Core::Conditions::ConditionDefinition> valid_conditions();
-
   /// print all known condition sections without contents
   void print_empty_condition_definitions(
       std::ostream& stream, std::vector<Core::Conditions::ConditionDefinition>& condlist);
-
-}  // namespace Input
+}  // namespace Global
 
 FOUR_C_NAMESPACE_CLOSE
 

src/module_registry/4C_module_registry_callbacks.hpp

@@ -10,6 +10,7 @@
 
 #include "4C_config.hpp"
 
+#include "4C_fem_condition_definition.hpp"
 #include "4C_io_input_spec.hpp"
 #include "4C_legacy_enum_definitions_materials.hpp"
 #include "4C_utils_function_manager.hpp"
@@ -61,6 +62,14 @@ struct ModuleCallbacks
    * materials.
    */
   std::function<std::unordered_map<Core::Materials::MaterialType, Core::IO::InputSpec>()> materials;
+
+
+  /**
+   * A callback to return conditions known by the module.
+   *
+   * @return A vector of all valid condition definitions known by the module.
+   */
+  std::function<std::vector<Core::Conditions::ConditionDefinition>()> conditions;
 };
 
 FOUR_C_NAMESPACE_CLOSE