Merge pull request #670 from sebproell/remove-geometry-type

sebproell · web-flow · commit 456f5af4dd31 · 2025-04-17T17:25:55.000+02:00
Remove GEOMETRY input parameter
diff --git a/src/core/io/src/4C_io_geometry_type.hpp b/src/core/io/src/4C_io_geometry_type.hpp
diff --git a/src/core/io/src/4C_io_meshreader.hpp b/src/core/io/src/4C_io_meshreader.hpp
@@ -13,7 +13,6 @@
 #include "4C_io_domainreader.hpp"
 #include "4C_io_elementreader.hpp"
 #include "4C_io_exodus.hpp"
-#include "4C_io_geometry_type.hpp"
 #include "4C_linalg_graph.hpp"
 
 #include <Teuchos_ParameterList.hpp>
diff --git a/src/global_data/4C_global_data_read.cpp b/src/global_data/4C_global_data_read.cpp
@@ -23,7 +23,6 @@
 #include "4C_io.hpp"
 #include "4C_io_elementreader.hpp"
 #include "4C_io_exodus.hpp"
-#include "4C_io_geometry_type.hpp"
 #include "4C_io_input_file.hpp"
 #include "4C_io_input_file_utils.hpp"
 #include "4C_io_input_spec_builders.hpp"
diff --git a/src/inpar/4C_inpar_IO_monitor_structure_dbc.cpp b/src/inpar/4C_inpar_IO_monitor_structure_dbc.cpp
@@ -7,7 +7,6 @@
 
 #include "4C_inpar_IO_monitor_structure_dbc.hpp"
 
-#include "4C_io_geometry_type.hpp"
 #include "4C_io_input_spec_builders.hpp"
 
 
diff --git a/src/inpar/4C_inpar_IO_runtime_vtp_output_structure.cpp b/src/inpar/4C_inpar_IO_runtime_vtp_output_structure.cpp
@@ -7,7 +7,6 @@
 
 #include "4C_inpar_IO_runtime_vtp_output_structure.hpp"
 
-#include "4C_io_geometry_type.hpp"
 #include "4C_io_input_spec_builders.hpp"
 
 
diff --git a/src/inpar/4C_inpar_fluid.cpp b/src/inpar/4C_inpar_fluid.cpp
@@ -8,7 +8,6 @@
 #include "4C_inpar_fluid.hpp"
 
 #include "4C_fem_condition_definition.hpp"
-#include "4C_io_geometry_type.hpp"
 #include "4C_io_input_spec_builders.hpp"
 #include "4C_legacy_enum_definitions_conditions.hpp"
 FOUR_C_NAMESPACE_OPEN
@@ -89,15 +88,6 @@ void Inpar::FLUID::set_valid_parameters(std::map<std::string, Core::IO::InputSpe
                                                 "continuity eq. and pressure",
                                     .default_value = Cont_normal_Press_normal}),
 
-          deprecated_selection<Core::IO::GeometryType>("GEOMETRY",
-              {
-                  {"full", Core::IO::geometry_full},
-                  {"box", Core::IO::geometry_box},
-                  {"file", Core::IO::geometry_file},
-              },
-              {.description = "How the geometry is specified",
-                  .default_value = Core::IO::geometry_full}),
-
           parameter<Inpar::FLUID::LinearisationAction>("NONLINITER",
               {.description = "Nonlinear iteration scheme", .default_value = fixed_point_like}),
 
diff --git a/src/inpar/4C_inpar_structure.cpp b/src/inpar/4C_inpar_structure.cpp
@@ -9,7 +9,6 @@
 
 #include "4C_constraint_springdashpot.hpp"
 #include "4C_fem_condition_definition.hpp"
-#include "4C_io_geometry_type.hpp"
 #include "4C_io_input_spec_builders.hpp"
 #include "4C_utils_enum.hpp"
 FOUR_C_NAMESPACE_OPEN
@@ -404,16 +403,6 @@ namespace Inpar
                   {.description = "number of linear solver used for structural problems",
                       .default_value = -1}),
 
-              // where the geometry comes from
-              deprecated_selection<Core::IO::GeometryType>("GEOMETRY",
-                  {
-                      {"full", Core::IO::geometry_full},
-                      {"box", Core::IO::geometry_box},
-                      {"file", Core::IO::geometry_file},
-                  },
-                  {.description = "How the geometry is specified",
-                      .default_value = Core::IO::geometry_full}),
-
               deprecated_selection<Solid::MidAverageEnum>("MIDTIME_ENERGY_TYPE",
                   {
                       {"vague", midavg_vague},
diff --git a/src/thermo/src/utils/4C_thermo_input.cpp b/src/thermo/src/utils/4C_thermo_input.cpp
@@ -8,9 +8,7 @@
 #include "4C_thermo_input.hpp"
 
 #include "4C_fem_condition_definition.hpp"
-#include "4C_io_geometry_type.hpp"
 #include "4C_io_input_spec_builders.hpp"
-#include "4C_utils_parameter_list.hpp"
 
 FOUR_C_NAMESPACE_OPEN
 
@@ -161,16 +159,6 @@ void Thermo::set_valid_parameters(std::map<std::string, Core::IO::InputSpec>& li
               "LINEAR_SOLVER", {.description = "number of linear solver used for thermal problems",
                                    .default_value = -1}),
 
-          // where the geometry comes from
-          deprecated_selection<Core::IO::GeometryType>("GEOMETRY",
-              {
-                  {"full", Core::IO::geometry_full},
-                  {"box", Core::IO::geometry_box},
-                  {"file", Core::IO::geometry_file},
-              },
-              {.description = "How the geometry is specified",
-                  .default_value = Core::IO::geometry_full}),
-
           deprecated_selection<CalcError>("CALCERROR",
               {
                   {"No", no_error_calculation},
diff --git a/tests/input_files/contact3D_exodus_in.4C.yaml b/tests/input_files/contact3D_exodus_in.4C.yaml
@@ -26,8 +26,6 @@ STRUCTURAL DYNAMIC:
   K_DAMP: 1e-05
   TOLDISP: 1e-08
   LINEAR_SOLVER: 1
-  # Important setting: ensure that we use the file input
-  GEOMETRY: file
 CONTACT DYNAMIC:
   LINEAR_SOLVER: 2
 SOLVER 1:
diff --git a/tests/input_files/f3_channel_EOS_hex8_10x10x10_quad_inflow_altgeogeneration.dat b/tests/input_files/f3_channel_EOS_hex8_10x10x10_quad_inflow_altgeogeneration.dat
@@ -46,7 +46,6 @@ LINEAR_SOLVER    1
 GMSH_OUTPUT      no
 NONLINEARBC      no
 INFNORMSCALING   no
-GEOMETRY         box
 -------------------------FLUID DYNAMIC/NONLINEAR SOLVER TOLERANCES
 TOL_VEL_RES	  1.0E-13
 TOL_VEL_INC	  1.0E-13
diff --git a/tests/input_files/f3_channel_EOS_wedge15_10x10x10_quad_inflow_altgeogeneration.dat b/tests/input_files/f3_channel_EOS_wedge15_10x10x10_quad_inflow_altgeogeneration.dat
@@ -46,7 +46,6 @@ LINEAR_SOLVER    1
 GMSH_OUTPUT      no
 NONLINEARBC      no
 INFNORMSCALING   no
-GEOMETRY         box
 -------------------------FLUID DYNAMIC/NONLINEAR SOLVER TOLERANCES
 TOL_VEL_RES	  1.0E-13
 TOL_VEL_INC	  1.0E-13
diff --git a/tests/input_files/f3_forced_hit_geogen_hdg.dat b/tests/input_files/f3_forced_hit_geogen_hdg.dat
@@ -34,7 +34,6 @@ RESULTSEVERY                           1
 //INITIALFIELD                    forced_hit_numeric_spectrum
 INITIALFIELD                    forced_hit_simple_algebraic_spectrum
 LINEAR_SOLVER                   1
-GEOMETRY                        box
 CALCERROR                       beltrami_flow
 -----------------------------------FLUID DYNAMIC/NONLINEAR SOLVER TOLERANCES
 TOL_VEL_RES	  1e-05
diff --git a/tests/input_files/f3_kimmoin_stat_24x24x1_wedge15_pseudo2D.dat b/tests/input_files/f3_kimmoin_stat_24x24x1_wedge15_pseudo2D.dat
@@ -42,7 +42,6 @@ LIFTDRAG         no
 ADAPTCONV        Yes
 ADAPTCONV_BETTER 0.1
 GMSH_OUTPUT      yes
-GEOMETRY                        box
 -------------------------FLUID DYNAMIC/NONLINEAR SOLVER TOLERANCES
 TOL_VEL_RES	  1.0E-10
 TOL_VEL_INC	  1.0E-10
diff --git a/tests/input_files/f3_stokes_residualbased_rotboxgeom.dat b/tests/input_files/f3_stokes_residualbased_rotboxgeom.dat
@@ -27,7 +27,6 @@ ITEMAX                          2
 CONVCHECK                       L_2_norm
 NUMSTASTEPS                     0
 INITIALFIELD                    zero_field
-GEOMETRY                        box
 -----------------------------------FLUID DYNAMIC/NONLINEAR SOLVER TOLERANCES
 TOL_VEL_RES	  1.0E-9
 TOL_VEL_INC	  1.0E-9
diff --git a/tests/input_files/fbi_mortar_solidcoupling.dat b/tests/input_files/fbi_mortar_solidcoupling.dat
@@ -86,7 +86,6 @@ PREDICTOR                             explicit_second_order_midpoint
 THETA                                 0.5
 TIMEINTEGR                            One_Step_Theta
 LINEAR_SOLVER                         1
-GEOMETRY                              box
 ---------------------------------------FLUID DYNAMIC/NONLINEAR SOLVER TOLERANCES
 TOL_VEL_RES       1e-08
 TOL_VEL_INC       1e-15
diff --git a/tests/input_files/fsi_dc3D_part_ait_ga_ost_xwall.dat b/tests/input_files/fsi_dc3D_part_ait_ga_ost_xwall.dat
@@ -36,7 +36,6 @@ XML File                        = fsi_part_struct_solver.xml
 PHYSICAL_TYPE                   Incompressible
 LINEAR_SOLVER                   1
 TIMEINTEGR                      Af_Gen_Alpha
-GEOMETRY                        full
 NONLINITER                      fixed_point_like
 PREDICTOR                       steady_state
 CONVCHECK                       L_2_norm
diff --git a/tests/input_files/homogenized-constrained-mixture-cyl-aniso-impl-nofibdir.dat b/tests/input_files/homogenized-constrained-mixture-cyl-aniso-impl-nofibdir.dat
@@ -74,7 +74,6 @@ UZAWAALGO                       direct
 LUMPMASS                        No
 MODIFIEDEXPLEULER               Yes
 LINEAR_SOLVER                   1
-GEOMETRY                        full
 --------------------------------------------------------------------SOLVER 1
 SOLVER                          UMFPACK
 AZSOLVE                         GMRES
diff --git a/tests/input_files/sohex8_disp_altgeogeneration.dat b/tests/input_files/sohex8_disp_altgeogeneration.dat
@@ -40,7 +40,6 @@ NORM_DISP                       Abs
 NORMCOMBI_RESFDISP              Or
 MAXITER                         1
 DIVERCONT                       continue
-GEOMETRY                        box
 ---------------------------------------------------------------FLUID DYNAMIC
 TIMEINTEGR                      One_Step_Theta
 RESULTSEVERY                           1
diff --git a/tests/input_files/tfsi_plate.dat b/tests/input_files/tfsi_plate.dat
@@ -74,7 +74,6 @@ WSS_TYPE                        Standard
 WSS_ML_AGR_SOLVER               -1
 TIMEINTEGR                      Af_Gen_Alpha
 OST_CONT_PRESS                  Cont_normal_Press_normal
-GEOMETRY                        full
 NONLINITER                      fixed_point_like
 PREDICTOR                       steady_state
 CONVCHECK                       L_2_norm
diff --git a/tests/input_files/xfluid_couette_NavSlip_eps1.6_g-1.0_mu0.16_altgeogeneration_movingls_fully_weakly_verticalcut.dat b/tests/input_files/xfluid_couette_NavSlip_eps1.6_g-1.0_mu0.16_altgeogeneration_movingls_fully_weakly_verticalcut.dat
@@ -84,7 +84,6 @@ TIMESTEP                        0.2
 MAXTIME                         1000
 THETA                           1.0
 START_THETA                     1
-GEOMETRY                        box
 -----------------------------------FLUID DYNAMIC/NONLINEAR SOLVER TOLERANCES
 TOL_VEL_RES	  1e-12
 TOL_VEL_INC	  1e-12
diff --git a/tests/input_files/xfluid_couette_NavSlip_eps1.6_g-1.0_mu0.1_altgeogeneration.dat b/tests/input_files/xfluid_couette_NavSlip_eps1.6_g-1.0_mu0.1_altgeogeneration.dat
@@ -101,7 +101,6 @@ GAMMA                           1
 THETA                           0.66
 START_THETA                     1
 STRONG_REDD_3D_COUPLING_TYPE    no
-GEOMETRY                        box
 -----------------------------------FLUID DYNAMIC/NONLINEAR SOLVER TOLERANCES
 TOL_VEL_RES	  1e-12
 TOL_VEL_INC	  1e-12
diff --git a/tests/input_files/xfluid_couette_NavSlip_eps1.6_g-1.0_mu0.1_altgeogeneration_wedge6.dat b/tests/input_files/xfluid_couette_NavSlip_eps1.6_g-1.0_mu0.1_altgeogeneration_wedge6.dat
@@ -101,7 +101,6 @@ GAMMA                           1
 THETA                           0.66
 START_THETA                     1
 STRONG_REDD_3D_COUPLING_TYPE    no
-GEOMETRY                        box
 -----------------------------------FLUID DYNAMIC/NONLINEAR SOLVER TOLERANCES
 TOL_VEL_RES	  1e-12
 TOL_VEL_INC	  1e-12
diff --git a/tests/input_files/xfluid_forward_facing_step_stationary_NavSlip_eps1.6_16x16_NIT_altgeogeneration.dat b/tests/input_files/xfluid_forward_facing_step_stationary_NavSlip_eps1.6_16x16_NIT_altgeogeneration.dat
@@ -67,7 +67,6 @@ ALPHA_F                         1
 GAMMA                           1
 THETA                           0.66
 STRONG_REDD_3D_COUPLING_TYPE    no
-GEOMETRY                        box
 -----------------------------------FLUID DYNAMIC/NONLINEAR SOLVER TOLERANCES
 TOL_VEL_RES	  1e-15
 TOL_VEL_INC	  1e-15
diff --git a/tests/input_files/xfluid_ls_neumann_inflow_stab.dat b/tests/input_files/xfluid_ls_neumann_inflow_stab.dat
@@ -36,7 +36,6 @@ TIMEINTEGR                      One_Step_Theta
 TIMESTEP                        0.1
 INFNORMSCALING                  no
 PREDICTOR                       steady_state
-GEOMETRY                        box
 -----------------------------------FLUID DYNAMIC/NONLINEAR SOLVER TOLERANCES
 TOL_VEL_RES	  1e-8
 TOL_VEL_INC	  1e-8
diff --git a/tests/input_files/xfluid_mesh_neumann_inflow_stab.dat b/tests/input_files/xfluid_mesh_neumann_inflow_stab.dat
@@ -21,8 +21,6 @@ FLUID_STRESS                    yes
 THERM_TEMPERATURE               No
 THERM_HEATFLUX                  No
 FILESTEPS                       1000
-----------------------------------------------------------STRUCTURAL DYNAMIC
-GEOMETRY                        box
 ---------------------------------------------------------------FLUID DYNAMIC
 PHYSICAL_TYPE                   Incompressible
 LINEAR_SOLVER                   1
@@ -38,7 +36,6 @@ TIMEINTEGR                      One_Step_Theta
 TIMESTEP                        0.1
 INFNORMSCALING                  no
 PREDICTOR                       steady_state
-GEOMETRY                        box
 -----------------------------------FLUID DYNAMIC/NONLINEAR SOLVER TOLERANCES
 TOL_VEL_RES	  1e-8
 TOL_VEL_INC	  1e-8
diff --git a/tests/input_files/xfluid_moving_torus_NavSlip_vareps_levelset_psmoothed_8x8x16.dat b/tests/input_files/xfluid_moving_torus_NavSlip_vareps_levelset_psmoothed_8x8x16.dat
@@ -39,7 +39,6 @@ MAXTIME                         20.0
 NUMSTEP                         4
 TIMESTEP                        0.18
 GMSH_OUTPUT                     No
-GEOMETRY                        box
 -----------------------------------FLUID DYNAMIC/NONLINEAR SOLVER TOLERANCES
 TOL_VEL_RES	  1.0E-10
 TOL_VEL_INC	  1.0E-10
diff --git a/tests/input_files/xfluid_oseen_urquiza_square_NavSlip_eps1.0_40x40_mesh_altgeogeneration.dat b/tests/input_files/xfluid_oseen_urquiza_square_NavSlip_eps1.0_40x40_mesh_altgeogeneration.dat
@@ -44,7 +44,6 @@ TIMESTEP                        1.0
 MAXTIME                         1.0
 THETA                           1.0
 GMSH_OUTPUT                     No
-GEOMETRY                        box
 -----------------------------------FLUID DYNAMIC/NONLINEAR SOLVER TOLERANCES
 TOL_VEL_RES	  1e-12
 TOL_VEL_INC	  1e-12
diff --git a/tests/input_files/xfluid_taylor_couette_NavSlip_eps1.0_25x25_krylov_levelset_altgeogeneration.dat b/tests/input_files/xfluid_taylor_couette_NavSlip_eps1.0_25x25_krylov_levelset_altgeogeneration.dat
@@ -67,7 +67,6 @@ MAXTIME                         1
 NUMSTEP                         1
 TIMESTEP                        0.01
 GMSH_OUTPUT                     No
-GEOMETRY                        box
 CALCERROR                       byfunct
 CALCERRORFUNCNO                 5
 //                                                             // // VELGRAD_PROJ_SOLVER 1
diff --git a/tests/input_files/xfluid_taylor_couette_NavSlip_ri0.19_ro0.49_epsi1.0_epso1e-5_ti-2.5_to0.5_8x8_levelset_hex27.dat b/tests/input_files/xfluid_taylor_couette_NavSlip_ri0.19_ro0.49_epsi1.0_epso1e-5_ti-2.5_to0.5_8x8_levelset_hex27.dat
@@ -26,7 +26,6 @@ PREDICTOR                       steady_state
 MAXTIME                         1
 NUMSTEP                         1
 GMSH_OUTPUT                     No
-GEOMETRY                        box
 CALCERROR                       byfunct
 CALCERRORFUNCNO                 5
 -----------------------------------FLUID DYNAMIC/NONLINEAR SOLVER TOLERANCES
diff --git a/tests/input_files/xfpsci_twoelem_pp.dat b/tests/input_files/xfpsci_twoelem_pp.dat
@@ -74,7 +74,6 @@ RESTARTEVERY                     10
 NUMSTEP                         7
 THETA                           1
 START_THETA                     1
-GEOMETRY                        box
 -----------------------------------------------------------------FSI DYNAMIC
 MAXTIME                         5
 TIMESTEP                        0.5
diff --git a/tests/input_files/xfpsci_twoelem_ps.dat b/tests/input_files/xfpsci_twoelem_ps.dat
@@ -74,7 +74,6 @@ RESTARTEVERY                     10
 NUMSTEP                         7
 THETA                           1
 START_THETA                     1
-GEOMETRY                        box
 -----------------------------------------------------------------FSI DYNAMIC
 MAXTIME                         5
 TIMESTEP                        0.5
diff --git a/tests/input_files/xfsci_twoelem.dat b/tests/input_files/xfsci_twoelem.dat
@@ -60,7 +60,6 @@ RESTARTEVERY                     10
 NUMSTEP                         7
 THETA                           1
 START_THETA                     1
-GEOMETRY                        box
 -----------------------------------------------------------------FSI DYNAMIC
 MAXTIME                         5
 TIMESTEP                        0.5
diff --git a/tests/input_files/xfsi_3D_boxes.dat b/tests/input_files/xfsi_3D_boxes.dat
@@ -20,7 +20,6 @@ OUTPUT_BIN                      Yes
 DYNAMICTYPE                      OneStepTheta
 TIMESTEP                        0.05
 LINEAR_SOLVER                   2
-GEOMETRY                        box
 PREDICT                         ConstDis
 -----------------------------------------------------------------FSI DYNAMIC
 TIMESTEP                        0.05
@@ -51,7 +50,6 @@ NONLINITER                      Newton
 THETA                           1.0
 TIMEINTEGR                      One_Step_Theta
 TIMESTEP                        0.05
-GEOMETRY                        box
 ----------------------------------FLUID DYNAMIC/RESIDUAL-BASED STABILIZATION
 STABTYPE                        edge_based
 --------------------------------------FLUID DYNAMIC/EDGE-BASED STABILIZATION

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`
`8`	`8`	`#include "4C_inpar_IO_monitor_structure_dbc.hpp"`
`9`	`9`
`10`		`-#include "4C_io_geometry_type.hpp"`
`11`	`10`	`#include "4C_io_input_spec_builders.hpp"`
`12`	`11`
`13`	`12`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`
`8`	`8`	`#include "4C_inpar_IO_runtime_vtp_output_structure.hpp"`
`9`	`9`
`10`		`-#include "4C_io_geometry_type.hpp"`
`11`	`10`	`#include "4C_io_input_spec_builders.hpp"`
`12`	`11`
`13`	`12`