ADC-392 Repoint two_fluid_ap includes for the include/adc reorg - #50
Merged
Conversation
adc_cpp removed the include/adc forwarding shims (ADC-392, PR #219), so the flat elliptic paths no longer exist on its public surface. Point the two hand-written includes at the canonical family paths: numerics/elliptic/elliptic_solver.hpp -> interface/elliptic_solver.hpp numerics/elliptic/geometric_mg.hpp -> mg/geometric_mg.hpp Companion to adc_cpp ADC-392; no behavior change.
adc_cpp re-nested include/adc/mesh into index/layout/storage/geometry/ boundary/execution (ADC-394). Point the eight mesh includes in two_fluid_ap at the new family paths. Companion to adc_cpp ADC-394; no behavior change. Merge after the adc_cpp mesh re-nest lands (the new mesh/* paths exist only then).
wolf75222
changed the title
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
1 participant
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.
Companion to the adc_cpp
include/adcreorganization.two_fluid_apis the only adc_cases code with hand-written<adc/...>includes, so it tracks the canonical family paths as adc_cpp re-nests its headers.Changes (
two_fluid_ap/two_fluid_ap.hpp,two_fluid_ap/_two_fluid_ap.cpp)numerics/elliptic/elliptic_solver.hpp->numerics/elliptic/interface/elliptic_solver.hppnumerics/elliptic/geometric_mg.hpp->numerics/elliptic/mg/geometric_mg.hppmesh/box_array.hpp->mesh/layout/box_array.hpp,mesh/distribution_mapping.hpp->mesh/layout/distribution_mapping.hppmesh/fab2d.hpp->mesh/storage/fab2d.hpp,mesh/multifab.hpp->mesh/storage/multifab.hppmesh/fill_boundary.hpp->mesh/boundary/fill_boundary.hpp,mesh/physical_bc.hpp->mesh/boundary/physical_bc.hppmesh/geometry.hpp->mesh/geometry/geometry.hpp,mesh/for_each.hpp->mesh/execution/for_each.hppparallel/comm.hppis unchanged (parallel/ stays flat). No behavior change.Merge order
Merge after the corresponding adc_cpp phases land: the elliptic paths exist on adc_cpp master today; the new
mesh/*sub-family paths exist only once the mesh re-nest (#221) merges.