refactor: fields and constitutives #3517
Conversation
paveltomin
changed the title
paveltomin
requested review from
rrsettgast,
CusiniM,
castelletto1,
jhuang2601,
frankfeifan,
ryar9534,
matteofrigo5 and
Guotong-Ren
as code owners
paveltomin
added
the
ci: run integrated tests
paveltomin
added
type: cleanup / refactor
| @@ -250,22 +249,19 @@ void CompositionalMultiphaseBase::registerDataOnMesh( Group & meshBodies ) | |||
| } | |||
|
|
|||
| // If at least one region has a capillary pressure model, consider it enabled for all | |||
| string const capPresName = getConstitutiveName< CapillaryPressureBase >( subRegion ); | |||
| if( !capPresName.empty() ) | |||
| if( !getConstitutiveName< CapillaryPressureBase >( subRegion ).empty() ) | |||
There was a problem hiding this comment.
| if( !getConstitutiveName< CapillaryPressureBase >( subRegion ).empty() ) | |
| m_hasCapPressure = !getConstitutiveName< CapillaryPressureBase >( subRegion ).empty(); |
There was a problem hiding this comment.
this would change the logic, i committed first but now will revert
There was a problem hiding this comment.
What about m_hasCapPressure |= !getConstitutiveName< CapillaryPressureBase >( subRegion ).empty();?
There was a problem hiding this comment.
@MelReyCG done, could you please approve?
| @@ -228,8 +229,6 @@ void CompositionalMultiphaseBase::postInputInitialization() | |||
|
|
|||
| void CompositionalMultiphaseBase::registerDataOnMesh( Group & meshBodies ) | |||
| { | |||
| using namespace fields::flow; | |||
There was a problem hiding this comment.
Just curious as to why we are removing this. Is this part of the coding standard?
There was a problem hiding this comment.
using namespace fields already defined in the very beginning of the file, so no need to duplicate it here
There was a problem hiding this comment.
i am not sure if there is a coding standard about that, just trying to make things consistent across the solvers
…phaseBase.cpp Co-authored-by: Dickson Kachuma <81433670+dkachuma@users.noreply.github.com>
paveltomin
added
the
flag: requires rebaseline
| setRestartFlags( RestartFlags::NO_WRITE ). | ||
| setSizedFromParent( 0 ); | ||
| } | ||
|
|
There was a problem hiding this comment.
Out of curiosity, what is the need for PhysicsSolverBase::setConstitutiveNamesCallSuper...
why was this removed
There was a problem hiding this comment.
i am not exactly sure about the logic behind, i think it originates from this big PR #1682
fluidNames registration moved somewhere else (next to its assignement), so this function becomes redundant
src/coreComponents/physicsSolvers/fluidFlow/proppantTransport/ProppantTransport.cpp
Show resolved
Hide resolved
src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWell.cpp
Show resolved
Hide resolved
paveltomin
added
the
ci: run integrated tests
clean up fields and constitutive "registration"