Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .integrated_tests.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
baselines:
bucket: geosx
baseline: integratedTests/baseline_integratedTests-pr3783-13079-916d2a0
baseline: integratedTests/baseline_integratedTests-pr3755-13107-9203370

allow_fail:
all: ''
Expand Down
10 changes: 7 additions & 3 deletions BASELINE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@ This file is designed to track changes to the integrated test baselines.
Any developer who updates the baseline ID in the .integrated_tests.yaml file is expected to create an entry in this file with the pull request number, date, and their justification for rebaselining.
These notes should be in reverse-chronological order, and use the following time format: (YYYY-MM-DD).

PR #3783 (2025-08-22) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3783-13079-916d2a0.tar.gz>
PR #3755 (2025-08-25) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3755-13107-9203370.tar.gz>
=====================
Update bug in single phase flash handling
LogInfo cleanup.

PR #3783 (2025-08-25) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3783-13079-916d2a0.tar.gz>
=====================
Update bug in single phase flash handling.

PR #3224 (2025-08-22) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3224-13023-0334b63.tar.gz>
=====================
Add Taper boundary conditions inside second-order wave solvers
Add Taper boundary conditions inside second-order wave solvers.

PR #3781 (2025-08-20) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3781-12988-f27ea4b.tar.gz>
=====================
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@
objectPath="ElementRegions"
fieldName="temperature"
scale="313.15"
setNames="{ top }"
logLevel="0" />
setNames="{ top }" />
<FieldSpecification
name="bottomTemperature"
objectPath="ElementRegions"
fieldName="temperature"
scale="343.15"
setNames="{ bottom }"
logLevel="0" />
setNames="{ bottom }" />
</FieldSpecifications>

</Problem>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,7 @@
component="0"
functionName="totalRateTable1"
scale="1"
setNames="{ thermalSource1 }"
logLevel="0" />
setNames="{ thermalSource1 }" />

<FieldSpecification
beginTime="7.8840000001e8"
Expand All @@ -233,8 +232,7 @@
component="0"
functionName="totalRateTable2"
scale="1"
setNames="{ thermalSource2 }"
logLevel="0" />
setNames="{ thermalSource2 }" />
</FieldSpecifications>
<!-- SPHINX_SOURCES_END -->

Expand Down
2 changes: 0 additions & 2 deletions inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@

<Aquifer
name="aquiferBC1"
logLevel="1"
aquiferPorosity="1e-1"
aquiferPermeability="1e-13"
aquiferInitialPressure="8e6"
Expand All @@ -248,7 +247,6 @@

<Aquifer
name="aquiferBC2"
logLevel="1"
aquiferPorosity="1e-1"
aquiferPermeability="1e-13"
aquiferInitialPressure="8e6"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@
objectPath="ElementRegions/region"
fieldName="pressure"
initialCondition="1"
logLevel="2"
scale="1.1e6" />
<FieldSpecification
name="initial_temperature"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@
<!-- Injection pressure: ~100 bar -->
<FieldSpecification
name="sourceTermPressure"
logLevel="1"
objectPath="faceManager"
fieldName="pressure"
scale="1e7"
Expand Down Expand Up @@ -241,7 +240,6 @@
<!-- Production pressure: ~50 bar, -->
<FieldSpecification
name="sinkTermPressure"
logLevel="1"
objectPath="faceManager"
fieldName="pressure"
scale="5e6"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@
objectPath="ElementRegions/region"
fieldName="pressure"
initialCondition="1"
logLevel="2"
scale="1.1e6" />
<FieldSpecification
name="initial_temperature"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@
fieldName="projectedShearTraction"
scale="1.0"
functionName="shearStress_function"
setNames="{ all }"
logLevel="0"/>
setNames="{ all }"/>
</FieldSpecifications>

<Functions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@

<FieldSpecification
name="sourceTerm"
logLevel="1"
objectPath="faceManager"
fieldName="pressure"
scale="5e7"
Expand Down
1 change: 0 additions & 1 deletion inputFiles/singlePhaseFlow/staircase_3d.xml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@

<FieldSpecification
name="sourceTerm"
logLevel="1"
objectPath="faceManager"
fieldName="pressure"
scale="5e6"
Expand Down
1 change: 0 additions & 1 deletion inputFiles/thermalMultiphaseFlow/co2_thermal_2d.xml
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@

<FieldSpecification
name="sourcePressure"
logLevel="1"
setNames="{ source1, source2 }"
objectPath="faceManager"
fieldName="pressure"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,16 +100,14 @@
objectPath="faceManager"
fieldName="pressure"
scale="2e6"
setNames="{ zpos }"
logLevel="0"/>
setNames="{ zpos }"/>

<FieldSpecification
name="topTemperature"
objectPath="faceManager"
fieldName="temperature"
scale="296.0153"
setNames="{ zpos }"
logLevel="0"/>
setNames="{ zpos }"/>

<FieldSpecification
name="botTemperature"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,14 @@
objectPath="faceManager"
fieldName="pressure"
scale="2e6"
setNames="{ zpos }"
logLevel="0"/>
setNames="{ zpos }"/>

<FieldSpecification
name="topTemperature"
objectPath="faceManager"
fieldName="temperature"
scale="296.0153"
setNames="{ zpos }"
logLevel="0"/>
setNames="{ zpos }"/>

<FieldSpecification
name="botTemperature"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ CO2BrineFluid( string const & name, Group * const parent ):
setPlotLevel( PlotLevel::LEVEL_0 ).
setRestartFlags( RestartFlags::WRITE_AND_READ );
}
addLogLevel< logInfo::PVT >();

addLogLevel< logInfo::TableLogOutput >();
}

template< typename PHASE1, typename PHASE2, typename FLASH >
Expand Down Expand Up @@ -337,22 +338,21 @@ void CO2BrineFluid< PHASE1, PHASE2, FLASH >::createPVTModels()

// then, we are ready to instantiate the phase models
bool const isClone = this->isClone();
TableFunction::OutputOptions const pvtOutputOpts = {
!isClone && m_writeCSV,// writeCSV
!isClone && isLogLevelActive< logInfo::PVT >( this->getLogLevel()), // writeInLog
TableFunction::OutputOptions const outputOpts = {
!isClone && m_writeCSV, // writeCSV
!isClone && isLogLevelActive< logInfo::TableLogOutput >( this->getLogLevel()) // writeInLog
};


m_phase1 = std::make_unique< PHASE1 >( getName() + "_phaseModel1",
phase1InputParams,
m_componentNames,
m_componentMolarWeight,
pvtOutputOpts );
outputOpts );
m_phase2 = std::make_unique< PHASE2 >( getName() + "_phaseModel2",
phase2InputParams,
m_componentNames,
m_componentMolarWeight,
pvtOutputOpts );
outputOpts );


// 2) Create the flash model
Expand All @@ -374,16 +374,12 @@ void CO2BrineFluid< PHASE1, PHASE2, FLASH >::createPVTModels()
{
if( strs[1] == FLASH::catalogName() )
{
TableFunction::OutputOptions const flashOutputOpts = {
!isClone && m_writeCSV,// writeCSV
!isClone && isLogLevelActive< logInfo::PVT >( this->getLogLevel()), // writeInLog
};
m_flash = std::make_unique< FLASH >( getName() + '_' + FLASH::catalogName(),
strs,
m_phaseNames,
m_componentNames,
m_componentMolarWeight,
flashOutputOpts );
outputOpts );
}
}
else
Expand Down Expand Up @@ -420,17 +416,12 @@ void CO2BrineFluid< PHASE1, PHASE2, FLASH >::createPVTModels()
strs[2] = m_solubilityTables[0];
}

TableFunction::OutputOptions const flashOutputOpts = {
!isClone && m_writeCSV,// writeCSV
!isClone && isLogLevelActive< logInfo::PVT >( this->getLogLevel() ), // writeInLog
};

m_flash = std::make_unique< FLASH >( getName() + '_' + FLASH::catalogName(),
strs,
m_phaseNames,
m_componentNames,
m_componentMolarWeight,
flashOutputOpts );
outputOpts );
}

GEOS_THROW_IF( m_flash == nullptr,
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ namespace logInfo
*/
///@{

struct PVT
struct TableLogOutput
{
static constexpr int getMinLogLevel() { return 1; }
static constexpr std::string_view getDescription() { return "Output PVT table"; }
static constexpr std::string_view getDescription() { return "Output PVT table to log"; }
};

/// @cond DO_NOT_DOCUMENT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ ReactiveBrineFluid( string const & name, Group * const parent ):
setRestartFlags( RestartFlags::WRITE_AND_READ );
}

addLogLevel< logInfo::PVT >();
addLogLevel< logInfo::TableLogOutput >();
}

template< typename PHASE >
Expand Down Expand Up @@ -205,8 +205,8 @@ void ReactiveBrineFluid< PHASE > ::createPVTModels()

bool const isClone = this->isClone();
TableFunction::OutputOptions const pvtOutputOpts = {
!isClone && m_writeCSV,// writeCSV
!isClone && isLogLevelActive< logInfo::PVT >( this->getLogLevel() ), // writeInLog
!isClone && m_writeCSV, // writeCSV
!isClone && isLogLevelActive< logInfo::TableLogOutput >( this->getLogLevel()) // writeInLog
};

// then, we are ready to instantiate the phase models
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,10 @@ namespace logInfo

/// @cond DO_NOT_DOCUMENT

struct Initialisation
struct LogOutput
{
static constexpr int getMinLogLevel() { return 1; }
static constexpr std::string_view getDescription() { return "Informations on initialisation"; }
};

struct Results
{
static constexpr int getMinLogLevel() { return 1; }
static constexpr std::string_view getDescription() { return "Output results"; }
static constexpr std::string_view getDescription() { return "Enable log output"; }
};

/// @endcond
Expand Down
Loading
Loading