Move s2i input from inpar to scatra#2001
Merged
maxiludwig merged 1 commit into4C-multiphysics:mainfrom Apr 27, 2026
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
Refactors the scatra-scatra interface (S2I) input definitions by moving them out of src/inpar/ into the scalar transport module (src/scatra/), renaming the public header, and updating dependent modules to use the new S2I namespace and includes.
Changes:
- Replaced
4C_inpar_s2i.*with4C_scatra_s2i_input.*and moved S2I enums/APIs fromInpar::S2ItoS2I. - Updated S2I coupling/kinetics enum usage and parameter extraction across
scatra,scatra_ele,sti,ssi,ssti,contact, and global legacy registration. - Updated global input-spec/condition registration to reference
S2I::valid_parameters()/S2I::set_valid_conditions().
Reviewed changes
Copilot reviewed 39 out of 39 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/sti/4C_sti_monolithic_evaluate_OffDiag.hpp | Switch include to new S2I header; use S2I::CouplingType. |
| src/sti/4C_sti_monolithic_evaluate_OffDiag.cpp | Update kinetics/actions/sides/coupling enums from Inpar::S2I to S2I. |
| src/sti/4C_sti_monolithic.cpp | Update coupling-type comparisons/switch cases to S2I::*. |
| src/sti/4C_sti_algorithm.cpp | Update coupling-type and interface-side parameter handling to S2I::*. |
| src/ssti/4C_ssti_monolithic_evaluate_OffDiag.cpp | Update kinetics enum access to S2I::*. |
| src/ssti/4C_ssti_input.cpp | Switch include and condition component enums to S2I::*. |
| src/ssti/4C_ssti_algorithm.cpp | Update coupling-type checks to S2I::*. |
| src/ssi/4C_ssi_utils.cpp | Switch include and interface-side checks to S2I::*. |
| src/ssi/4C_ssi_monolithic_evaluate_OffDiag.cpp | Update kinetics enum access to S2I::*. |
| src/ssi/4C_ssi_monolithic.cpp | Update coupling-type check to S2I::*. |
| src/ssi/4C_ssi_manifold_utils.cpp | Switch include and kinetics enum handling to S2I::*. |
| src/ssi/4C_ssi_input.cpp | Switch include and condition enum selections to S2I::*. |
| src/ssi/4C_ssi_base.cpp | Update interface-side/kinetics checks to S2I::*. |
| src/scatra_ele/4C_scatra_ele_parameter_boundary.hpp | Switch include; update stored regularization enum type to S2I::RegularizationType. |
| src/scatra_ele/4C_scatra_ele_parameter_boundary.cpp | Update defaults/switch cases to S2I::* enums. |
| src/scatra_ele/4C_scatra_ele_boundary_calc_sti_electrode.cpp | Switch include; update kinetics enum usage to S2I::*. |
| src/scatra_ele/4C_scatra_ele_boundary_calc_elch_electrode_utils.cpp | Switch include; update kinetics enum usage to S2I::*. |
| src/scatra_ele/4C_scatra_ele_boundary_calc_elch_electrode_sti_thermo.cpp | Switch include; update kinetics enum usage to S2I::*. |
| src/scatra_ele/4C_scatra_ele_boundary_calc_elch_electrode_growth_utils.cpp | Update growth kinetics / regularization enum usage to S2I::*. |
| src/scatra_ele/4C_scatra_ele_boundary_calc_elch_electrode_growth.cpp | Update growth kinetics enum checks to S2I::*. |
| src/scatra_ele/4C_scatra_ele_boundary_calc_elch_electrode.cpp | Update kinetics enum usage to S2I::* across residual/lin paths. |
| src/scatra_ele/4C_scatra_ele_boundary_calc_elch_diffcond.cpp | Update kinetics enum switch cases to S2I::*. |
| src/scatra_ele/4C_scatra_ele_boundary_calc.cpp | Update kinetics enum cases to S2I::*. |
| src/scatra/4C_scatra_utils.cpp | Switch include; update interface-side checks to S2I::*. |
| src/scatra/4C_scatra_timint_meshtying_strategy_s2i_elch.hpp | Update type signatures from Inpar::S2I to S2I. |
| src/scatra/4C_scatra_timint_meshtying_strategy_s2i_elch.cpp | Update enum extraction/switches and singleton factories to S2I::*. |
| src/scatra/4C_scatra_timint_meshtying_strategy_s2i.hpp | Switch include; update public API/member types to S2I::*. |
| src/scatra/4C_scatra_timint_meshtying_strategy_s2i.cpp | Update enum extraction/switches/actions/sides to S2I::*. |
| src/scatra/4C_scatra_timint_implicit.cpp | Update macro-micro coupling kinetics handling to S2I::*. |
| src/scatra/4C_scatra_timint_elch_scl.cpp | Update interface-side selection to S2I::*. |
| src/scatra/4C_scatra_timint_elch.cpp | Update restart gating conditions to S2I::*. |
| src/scatra/4C_scatra_s2i_input.hpp | New/renamed S2I public header with S2I namespace enums and API declarations. |
| src/scatra/4C_scatra_s2i_input.cpp | New/renamed implementation wiring valid_parameters() and set_valid_conditions() under S2I. |
| src/scatra/4C_scatra_resulttest.cpp | Update growth evaluation enum usage to S2I::*. |
| src/global_legacy_module/4C_global_legacy_module_validparameters.cpp | Update registration to S2I::valid_parameters() and include new header. |
| src/global_legacy_module/4C_global_legacy_module_validconditions.cpp | Update registration to S2I::set_valid_conditions() and include new header. |
| src/contact/src/4C_contact_strategy_factory.cpp | Switch include; update interface-side check to S2I::*. |
| src/contact/src/4C_contact_nitsche_integrator_ssi_elch.cpp | Update kinetics enum usage to S2I::*. |
| src/contact/src/4C_contact_nitsche_integrator_ssi.cpp | Update kinetics enum usage to S2I::*. |
e4e64e1 to
bc2f8f3
Compare
davidrudlstorfer
approved these changes
Apr 27, 2026
Contributor
davidrudlstorfer
left a comment
There was a problem hiding this comment.
@maxiludwig thanks for the continuous effort on moving files from inpar 🫶
c-p-schmidt
approved these changes
Apr 27, 2026
Contributor
|
Looks good! Thank you! |
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
Inpar::S2Iinsrc/inpar/to the scalar transport module insrc/scatra/.4C_inpar_s2i.*->4C_scatra_s2i_input.*) and update all affected includes and global registration wiring.Inpar::S2ItoS2Iacross dependent modules (scatra,scatra_ele,sti,ssi,ssti,contact, andglobal_legacy_module).Related Issues
Part of #59