Skip to content

Commit 034bbd0

Browse files
authored
Merge pull request #716 from maxiludwig/valid-input-specs-callbacks-for-global-module
Valid input specs callbacks for global module
2 parents 5ed03bf + dfc4b37 commit 034bbd0

File tree

54 files changed

+49
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+49
-79
lines changed

apps/create_rtdfiles/4C_create_rtdfiles_utils.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include "4C_config.hpp"
1111

1212
#include "4C_fem_condition_definition.hpp"
13-
#include "4C_inpar_validparameters.hpp"
1413
#include "4C_legacy_enum_definitions_materials.hpp"
1514

1615
#include <map>

apps/create_rtdfiles/4C_create_rtdfiles_wrapper.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#include "4C_fem_general_element_definition.hpp"
1616
#include "4C_fem_general_utils_createdis.hpp"
1717
#include "4C_global_data.hpp"
18+
#include "4C_global_legacy_module_validconditions.hpp"
1819
#include "4C_global_legacy_module_validmaterials.hpp"
19-
#include "4C_inpar_validconditions.hpp"
20-
#include "4C_inpar_validparameters.hpp"
20+
#include "4C_global_legacy_module_validparameters.hpp"
2121
#include "4C_utils_exceptions.hpp"
2222
#include "4C_utils_function.hpp"
2323
#include "4C_utils_string.hpp"
@@ -58,7 +58,7 @@ namespace RTD
5858
headerdocumentationfile << ".. _headerparameters:\n\n";
5959
headerdocumentationfile << "Header parameters\n";
6060
headerdocumentationfile << "=================\n\n";
61-
auto parameters = Input::valid_parameters();
61+
auto parameters = Global::valid_parameters();
6262

6363
for (const auto& [section_name, spec] : parameters)
6464
{
@@ -120,7 +120,7 @@ namespace RTD
120120
FOUR_C_THROW("failed to open file: {}", conditiondocumentationfilename);
121121
conditiondocumentationfile << "..\n Created using 4C version (git SHA1):\n";
122122
conditiondocumentationfile << " " << VersionControl::git_hash << "\n\n";
123-
write_conditions_reference(conditiondocumentationfile, Input::valid_conditions());
123+
write_conditions_reference(conditiondocumentationfile, Global::valid_conditions());
124124

125125
write_contact_law_reference(
126126
conditiondocumentationfile, CONTACT::CONSTITUTIVELAW::valid_contact_constitutive_laws());

apps/global_full/4C_global_full_main.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
#include "4C_global_data.hpp"
1616
#include "4C_global_data_read.hpp"
1717
#include "4C_global_legacy_module.hpp"
18-
#include "4C_inpar_validconditions.hpp"
19-
#include "4C_inpar_validparameters.hpp"
2018
#include "4C_io_input_file_utils.hpp"
2119
#include "4C_io_input_spec_builders.hpp"
2220
#include "4C_utils_exceptions.hpp"

apps/pre_exodus/4C_pre_exodus.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "4C_fem_general_utils_createdis.hpp"
1414
#include "4C_global_data.hpp"
1515
#include "4C_global_legacy_module.hpp"
16-
#include "4C_inpar_validconditions.hpp"
16+
#include "4C_global_legacy_module_validconditions.hpp"
1717
#include "4C_io_input_file_utils.hpp"
1818
#include "4C_io_input_spec_builders.hpp"
1919
#include "4C_pre_exodus_readbc.hpp"
@@ -124,8 +124,8 @@ namespace
124124

125125
// print validconditions as proposal
126126
defaultbc << "-----------------------------------------VALIDCONDITIONS" << std::endl;
127-
std::vector<Core::Conditions::ConditionDefinition> condlist = Input::valid_conditions();
128-
Input::print_empty_condition_definitions(defaultbc, condlist);
127+
std::vector<Core::Conditions::ConditionDefinition> condlist = Global::valid_conditions();
128+
Global::print_empty_condition_definitions(defaultbc, condlist);
129129

130130
// print valid element lines as proposal (parobjects have to be registered for doing this!)
131131
defaultbc << std::endl << std::endl;

apps/pre_exodus/4C_pre_exodus_writedat.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "4C_fem_condition_definition.hpp"
1111
#include "4C_fem_general_cell_type_traits.hpp"
1212
#include "4C_global_data_read.hpp"
13-
#include "4C_inpar_validconditions.hpp"
13+
#include "4C_global_legacy_module_validconditions.hpp"
1414
#include "4C_io_exodus.hpp"
1515
#include "4C_io_input_file_utils.hpp"
1616
#include "4C_io_yaml.hpp"
@@ -101,7 +101,7 @@ void EXODUS::write_dat_conditions(const std::vector<EXODUS::CondDef>& condefs,
101101
{
102102
using namespace FourC;
103103

104-
std::vector<Core::Conditions::ConditionDefinition> condlist = Input::valid_conditions();
104+
std::vector<Core::Conditions::ConditionDefinition> condlist = Global::valid_conditions();
105105

106106
// count how often we have one specific condition
107107
std::map<std::string, std::vector<int>> count_cond;

src/adapter/4C_adapter_algorithmbase.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#include "4C_comm_mpi_utils.hpp"
1111
#include "4C_global_data.hpp"
12-
#include "4C_inpar_validparameters.hpp"
1312
#include "4C_io_pstream.hpp"
1413
#include "4C_utils_exceptions.hpp"
1514

src/adapter/4C_adapter_fld_base_algorithm.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#include "4C_inpar_fluid.hpp"
3838
#include "4C_inpar_fsi.hpp"
3939
#include "4C_inpar_poroelast.hpp"
40-
#include "4C_inpar_validparameters.hpp"
4140
#include "4C_io.hpp"
4241
#include "4C_io_control.hpp"
4342
#include "4C_io_pstream.hpp"

src/adapter/4C_adapter_fld_fbi_movingboundary.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include "4C_adapter_fld_base_algorithm.hpp"
1111
#include "4C_adapter_fld_fbi_wrapper.hpp"
1212
#include "4C_global_data.hpp"
13-
#include "4C_inpar_validparameters.hpp"
1413
#include "4C_linalg_sparseoperator.hpp"
1514

1615
#include <Teuchos_StandardParameterEntryValidators.hpp>

src/adapter/4C_adapter_fld_fluid_ale.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "4C_fsi_dirichletneumann_volcoupl.hpp"
1717
#include "4C_global_data.hpp"
1818
#include "4C_inpar_fsi.hpp"
19-
#include "4C_inpar_validparameters.hpp"
2019
#include "4C_io.hpp"
2120

2221
#include <Teuchos_StandardParameterEntryValidators.hpp>

src/adapter/4C_adapter_fld_fluid_ale_xfem.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "4C_fluid_utils_mapextractor.hpp"
1414
#include "4C_global_data.hpp"
1515
#include "4C_inpar_fsi.hpp"
16-
#include "4C_inpar_validparameters.hpp"
1716

1817
#include <Teuchos_StandardParameterEntryValidators.hpp>
1918

0 commit comments

Comments
 (0)