Skip to content

Refactored compositional flow unit tests #1809

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

Merged
francoishamon merged 5 commits into from
Mar 17, 2022
Merged

Refactored compositional flow unit tests #1809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bcc0f96
refactored compflow unit tests
francoishamon Mar 8, 2022
81cb6f2
Merge branch 'develop' into refactor/hamon/compflowUnitTests
francoishamon Mar 8, 2022
9a05d6e
removed references in testCompFlowUtils.hpp
francoishamon Mar 8, 2022
bfc0540
unit test passing on the thermal branch
francoishamon Mar 10, 2022
7dff3c6
Merge branch 'develop' into refactor/hamon/compflowUnitTests
francoishamon Mar 16, 2022
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
2 changes: 1 addition & 1 deletion src/coreComponents/constitutive/capillaryPressure/VanGenuchtenCapillaryPressure.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ void VanGenuchtenCapillaryPressure::postProcessInput()

if( m_phaseTypes[ip] != CapillaryPressureBase::REFERENCE_PHASE )
{
GEOSX_THROW_IF_LT_MSG( m_phaseCapPressureExponentInv[ip], 0.0,
GEOSX_THROW_IF_LE_MSG( m_phaseCapPressureExponentInv[ip], 0.0,
errorMsg( viewKeyStruct::phaseCapPressureExponentInvString() ),
InputError );
GEOSX_THROW_IF_GT_MSG( m_phaseCapPressureExponentInv[ip], 1.0,
Expand Down
24 changes: 24 additions & 0 deletions src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBaseExtrinsicData.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@ EXTRINSIC_MESH_DATA_TRAIT( temperature,
WRITE_AND_READ,
"Temperature" );

EXTRINSIC_MESH_DATA_TRAIT( deltaTemperature,
"deltaTemperature",
array1d< real64 >,
0,
NOPLOT,
NO_WRITE,
"Accumulated temperature updates" );

EXTRINSIC_MESH_DATA_TRAIT( globalCompDensity,
"globalCompDensity",
array2dLayoutComp,
Expand Down Expand Up @@ -95,6 +103,14 @@ EXTRINSIC_MESH_DATA_TRAIT( dPhaseVolumeFraction_dPressure,
NO_WRITE,
"Derivative of phase volume fraction with respect to pressure" );

EXTRINSIC_MESH_DATA_TRAIT( dPhaseVolumeFraction_dTemperature,
"dPhaseVolumeFraction_dTemperature",
array2dLayoutPhase,
0,
NOPLOT,
NO_WRITE,
"Derivative of phase volume fraction with respect to temperature" );

EXTRINSIC_MESH_DATA_TRAIT( dPhaseVolumeFraction_dGlobalCompDensity,
"dPhaseVolumeFraction_dGlobalCompDensity",
array3dLayoutPhase_dC,
Expand All @@ -119,6 +135,14 @@ EXTRINSIC_MESH_DATA_TRAIT( dPhaseMobility_dPressure,
NO_WRITE,
"Derivative of phase mobility with respect to pressure" );

EXTRINSIC_MESH_DATA_TRAIT( dPhaseMobility_dTemperature,
"dPhaseMobility_dTemperature",
array2dLayoutPhase,
0,
NOPLOT,
NO_WRITE,
"Derivative of phase mobility with respect to temperature" );

EXTRINSIC_MESH_DATA_TRAIT( dPhaseMobility_dGlobalCompDensity,
"dPhaseMobility_dGlobalCompDensity",
array3dLayoutPhase_dC,
Expand Down
32 changes: 16 additions & 16 deletions src/coreComponents/schema/docs/AcousticSEM_other.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@


========================= =================================================================================================================================================== =======================================================================
Name Type Description
========================= =================================================================================================================================================== =======================================================================
indexSeismoTrace integer Count for output pressure at receivers
maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
pressureNp1AtReceivers real64_array2d Pressure value at each receiver for each timestep
receiverIsLocal integer_array Flag that indicates whether the receiver is local to this MPI rank
receiverNodeIds integer_array2d Indices of the nodes (in the right order) for each receiver point
sourceConstants real64_array2d Constant part of the receiver for the nodes listed in m_receiverNodeIds
sourceIsLocal integer_array Flag that indicates whether the source is local to this MPI rank
sourceNodeIds integer_array2d Indices of the nodes (in the right order) for each source point
sourceValue real64_array2d Source Value of the sources
LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
========================= =================================================================================================================================================== =======================================================================
========================= =============================================================================================================================================================================================================================================================================================== =======================================================================
Name Type Description
========================= =============================================================================================================================================================================================================================================================================================== =======================================================================
indexSeismoTrace integer Count for output pressure at receivers
maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
pressureNp1AtReceivers real64_array2d Pressure value at each receiver for each timestep
receiverIsLocal integer_array Flag that indicates whether the receiver is local to this MPI rank
receiverNodeIds integer_array2d Indices of the nodes (in the right order) for each receiver point
sourceConstants real64_array2d Constant part of the receiver for the nodes listed in m_receiverNodeIds
sourceIsLocal integer_array Flag that indicates whether the source is local to this MPI rank
sourceNodeIds integer_array2d Indices of the nodes (in the right order) for each source point
sourceValue real64_array2d Source Value of the sources
LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
========================= =============================================================================================================================================================================================================================================================================================== =======================================================================


16 changes: 8 additions & 8 deletions src/coreComponents/schema/docs/CompositionalMultiphaseFVM_other.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@


========================= =================================================================================================================================================== ================================================================
Name Type Description
========================= =================================================================================================================================================== ================================================================
maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
========================= =================================================================================================================================================== ================================================================
========================= =============================================================================================================================================================================================================================================================================================== ================================================================
Name Type Description
========================= =============================================================================================================================================================================================================================================================================================== ================================================================
maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
========================= =============================================================================================================================================================================================================================================================================================== ================================================================


Loading