Skip to content

refactor: nested namespace structure #3803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 17 commits into
base: develop
Choose a base branch
from
Open

refactor: nested namespace structure #3803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
de4df22
refactor: nested namespace structure
Sep 1, 2025
cabb00c
Merge branch 'develop' into pt/fix-1876
paveltomin Sep 2, 2025
2dd1c5c
cuda fix, hopefully
Sep 2, 2025
5f970e6
move zformulation into a namespace
Sep 3, 2025
0437a03
Merge branch 'develop' into pt/fix-1876
paveltomin Sep 9, 2025
ecf1b51
Merge remote-tracking branch 'origin/develop' into pt/fix-1876
Sep 15, 2025
accac60
build fix
Sep 15, 2025
f9dfe8b
typo
Sep 16, 2025
dedce40
few missing places
Sep 16, 2025
2271b8a
swap kernels
Sep 16, 2025
89cf474
Refactor namespace declaration in isothermal kernel
paveltomin Sep 17, 2025
583c4cc
Fix namespace declaration in thermal kernel template
paveltomin Sep 17, 2025
6abc226
Fix namespace declaration for hybridFVM
paveltomin Sep 17, 2025
9055328
Fix namespace declaration in fluidFlow kernel template
paveltomin Sep 17, 2025
6c81089
Fix namespace declaration for hybridFVM
paveltomin Sep 17, 2025
f109362
Fix namespace declaration for fluidFlow kernels
paveltomin Sep 17, 2025
20611f9
Refactor namespace for fluidFlow kernels
paveltomin Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...nts/integrationTests/wellsTests/testIsothermalReservoirCompositionalMultiphaseMSWells.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ using namespace geos;
using namespace geos::dataRepository;
using namespace geos::constitutive;
using namespace geos::testing;
using namespace geos::wells::kernels::compositional;

CommandLineOptions g_commandLineOptions;
void writeTableToFile( string const & filename, char const * str )
Expand Down Expand Up @@ -492,7 +493,7 @@ void testNumericalJacobian( CompositionalMultiphaseReservoirAndWells< Compositio

fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DPRES,
wellElemDofNumber[iwelem] + ColOffset::DPRES,
dP,
jacobianFD.toViewConstSizes() );
}
Expand All @@ -513,7 +514,7 @@ void testNumericalJacobian( CompositionalMultiphaseReservoirAndWells< Compositio

fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DCOMP + jc,
wellElemDofNumber[iwelem] + ColOffset::DCOMP + jc,
dRho,
jacobianFD.toViewConstSizes() );
}
Expand All @@ -538,7 +539,7 @@ void testNumericalJacobian( CompositionalMultiphaseReservoirAndWells< Compositio

fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DCOMP + NC,
wellElemDofNumber[iwelem] + ColOffset::DCOMP + NC,
dRate,
jacobianFD.toViewConstSizes() );
}
Expand Down
9 changes: 5 additions & 4 deletions ...nts/integrationTests/wellsTests/testIsothermalReservoirCompositionalMultiphaseSSWells.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ using namespace geos;
using namespace geos::dataRepository;
using namespace geos::constitutive;
using namespace geos::testing;
using namespace geos::wells::kernels::compositional;

CommandLineOptions g_commandLineOptions;
void writeTableToFile( string const & filename, char const * str )
Expand Down Expand Up @@ -541,7 +542,7 @@ void testNumericalJacobian( CompositionalMultiphaseReservoirAndWells< Compositio

fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DPRES,
wellElemDofNumber[iwelem] + ColOffset::DPRES,
dP,
jacobianFD.toViewConstSizes() );
}
Expand All @@ -562,7 +563,7 @@ void testNumericalJacobian( CompositionalMultiphaseReservoirAndWells< Compositio

fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DCOMP + jc,
wellElemDofNumber[iwelem] + ColOffset::DCOMP + jc,
dRho,
jacobianFD.toViewConstSizes() );
}
Expand All @@ -584,7 +585,7 @@ void testNumericalJacobian( CompositionalMultiphaseReservoirAndWells< Compositio

fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DCOMP + NC+1,
wellElemDofNumber[iwelem] + ColOffset::DCOMP + NC+1,
dT,
jacobianFD.toViewConstSizes() );
}
Expand All @@ -610,7 +611,7 @@ void testNumericalJacobian( CompositionalMultiphaseReservoirAndWells< Compositio

fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DCOMP + NC,
wellElemDofNumber[iwelem] + ColOffset::DCOMP + NC,
dRate,
jacobianFD.toViewConstSizes() );
}
Expand Down
7 changes: 4 additions & 3 deletions ...oreComponents/integrationTests/wellsTests/testReservoirCompositionalMultiphaseMSWells.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ using namespace geos;
using namespace geos::dataRepository;
using namespace geos::constitutive;
using namespace geos::testing;
using namespace geos::wells::kernels::compositional;

CommandLineOptions g_commandLineOptions;

Expand Down Expand Up @@ -395,7 +396,7 @@ void testNumericalJacobian( CompositionalMultiphaseReservoirAndWells<> & solver,

fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DPRES,
wellElemDofNumber[iwelem] + ColOffset::DPRES,
dP,
jacobianFD.toViewConstSizes() );
}
Expand All @@ -416,7 +417,7 @@ void testNumericalJacobian( CompositionalMultiphaseReservoirAndWells<> & solver,

fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DCOMP + jc,
wellElemDofNumber[iwelem] + ColOffset::DCOMP + jc,
dRho,
jacobianFD.toViewConstSizes() );
}
Expand All @@ -441,7 +442,7 @@ void testNumericalJacobian( CompositionalMultiphaseReservoirAndWells<> & solver,

fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DCOMP + NC,
wellElemDofNumber[iwelem] + ColOffset::DCOMP + NC,
dRate,
jacobianFD.toViewConstSizes() );
}
Expand Down
5 changes: 3 additions & 2 deletions src/coreComponents/integrationTests/wellsTests/testReservoirSinglePhaseMSWells.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ using namespace geos;
using namespace geos::dataRepository;
using namespace geos::constitutive;
using namespace geos::testing;
using namespace geos::wells::kernels::singlePhase;

CommandLineOptions g_commandLineOptions;

Expand Down Expand Up @@ -287,7 +288,7 @@ void testNumericalJacobian( SinglePhaseReservoirAndWells<> & solver,
// this is computing J_RW and J_WW
fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + singlePhaseWellKernels::ColOffset::DPRES,
wellElemDofNumber[iwelem] + ColOffset::DPRES,
dP,
jacobianFD.toViewConstSizes() );
}
Expand Down Expand Up @@ -315,7 +316,7 @@ void testNumericalJacobian( SinglePhaseReservoirAndWells<> & solver,
// this is computing J_RW and J_WW
fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + singlePhaseWellKernels::ColOffset::DRATE,
wellElemDofNumber[iwelem] + ColOffset::DRATE,
dRate,
jacobianFD.toViewConstSizes() );
}
Expand Down
9 changes: 5 additions & 4 deletions src/coreComponents/integrationTests/wellsTests/testReservoirThermalSinglePhaseMSWells.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ using namespace geos;
using namespace geos::dataRepository;
using namespace geos::constitutive;
using namespace geos::testing;
using namespace geos::wells::kernels::singlePhase;

CommandLineOptions g_commandLineOptions;

Expand Down Expand Up @@ -412,7 +413,7 @@ void testNumericalJacobian( SinglePhaseReservoirAndWells<> & solver,
// this is computing J_RW and J_WW
fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + singlePhaseWellKernels::ColOffset_WellJac< 1 >::dP,
wellElemDofNumber[iwelem] + ColOffset_WellJac< 1 >::dP,
dP,
jacobianFD.toViewConstSizes() );
}
Expand Down Expand Up @@ -440,13 +441,13 @@ void testNumericalJacobian( SinglePhaseReservoirAndWells<> & solver,
// this is computing J_RW and J_WW
fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + singlePhaseWellKernels::ColOffset_WellJac< 1 >::dT,
wellElemDofNumber[iwelem] + ColOffset_WellJac< 1 >::dT,
dT,
jacobianFD.toViewConstSizes() );

if( diag_check && !wellControls.isProducer() && iwelem == 0 )
{
localIndex rowIndex = wellElemDofNumber[iwelem] + singlePhaseWellKernels::ColOffset_WellJac< 1 >::dT;
localIndex rowIndex = wellElemDofNumber[iwelem] + ColOffset_WellJac< 1 >::dT;
setNumericalJacobianValue( rowIndex, rowIndex, 1.0, jacobianFD.toViewConstSizes() );
}
}
Expand All @@ -472,7 +473,7 @@ void testNumericalJacobian( SinglePhaseReservoirAndWells<> & solver,
// this is computing J_RW and J_WW
fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + singlePhaseWellKernels::ColOffset_WellJac< 1 >::dQ,
wellElemDofNumber[iwelem] + ColOffset_WellJac< 1 >::dQ,
dRate,
jacobianFD.toViewConstSizes() );
}
Expand Down
9 changes: 5 additions & 4 deletions ...Components/integrationTests/wellsTests/testReservoirThermalSinglePhaseMSWells_RateInj.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ using namespace geos;
using namespace geos::dataRepository;
using namespace geos::constitutive;
using namespace geos::testing;
using namespace geos::wells::kernels::singlePhase;

CommandLineOptions g_commandLineOptions;

Expand Down Expand Up @@ -495,7 +496,7 @@ void testNumericalJacobian( SinglePhaseReservoirAndWells<> & solver,
// this is computing J_RW and J_WW
fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + singlePhaseWellKernels::ColOffset_WellJac< 1 >::dP,
wellElemDofNumber[iwelem] + ColOffset_WellJac< 1 >::dP,
dP,
jacobianFD.toViewConstSizes() );
}
Expand Down Expand Up @@ -523,13 +524,13 @@ void testNumericalJacobian( SinglePhaseReservoirAndWells<> & solver,
// this is computing J_RW and J_WW
fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + singlePhaseWellKernels::ColOffset_WellJac< 1 >::dT,
wellElemDofNumber[iwelem] + ColOffset_WellJac< 1 >::dT,
dT,
jacobianFD.toViewConstSizes() );

if( diag_check && !wellControls.isProducer() && iwelem == 0 )
{
localIndex rowIndex = wellElemDofNumber[iwelem] + singlePhaseWellKernels::ColOffset_WellJac< 1 >::dT;
localIndex rowIndex = wellElemDofNumber[iwelem] + ColOffset_WellJac< 1 >::dT;
setNumericalJacobianValue( rowIndex, rowIndex, 1.0, jacobianFD.toViewConstSizes() );
}
}
Expand All @@ -555,7 +556,7 @@ void testNumericalJacobian( SinglePhaseReservoirAndWells<> & solver,
// this is computing J_RW and J_WW
fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + singlePhaseWellKernels::ColOffset_WellJac< 1 >::dQ,
wellElemDofNumber[iwelem] + ColOffset_WellJac< 1 >::dQ,
dRate,
jacobianFD.toViewConstSizes() );
}
Expand Down
15 changes: 8 additions & 7 deletions ...onents/integrationTests/wellsTests/testThermalReservoirCompositionalMultiphaseMSWells.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ using namespace geos;
using namespace geos::dataRepository;
using namespace geos::constitutive;
using namespace geos::testing;
using namespace geos::wells::kernels::compositional;

CommandLineOptions g_commandLineOptions;

Expand Down Expand Up @@ -567,7 +568,7 @@ void testNumericalJacobian( CompositionalMultiphaseReservoirAndWells< Compositio

fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DPRES,
wellElemDofNumber[iwelem] + ColOffset::DPRES,
dP,
jacobianFD.toViewConstSizes() );
}
Expand All @@ -588,7 +589,7 @@ void testNumericalJacobian( CompositionalMultiphaseReservoirAndWells< Compositio

fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DCOMP + jc,
wellElemDofNumber[iwelem] + ColOffset::DCOMP + jc,
dRho,
jacobianFD.toViewConstSizes() );
}
Expand All @@ -610,13 +611,13 @@ void testNumericalJacobian( CompositionalMultiphaseReservoirAndWells< Compositio
assembleFunction( jacobian.toViewConstSizes(), residual.toView() );
fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DCOMP + NC+1,
wellElemDofNumber[iwelem] + ColOffset::DCOMP + NC+1,
dT,
jacobianFD.toViewConstSizes() );
if( iwelem == 1 )
{
real64 dRdX = 0.0;
localIndex rowIndex = wellElemDofNumber[0] + compositionalMultiphaseWellKernels::ColOffset::DCOMP + NC+1;;
localIndex rowIndex = wellElemDofNumber[0] + ColOffset::DCOMP + NC+1;;
for( integer ider=0; ider< 3; ider++ )
{
globalIndex colIndex = wellElemDofNumber[0]+ ider;
Expand All @@ -628,8 +629,8 @@ void testNumericalJacobian( CompositionalMultiphaseReservoirAndWells< Compositio
}
else
{
localIndex rowIndex = wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DCOMP + NC+1;;
globalIndex colIndex = wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DCOMP + NC+1;;
localIndex rowIndex = wellElemDofNumber[iwelem] + ColOffset::DCOMP + NC+1;;
globalIndex colIndex = wellElemDofNumber[iwelem] + ColOffset::DCOMP + NC+1;;
setNumericalJacobianValue( rowIndex, colIndex, 1.0, jacobianFD.toViewConstSizes() );
}

Expand Down Expand Up @@ -657,7 +658,7 @@ void testNumericalJacobian( CompositionalMultiphaseReservoirAndWells< Compositio

fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DCOMP + NC,
wellElemDofNumber[iwelem] + ColOffset::DCOMP + NC,
dRate,
jacobianFD.toViewConstSizes() );
}
Expand Down
13 changes: 7 additions & 6 deletions ...onents/integrationTests/wellsTests/testThermalReservoirCompositionalMultiphaseSSWells.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ using namespace geos;
using namespace geos::dataRepository;
using namespace geos::constitutive;
using namespace geos::testing;
using namespace geos::wells::kernels::compositional;

CommandLineOptions g_commandLineOptions;

Expand Down Expand Up @@ -569,7 +570,7 @@ void testNumericalJacobian( CompositionalMultiphaseReservoirAndWells< Compositio

fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DPRES,
wellElemDofNumber[iwelem] + ColOffset::DPRES,
dP,
jacobianFD.toViewConstSizes() );
}
Expand All @@ -590,7 +591,7 @@ void testNumericalJacobian( CompositionalMultiphaseReservoirAndWells< Compositio

fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DCOMP + jc,
wellElemDofNumber[iwelem] + ColOffset::DCOMP + jc,
dRho,
jacobianFD.toViewConstSizes() );
}
Expand All @@ -612,14 +613,14 @@ void testNumericalJacobian( CompositionalMultiphaseReservoirAndWells< Compositio
assembleFunction( jacobian.toViewConstSizes(), residual.toView() );
fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DCOMP + NC+1,
wellElemDofNumber[iwelem] + ColOffset::DCOMP + NC+1,
dT,
jacobianFD.toViewConstSizes() );
}
else
{
localIndex rowIndex = wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DCOMP + NC+1;;
globalIndex colIndex = wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DCOMP + NC+1;;
localIndex rowIndex = wellElemDofNumber[iwelem] + ColOffset::DCOMP + NC+1;;
globalIndex colIndex = wellElemDofNumber[iwelem] + ColOffset::DCOMP + NC+1;;
setNumericalJacobianValue( rowIndex, colIndex, 1.0, jacobianFD.toViewConstSizes() );
}
}
Expand All @@ -646,7 +647,7 @@ void testNumericalJacobian( CompositionalMultiphaseReservoirAndWells< Compositio

fillNumericalJacobian( residual.toViewConst(),
residualOrig.toViewConst(),
wellElemDofNumber[iwelem] + compositionalMultiphaseWellKernels::ColOffset::DCOMP + NC,
wellElemDofNumber[iwelem] + ColOffset::DCOMP + NC,
dRate,
jacobianFD.toViewConstSizes() );
}
Expand Down
10 changes: 10 additions & 0 deletions src/coreComponents/physicsSolvers/fluidFlow/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,16 @@ set( fluidFlowSolvers_headers
kernels/compositional/ThermalResidualNormKernel.hpp
kernels/compositional/ThermalSolutionCheckKernel.hpp
kernels/compositional/ThermalSolutionScalingKernel.hpp
kernels/compositional/zFormulation/AccumulationKernel.hpp
kernels/compositional/zFormulation/FluxComputeKernel.hpp
kernels/compositional/zFormulation/PhaseComponentFlux.hpp
kernels/compositional/zFormulation/PhaseVolumeFractionKernel.hpp
kernels/compositional/zFormulation/SolutionScalingAndCheckingKernelBase.hpp
kernels/compositional/zFormulation/DirichletFluxComputeKernel.hpp
kernels/compositional/zFormulation/PPUPhaseFlux.hpp
kernels/compositional/zFormulation/PhaseMobilityKernel.hpp
kernels/compositional/zFormulation/PotGrad.hpp
kernels/compositional/zFormulation/SolutionScalingKernel.hpp
kernels/immiscibleMultiphase/ImmiscibleMultiphaseKernels.hpp
wells/CompositionalMultiphaseWell.hpp
wells/CompositionalMultiphaseWellFields.hpp
Expand Down
Loading
Loading