Move inpar to physics input#1901
Merged
maxiludwig merged 3 commits into4C-multiphysics:mainfrom Mar 30, 2026
Merged
Conversation
amgebauer
previously approved these changes
Mar 27, 2026
davidrudlstorfer
previously approved these changes
Mar 27, 2026
Contributor
davidrudlstorfer
left a comment
There was a problem hiding this comment.
Thanks @maxiludwig for the work, looks nice:)
Part of #59
There was a problem hiding this comment.
Pull request overview
This PR continues the ongoing refactor to eliminate top-level inpar_ input files by moving physics-specific input parameter definitions into their corresponding modules (biofilm→FS3I, wear→contact, cardiac monodomain→ScaTra), and updating call sites to use the new headers/namespaces.
Changes:
- Replaced
Inpar::...input headers with module-local input headers and adjusted namespaces (Inpar::Wear→Wear,Inpar::BioFilm→BioFilm,Inpar::ElectroPhysiology→ElectroPhysiology). - Introduced new module-local input definition files (e.g.,
4C_contact_wear_input.{hpp,cpp}) and removed the oldsrc/inpar/4C_inpar_wear.hpp. - Updated global input/condition registries and multiple contact/structure/scatra call sites to reference the new locations.
Reviewed changes
Copilot reviewed 24 out of 24 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| src/structure/4C_structure_timint_impl.cpp | Switches wear input enum lookups to Wear::* and includes new wear input header. |
| src/scatra_ele/4C_scatra_ele_parameter_std.hpp | Updates include to new cardiac monodomain input header. |
| src/scatra_ele/4C_scatra_ele_calc_cardiac_monodomain.cpp | Updates include to new cardiac monodomain input header. |
| src/scatra/4C_scatra_cardiac_monodomain_input.hpp | Renames include guard and moves valid_parameters() into ElectroPhysiology namespace (no longer under Inpar). |
| src/scatra/4C_scatra_cardiac_monodomain_input.cpp | Updates implementation to match new header and namespace (ElectroPhysiology::valid_parameters). |
| src/red_airways/4C_red_airways_implicitintegration.cpp | Drops now-unneeded include of the old biofilm inpar header. |
| src/inpar/4C_inpar_wear.hpp | Removes old top-level wear inpar header (wear input now lives in contact module). |
| src/global_legacy_module/4C_global_legacy_module_validparameters.cpp | Registers moved specs via Wear::valid_parameters(), BioFilm::valid_parameters(), ElectroPhysiology::valid_parameters(). |
| src/global_legacy_module/4C_global_legacy_module_validconditions.cpp | Switches biofilm condition registration to BioFilm::set_valid_conditions() and updates includes. |
| src/fs3i/4C_fs3i_biofilm_fsi_input.hpp | Renames include guard and moves declarations into BioFilm namespace (no longer under Inpar). |
| src/fs3i/4C_fs3i_biofilm_fsi_input.cpp | Updates implementations to match new header/namespace (BioFilm::*). |
| src/contact/src/4C_contact_wear_interface.hpp | Switches wear enum types/includes to new contact wear input header. |
| src/contact/src/4C_contact_wear_interface.cpp | Switches wear enum usage to Wear::* (new namespace location). |
| src/contact/src/4C_contact_wear_input.hpp | New wear input header colocated with the contact module. |
| src/contact/src/4C_contact_wear_input.cpp | New wear parameter spec implementation (Wear::valid_parameters()) in contact module. |
| src/contact/src/4C_contact_strategy_factory.cpp | Switches wear enum usage/includes from Inpar::Wear to Wear. |
| src/contact/src/4C_contact_manager.cpp | Switches wear enum usage/includes from Inpar::Wear to Wear. |
| src/contact/src/4C_contact_lagrange_strategy_wear.cpp | Switches wear enum usage/includes from Inpar::Wear to Wear. |
| src/contact/src/4C_contact_interpolator.hpp | Updates member types from Inpar::Wear::* to Wear::* and include. |
| src/contact/src/4C_contact_interpolator.cpp | Switches wear enum lookups/comparisons to Wear::*. |
| src/contact/src/4C_contact_integrator.hpp | Updates wear enum accessors/member types and include to Wear::*. |
| src/contact/src/4C_contact_integrator.cpp | Switches wear enum lookups/comparisons to Wear::*. |
| src/contact/src/4C_contact_coupling3d.hpp | Switches wear type lookup to Wear::WearType and include. |
| src/contact/src/4C_contact_coupling2d.hpp | Switches wear side/type lookups to Wear::* and include. |
Comments suppressed due to low confidence (1)
src/scatra/4C_scatra_cardiac_monodomain_input.hpp:28
- The doc comment
/// elch parametersis inconsistent with this module/file (CARDIAC MONODOMAIN CONTROL/ electrophysiology). Please update the comment to describe cardiac monodomain/electrophysiology parameters to avoid confusion with electrochemistry (ElCh).
9a2b02c
0fcec43 to
9a2b02c
Compare
davidrudlstorfer
approved these changes
Mar 30, 2026
amgebauer
approved these changes
Mar 30, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description and Context
Moving the next bunch of inpar files into their related physics module.
Commmits:
src/inpar/4C_inpar_bio.{hpp,cpp}-->src/fs3i/4C_fs3i_biofilm_fsi_input.{hpp,cpp}src/inpar/4C_inpar_wear.{hpp,cpp}-->src/contact/src/4C_contact_wear_input.{hpp,cpp}src/inpar/4C_inpar_cardiac_monodomain.{hpp,cpp}-->src/scatra/4C_scatra_cardiac_monodomain_input.{hpp,cpp}Related Issues and Pull Requests
Part of #59