Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
4ef2c12
first pas
arng40 Sep 12, 2025
89b272d
Merge remote-tracking branch 'origin/develop' into refactor/dudes/wra…
arng40 Sep 15, 2025
3b4c1ad
add paramter description to CO2brineFluid
arng40 Sep 15, 2025
5a2193a
add default value to description to writeCSV
arng40 Sep 15, 2025
0cbeeab
1st iteration description wrapper of fieldSpecificationBase
arng40 Sep 15, 2025
ef9ac90
update setName description
arng40 Sep 15, 2025
e41cf47
syntax and review
arng40 Sep 16, 2025
7072f32
remove debug print fix description
arng40 Sep 16, 2025
a3f1528
xsd
arng40 Sep 24, 2025
6f670ad
Merge remote-tracking branch 'origin/develop' into refactor/dudes/wra…
arng40 Sep 24, 2025
9bed0df
Merge remote-tracking branch 'origin/develop' into refactor/dudes/wra…
arng40 Oct 15, 2025
a6e620f
2nd pass of review
arng40 Oct 16, 2025
33b11df
Merge remote-tracking branch 'origin/develop' into refactor/dudes/wra…
arng40 Oct 16, 2025
ecafd3d
remove allowable
arng40 Oct 17, 2025
3b1ae64
coordinates convention
arng40 Oct 20, 2025
55d45f7
updates review
arng40 Oct 21, 2025
6cc5cc5
Merge remote-tracking branch 'origin/develop' into refactor/dudes/wra…
arng40 Oct 22, 2025
12170a2
Merge branch 'develop' into refactor/dudes/wrapper-description
MelReyCG Oct 24, 2025
487ef13
code style
arng40 Oct 24, 2025
135f78a
Merge branch 'refactor/dudes/wrapper-description' of https://github.c…
arng40 Oct 24, 2025
b155631
Merge remote-tracking branch 'origin/develop' into refactor/dudes/wra…
arng40 Oct 27, 2025
3a4c60b
xsd
arng40 Oct 29, 2025
65ce2f7
Merge remote-tracking branch 'origin/develop' into refactor/dudes/wra…
arng40 Oct 29, 2025
99591f0
Merge branch 'develop' into refactor/dudes/wrapper-description
arng40 Nov 3, 2025
fbce082
Merge branch 'develop' into refactor/dudes/wrapper-description
arng40 Nov 6, 2025
1f9584e
Merge branch 'develop' into refactor/dudes/wrapper-description
arng40 Nov 20, 2025
c330bac
regenerate readthedoc
arng40 Nov 21, 2025
04bc549
style
arng40 Nov 21, 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
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ VanGenuchtenCapillaryPressure::VanGenuchtenCapillaryPressure( string const & nam
registerWrapper( viewKeyStruct::phaseMinVolumeFractionString(), &m_phaseMinVolumeFraction ).
setApplyDefaultValue( 0.0 ).
setInputFlag( InputFlags::OPTIONAL ).
setDescription( "Minimum volume fraction value for each phase" );
setDescription( "Minimum volume fraction value for each phase (between 0 and 1) used to compute the capillary pressure" );

registerWrapper( viewKeyStruct::phaseCapPressureExponentInvString(), &m_phaseCapPressureExponentInv ).
setApplyDefaultValue( 0.5 ).
Expand Down
40 changes: 38 additions & 2 deletions src/coreComponents/constitutive/docs/CO2BrineFluid.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,16 @@ The user can parameterize the construction of the table by specifying the salini
| FlashModel | CO2Solubility | :math:`p_{min}` | :math:`p_{max}` | :math:`\Delta p` | :math:`T_{min}` | :math:`T_{max}` | :math:`\Delta T` | Salinity |
+------------+---------------+-----------------+-----------------+------------------+-----------------+-----------------+------------------+----------+

Note that the pressures are in Pascal, temperatures are in Kelvin, and the salinity is a molality (moles of NaCl per kg of brine).
**Parameter Descriptions**:

- **p_min**: The minimum pressure value [Pa] for which the density table is defined. It sets the lower boundary of the pressure range.
- **p_max**: The maximum pressure value [Pa] for the density table. It sets the upper boundary of the pressure range.
- **Δp (Delta p)**: The increment in pressure [Pa] between successive values in the pressure axis of the table. It defines the resolution of the pressure dimension.
- **T_min**: The minimum temperature value [K] for the density table. This sets the lower boundary of the temperature range.
- **T_max**: The maximum temperature value [K] for the density table. It sets the upper boundary of the temperature range.
- **ΔT (Delta T)**: The increment in temperature [K] between successive values in the temperature axis of the table. It defines the resolution of the temperature dimension.
- **Salinity**: Salinity is expressed in molality (moles of NaCl per kg of brine).

The temperature must be between 283.15 and 623.15 Kelvin.
The table is populated using the model of Duan and Sun (2003).
Specifically, we solve the following nonlinear CO2 equation of state (equation (A1) in Duan and Sun, 2003) for each pair :math:`(p,T)` to obtain the reduced volume, :math:`V_r`.
Expand Down Expand Up @@ -92,6 +101,15 @@ The user defines the pressure (in Pascal) and temperature (in Kelvin) axis of th
| DensityFun | SpanWagnerCO2Density | :math:`p_{min}` | :math:`p_{max}` | :math:`\Delta p` | :math:`T_{min}` | :math:`T_{max}` | :math:`\Delta T` |
+------------+----------------------+-----------------+-----------------+------------------+-----------------+-----------------+------------------+

**Parameter Descriptions**:

- **p_min**: The minimum pressure value [Pa] for which the density table is defined. It sets the lower boundary of the pressure range.
- **p_max**: The maximum pressure value [Pa] for the density table. It sets the upper boundary of the pressure range.
- **Δp (Delta p)**: The increment in pressure [Pa] between successive values in the pressure axis of the table. It defines the resolution of the pressure dimension.
- **T_min**: The minimum temperature value [K] for the density table. This sets the lower boundary of the temperature range.
- **T_max**: The maximum temperature value [K] for the density table. It sets the upper boundary of the temperature range.
- **ΔT (Delta T)**: The increment in temperature [K] between successive values in the temperature axis of the table. It defines the resolution of the temperature dimension.

This correlation is valid for pressures less than :math:`8 \times 10^8` Pascal and temperatures less than 1073.15 Kelvin.
Using these parameters, GEOS internally constructs a two-dimensional table storing the values of density as a function of pressure and temperature.
This table is populated as explained in the work of Span and Wagner (1996) by solving the following nonlinear Helmholtz energy equation for each pair :math:`(p,T)` to obtain the value of density, :math:`\rho_{g}`:
Expand All @@ -110,6 +128,15 @@ The pressure and temperature axis of the viscosity table can be parameterized in
| ViscosityFun | FenghourCO2Viscosity | :math:`p_{min}` | :math:`p_{max}` | :math:`\Delta p` | :math:`T_{min}` | :math:`T_{max}` | :math:`\Delta T` |
+--------------+----------------------+-----------------+-----------------+------------------+-----------------+-----------------+------------------+

**Parameter Descriptions**:

- **p_min**: The minimum pressure value [Pa] for which the density table is defined. It sets the lower boundary of the pressure range.
- **p_max**: The maximum pressure value [Pa] for the density table. It sets the upper boundary of the pressure range.
- **Δp (Delta p)**: The increment in pressure [Pa] between successive values in the pressure axis of the table. It defines the resolution of the pressure dimension.
- **T_min**: The minimum temperature value [K] for the density table. This sets the lower boundary of the temperature range.
- **T_max**: The maximum temperature value [K] for the density table. It sets the upper boundary of the temperature range.
- **ΔT (Delta T)**: The increment in temperature [K] between successive values in the temperature axis of the table. It defines the resolution of the temperature dimension.

This correlation is valid for pressures less than :math:`3 \times 10^8` Pascal and temperatures less than 1493.15 Kelvin.
This table is populated as explained in the work of Fenghour and Wakeham (1998) by computing the CO2 phase viscosity, :math:`\mu_g`, as follows:

Expand All @@ -133,9 +160,18 @@ The user specifies the (constant) salinity and defines the pressure and temperat
| DensityFun | PhillipsBrineDensity | :math:`p_{min}` | :math:`p_{max}` | :math:`\Delta p` | :math:`T_{min}` | :math:`T_{max}` | :math:`\Delta T` | Salinity |
+------------+----------------------+-----------------+-----------------+------------------+-----------------+-----------------+------------------+----------+

**Parameter Descriptions**:

- **p_min**: The minimum pressure value [Pa] for which the density table is defined. It sets the lower boundary of the pressure range.
- **p_max**: The maximum pressure value [Pa] for the density table. It sets the upper boundary of the pressure range.
- **Δp (Delta p)**: The increment in pressure [Pa] between successive values in the pressure axis of the table. It defines the resolution of the pressure dimension.
- **T_min**: The minimum temperature value [K] for the density table. This sets the lower boundary of the temperature range.
- **T_max**: The maximum temperature value [K] for the density table. It sets the upper boundary of the temperature range.
- **ΔT (Delta T)**: The increment in temperature [K] between successive values in the temperature axis of the table. It defines the resolution of the temperature dimension.
- **Salinity**: Salinity is expressed in molality (moles of NaCl per kg of brine).

The pressure must be in Pascal and must be less than :math:`5 \times 10^7` Pascal.
The temperature must be in Kelvin and must be between 283.15 and 623.15 Kelvin.
The salinity is a molality (moles of NaCl per kg of brine).
Using these parameters, GEOS performs a preprocessing step to construct a two-dimensional table storing the brine density, :math:`\rho_{\ell,table}` for the specified salinity as a function of pressure and temperature using the expression:

.. math::
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ CO2BrineFluid( string const & name, Group * const parent ):
registerWrapper( viewKeyStruct::writeCSVFlagString(), &m_writeCSV ).
setInputFlag( InputFlags::OPTIONAL ).
setRestartFlags( RestartFlags::NO_WRITE ).
setDescription( "When set to 1, write PVT tables into a CSV file.\n "
setDescription( "When set to 1, write PVT tables into a CSV file.\n"
"if the table is requested to be output in the log, and it is too large, a CSV file will be generated even if `writeCSV` is set to 0." ).
setDefaultValue( 0 );

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ MultiFluidBase::MultiFluidBase( string const & name, Group * const parent )

registerWrapper( viewKeyStruct::componentMolarWeightString(), &m_componentMolarWeight ).
setInputFlag( InputFlags::OPTIONAL ).
setDescription( "Component molar weights" );
setDescription( "Component molar weights [kg/mol]" );

registerWrapper( viewKeyStruct::phaseNamesString(), &m_phaseNames ).
setRTTypeName( rtTypes::CustomTypes::groupNameRefArray ).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ InvariantImmiscibleFluid::InvariantImmiscibleFluid( string const & name, Group *

registerWrapper( viewKeyStruct::componentMolarWeightString(), &m_componentMolarWeight )
.setInputFlag( dataRepository::InputFlags::REQUIRED )
.setDescription( "Molar weights of components" );
.setDescription( "Component molar weights [kg/mol]" );

// Densities: constant phase densities
registerWrapper( "densities", &m_densities )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ ReactiveBrineFluid( string const & name, Group * const parent ):
setInputFlag( InputFlags::OPTIONAL ).
setRestartFlags( RestartFlags::NO_WRITE ).
setDescription( "When set to 1, write PVT tables into a CSV file.\n"
"If the table is requested to be output in the log, and it is too large, a CSV file will be generated even if `writeCSV` is set to 0." );
"If the table is requested to be output in the log, and it is too large,"
"a CSV file will be generated even if `writeCSV` is set to 0." );

// if this is a thermal model, we need to make sure that the arrays will be properly displayed and saved to restart
if( isThermal() )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ CompressibleSinglePhaseFluid::CompressibleSinglePhaseFluid( string const & name,
registerWrapper( viewKeyStruct::compressibilityString(), &m_compressibility ).
setApplyDefaultValue( 0.0 ).
setInputFlag( InputFlags::OPTIONAL ).
setDescription( "Fluid compressibility" );
setDescription( "Fluid compressibility [Pa^-1]" );

registerWrapper( viewKeyStruct::viscosibilityString(), &m_viscosibility ).
setApplyDefaultValue( 0.0 ).
Expand All @@ -53,7 +53,7 @@ CompressibleSinglePhaseFluid::CompressibleSinglePhaseFluid( string const & name,
registerWrapper( viewKeyStruct::referencePressureString(), &m_referencePressure ).
setApplyDefaultValue( 0.0 ).
setInputFlag( InputFlags::OPTIONAL ).
setDescription( "Reference pressure" );
setDescription( "Reference pressure [Pa]" );

registerWrapper( viewKeyStruct::referenceDensityString(), &m_referenceDensity ).
setApplyDefaultValue( 1000.0 ).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ProppantSlurryFluid::ProppantSlurryFluid( string const & name, Group * const par
registerWrapper( viewKeyStruct::compressibilityString(), &m_compressibility ).
setApplyDefaultValue( 0.0 ).
setInputFlag( InputFlags::OPTIONAL ).
setDescription( "Fluid compressibility" );
setDescription( "Fluid compressibility [Pa^-1]" );

registerWrapper( viewKeyStruct::referenceProppantDensityString(), &m_referenceProppantDensity ).
setApplyDefaultValue( 1400.0 ).
Expand All @@ -43,7 +43,7 @@ ProppantSlurryFluid::ProppantSlurryFluid( string const & name, Group * const par
registerWrapper( viewKeyStruct::referencePressureString(), &m_referencePressure ).
setApplyDefaultValue( 1e5 ).
setInputFlag( InputFlags::OPTIONAL ).
setDescription( "Reference pressure" );
setDescription( "Reference pressure [Pa]" );

registerWrapper( viewKeyStruct::referenceDensityString(), &m_referenceDensity ).
setApplyDefaultValue( 1000.0 ).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ PressurePermeability::PressurePermeability( string const & name, Group * const p

registerWrapper( viewKeyStruct::referencePressureString(), &m_referencePressure ).
setInputFlag( InputFlags::REQUIRED ).
setDescription( "Reference pressure for the pressure permeability model" );
setDescription( "Reference pressure for the pressure permeability model [Pa]" );

registerWrapper( viewKeyStruct::referencePermeabilityString(), &m_referencePermeability ).
setApplyDefaultValue( 0.0 ).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ BrooksCoreyBakerRelativePermeability::BrooksCoreyBakerRelativePermeability( stri
registerWrapper( viewKeyStruct::phaseMinVolumeFractionString(), &m_phaseMinVolumeFraction ).
setApplyDefaultValue( 0.0 ).
setInputFlag( InputFlags::OPTIONAL ).
setDescription( "Minimum volume fraction value for each phase" );
setDescription( "Minimum volume fraction value for each phase (between 0 and 1) used to compute the relative permeability " );

registerWrapper( viewKeyStruct::waterOilRelPermExponentString(), &m_waterOilRelPermExponent ).
setApplyDefaultValue( 1.0 ).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ BrooksCoreyRelativePermeability::BrooksCoreyRelativePermeability( string const &
registerWrapper( viewKeyStruct::phaseMinVolumeFractionString(), &m_phaseMinVolumeFraction ).
setApplyDefaultValue( 0.0 ).
setInputFlag( InputFlags::OPTIONAL ).
setDescription( "Minimum volume fraction value for each phase" );
setDescription( "Minimum volume fraction value for each phase (between 0 and 1) used to compute the relative permeability " );

registerWrapper( viewKeyStruct::phaseRelPermExponentString(), &m_phaseRelPermExponent ).
setApplyDefaultValue( 1.0 ).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ PorosityBase::PorosityBase( string const & name, Group * const parent ):
{
registerWrapper( viewKeyStruct::defaultReferencePorosityString(), &m_defaultReferencePorosity ).
setInputFlag( InputFlags::REQUIRED ).
setDescription( "Default value of the reference porosity" );
setDescription( "The default porosity value of the rock at the reference pressure" );

registerField< fields::porosity::porosity >( &m_newPorosity );

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ PressurePorosity::PressurePorosity( string const & name, Group * const parent ):
{
registerWrapper( viewKeyStruct::referencePressureString(), &m_referencePressure ).
setInputFlag( InputFlags::REQUIRED ).
setDescription( "Reference pressure for solid compressibility" );
setDescription( "Reference pressure for solid compressibility [Pa]" );

registerWrapper( viewKeyStruct::compressibilityString(), &m_compressibility ).
setInputFlag( InputFlags::REQUIRED ).
setDescription( "Solid compressibility" );
setDescription( "Solid compressibility [Pa^-1]" );
}

REGISTER_CATALOG_ENTRY( ConstitutiveBase, PressurePorosity, string const &, Group * const )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ FieldSpecificationBase::FieldSpecificationBase( string const & name, Group * par
setRTTypeName( rtTypes::CustomTypes::groupNameRefArray ).
setInputFlag( InputFlags::REQUIRED ).
setSizedFromParent( 0 ).
setDescription( "Name of sets that boundary condition is applied to." );
setDescription( "Names of sets that the boundary condition is applied to.\n"
"A set can contain heterogeneous elements in the mesh (volumes, nodes, faces, edges).\n"
"A set can be be defined by a 'Geometry' component, or correspond to imported sets in case of an external mesh" );

registerWrapper( viewKeyStruct::objectPathString(), &m_objectPath ).
setRTTypeName( rtTypes::CustomTypes::groupNameRef ).
Expand All @@ -40,12 +42,14 @@ FieldSpecificationBase::FieldSpecificationBase( string const & name, Group * par
registerWrapper( viewKeyStruct::fieldNameString(), &m_fieldName ).
setRTTypeName( rtTypes::CustomTypes::groupNameRef ).
setInputFlag( InputFlags::OPTIONAL ).
setDescription( "Name of field that boundary condition is applied to." );
setDescription( "Name of field that boundary condition is applied to.\n"
"A field can represent a physical variable. (pressure, temperature, global composition fraction of the fluid, ...)" );

registerWrapper( viewKeyStruct::componentString(), &m_component ).
setApplyDefaultValue( -1 ).
setInputFlag( InputFlags::OPTIONAL ).
setDescription( "Component of field (if tensor) to apply boundary condition to." );
setDescription( "Component of field (if tensor) to apply boundary condition to.\n"
"The component must use the order in which the phaseNames have been defined in the Constitutive Element." );

registerWrapper( viewKeyStruct::directionString(), &m_direction ).
setApplyDefaultValue( {0, 0, 0} ).
Expand All @@ -65,7 +69,7 @@ FieldSpecificationBase::FieldSpecificationBase( string const & name, Group * par
registerWrapper( viewKeyStruct::scaleString(), &m_scale ).
setApplyDefaultValue( 0.0 ).
setInputFlag( InputFlags::OPTIONAL ).
setDescription( "Scale factor for value of the boundary condition." );
setDescription( "Apply a scaling factor for the value of the boundary condition." );

registerWrapper( viewKeyStruct::initialConditionString(), &m_initialCondition ).
setApplyDefaultValue( 0 ).
Expand Down
2 changes: 1 addition & 1 deletion src/coreComponents/fileIO/Outputs/MemoryStatsOutput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ MemoryStatsOutput::MemoryStatsOutput( string const & name,
this->registerWrapper( viewKeysStruct::writeCSV, &m_writeCSV ).
setApplyDefaultValue( csvOutputDefault ? 1 : 0 ).
setInputFlag( dataRepository::InputFlags::OPTIONAL ).
setDescription( "When set to 1, write the same statistics as the 'logLevel' allows to output in a CSV file" );
setDescription( "When set to 1, write the statistics into a CSV file.\nWhen set to 0, no output" );
}

void MemoryStatsOutput::postInputInitialization()
Expand Down
4 changes: 4 additions & 0 deletions src/coreComponents/mesh/docs/Mesh.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ or by importing meshes from various common mesh file formats.
This latter options allows one to work with more complex geometries,
such as unstructured meshes comprised of a variety of element types (polyhedral elements).

.. note::
GEOS uses a right-handed Cartesian coordinate system (X: right, Y: forward, Z: upward) that is consistently applied throughout the mesh definition and discretization processes.
This convention affects mesh topology, and finite element / volume computations.

************************
Internal Mesh Generation
************************
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ CompositionalMultiphaseBase::CompositionalMultiphaseBase( const string & name,
setSizedFromParent( 0 ).
setInputFlag( InputFlags::OPTIONAL ).
setApplyDefaultValue( 0.2 ).
setDescription( "Target (absolute) change in phase volume fraction in a time step" );
setDescription( "Target (absolute) change in the phase volume fraction within a single time step." );
this->registerWrapper( viewKeyStruct::targetRelativeCompDensChangeString(), &m_targetRelativeCompDensChange ).
setSizedFromParent( 0 ).
setInputFlag( InputFlags::OPTIONAL ).
Expand All @@ -131,7 +131,7 @@ CompositionalMultiphaseBase::CompositionalMultiphaseBase( const string & name,
setSizedFromParent( 0 ).
setInputFlag( InputFlags::OPTIONAL ).
setApplyDefaultValue( 0.5 ).
setDescription( "Maximum (absolute) change in a component fraction in a Newton iteration" );
setDescription( "Maximum (absolute) allowed change in the composition fraction of any component within a single time step, in a Newton iteration" );
this->registerWrapper( viewKeyStruct::maxRelativePresChangeString(), &m_maxRelativePresChange ).
setSizedFromParent( 0 ).
setInputFlag( InputFlags::OPTIONAL ).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ ImmiscibleMultiphaseFlow::ImmiscibleMultiphaseFlow( const string & name,
setSizedFromParent( 0 ).
setInputFlag( InputFlags::OPTIONAL ).
setApplyDefaultValue( 0.2 ).
setDescription( "Target (absolute) change in phase volume fraction in a time step" );
setDescription( "Target (absolute) change in the phase volume fraction within a single time step." );
}

void ImmiscibleMultiphaseFlow::postInputInitialization()
Expand Down
Loading
Loading