Resolve merge conflicts with origin/main for thermal physics integration #14
Conversation
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
Co-authored-by: langleyreview <langleyreview@gmail.com>
…ew-directory-claude-4.5-sonnet-thinking-1d91 Document codebase in new directory
Co-authored-by: langleyreview <langleyreview@gmail.com>
Co-authored-by: langleyreview <langleyreview@gmail.com>
Co-authored-by: langleyreview <langleyreview@gmail.com>
Co-authored-by: langleyreview <langleyreview@gmail.com>
- Add override keywords to IsotropicHeat and IsotropicLinearThermoelasticity to properly override pure virtual methods from base classes - Update SWIG interface files to include all overridden virtual methods to prevent compilation errors when generating Python bindings
- Remove constructors from abstract base classes RheologyHeat and RheologyThermoelasticity to prevent SWIG from generating code that tries to instantiate abstract classes - Remove kernel methods that return function pointers (PetscPointFn*, PetscPointJac) from concrete classes - these are internal implementation details that cannot be properly wrapped by SWIG - Keep only the methods that can be properly exposed to Python
Co-authored-by: langleyreview <langleyreview@gmail.com>
…-thermal-physics-model-claude-4.5-opus-high-thinking-c210 Implement and test new thermal physics model
Copilot
AI
changed the title
[WIP] Integrate source class with main and add tests
Resolve merge conflicts with origin/main for thermal physics integration
Dec 12, 2025
rwalkerlewis
approved these changes
Dec 12, 2025
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.
Merged
origin/maininto the source class update branch to integrate newly added thermal physics capabilities (heat transfer, thermoelasticity, thermoporoelasticity).Changes
heatandthermoelasticitysubdirectories to build alongside existingsourcessubdirectoryheat,thermoelasticity, andthermoporoelasticitysubdirectories to build alongside existingsourcessubdirectoryThe merge brings in thermal physics test infrastructure from upstream while preserving the source class test additions from this branch.
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.
Note
Introduce full thermal physics stack (heat, thermoelasticity, thermoporoelasticity) with C++ kernels/materials, Python wrappers, solution containers, extensive tests, and architecture docs.
HeatEquation,IsotropicHeat), material classes (Heat,IsotropicHeat), auxiliary/derived factories, and SWIG/Python wrappers.Thermoelasticity,IsotropicLinearThermoelasticity), material/aux factories, Python bindings, and dynamic two-way coupling support; new solution types (SolnDispTemp,SolnDispVelTemp).Thermoporoelasticity,IsotropicLinearThermoporoelasticity), material/aux factories, Python wrappers; new solution types (SolnDispPresTemp,SolnDispPresTracStrainTemp,SolnPresTemp).code-architecture-guide/(architecture, components, data flow, build, modules, FE, extension guide, index, quick reference).Written by Cursor Bugbot for commit a4522d3. This will update automatically on new commits. Configure here.