refactor: Remove getDataContext duplication #3895

arng40 · 2025-10-31T16:08:26Z

Remove all getDataContext() / getWrapperDataContext() / getName() written directly in the error message strings (getDataContext() << “: blabla”).
Add missing DataContexts when they are not present in the error DataContext parameters (GEOS_ERROR*, GEOS_ASSERT*, GEOS_WARNING*, GEOS_THROW*)

Example:

Before:

***** EXCEPTION
***** LOCATION: path/to/geosRepos/codes/GEOS2/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseHybridFVM.cpp:125
***** Error cause: !fvManager.hasGroup< HybridMimeticDiscretization >( m_discretizationName )
***** Rank 0: CompositionalMultiphaseHybridFVM compflow (co2_hybrid_1d.xml, l.6): the HybridMimeticDiscretization must be selected with CompositionalMultiphaseHybridFVM

After

***** EXCEPTION
***** LOCATION: /path/to/geosRepos/codes/GEOS/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseHybridFVM.cpp:125
***** Error cause: !fvManager.hasGroup< HybridMimeticDiscretization >( m_discretizationName )
***** Rank 0: The HybridMimeticDiscretization must be selected with CompositionalMultiphaseHybridFVM

…file

…necessary

… link between GEOS_THROW_CTX_IF and LVARRAY_THROW_IF_TEST( EXP, MSG, TYPE )

… in try/catch statements Problem: Retrieves everything that was thrown, so not just the message.

…/catch in main)": remove useless try/catch

…y spaces. The previous condition checked whether an argument was present and whether the option was immediately followed by a value like -test"value", which excluded valid cases like -test "value" et -test "value".

…t is expected.

MelReyCG

LGTM!

dkachuma

Looks good.

Are you able to add in the description an example of the change in the output message - just curious.

OmarDuran · 2026-02-10T19:40:19Z

src/coreComponents/common/unitTests/testDataTypes.cpp

I removed these remnants of debugging.

thanks a lot

OmarDuran

Excellent refactor, thanks @arng40

…-dataContext

Copilot

Pull request overview

This PR refactors logging/exception call sites to avoid duplicating getDataContext() / wrapper context in error strings and to ensure missing DataContext objects are passed via the GEOS_* macro parameters.

Changes:

Removed inline context prefixes from many error/warning strings (e.g., getDataContext() << ": ..."), relying on macro-provided contexts instead.
Added missing DataContext arguments to GEOS_ERROR*, GEOS_WARNING*, GEOS_THROW*, GEOS_ASSERT* call sites for improved diagnostics consistency.
Updated a mesh integration test to validate new exception text expectations.

Reviewed changes

Copilot reviewed 152 out of 152 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
src/coreComponents/physicsSolvers/wavePropagation/shared/WaveSolverBase.cpp	Refactors throws to pass `DataContext` separately.
src/coreComponents/physicsSolvers/wavePropagation/sem/elastic/secondOrderEqn/isotropic/ElasticWaveEquationSEM.cpp	Refactors errors/throws to use context parameters.
src/coreComponents/physicsSolvers/wavePropagation/sem/elastic/firstOrderEqn/isotropic/ElasticFirstOrderWaveEquationSEM.cpp	Refactors errors/throws to use context parameters.
src/coreComponents/physicsSolvers/wavePropagation/sem/acoustic/secondOrderEqn/isotropic/AcousticWaveEquationSEM.cpp	Refactors throws to pass `DataContext` separately.
src/coreComponents/physicsSolvers/wavePropagation/sem/acoustic/secondOrderEqn/anisotropic/AcousticVTIWaveEquationSEM.cpp	Refactors error to pass `DataContext` separately.
src/coreComponents/physicsSolvers/wavePropagation/sem/acoustic/firstOrderEqn/isotropic/AcousticFirstOrderWaveEquationSEM.cpp	Refactors errors/throws to use context parameters.
src/coreComponents/physicsSolvers/wavePropagation/dg/acoustic/secondOrderEqn/isotropic/AcousticWaveEquationDG.cpp	Adds missing `DataContext` to throws/errors.
src/coreComponents/physicsSolvers/solidMechanics/contact/SolidMechanicsLagrangeContact.cpp	Refactors errors to provide `DataContext` as macro args.
src/coreComponents/physicsSolvers/solidMechanics/contact/SolidMechanicsAugmentedLagrangianContact.cpp	Refactors error to include `DataContext`.
src/coreComponents/physicsSolvers/solidMechanics/contact/ContactSolverBase.cpp	Refactors throw/error message formatting + adds `DataContext`.
src/coreComponents/physicsSolvers/solidMechanics/SolidMechanicsStateReset.cpp	Refactors throw message and passes `DataContext`.
src/coreComponents/physicsSolvers/solidMechanics/SolidMechanicsMPM.cpp	Refactors errors to pass `DataContext`.
src/coreComponents/physicsSolvers/solidMechanics/SolidMechanicsLagrangianFEM.cpp	Refactors errors/warnings to pass `DataContext` separately.
src/coreComponents/physicsSolvers/multiphysics/SinglePhaseReservoirAndWells.cpp	Refactors errors/throws to pass `DataContext`.
src/coreComponents/physicsSolvers/multiphysics/SinglePhasePoromechanicsEmbeddedFractures.cpp	Refactors error to pass `DataContext`.
src/coreComponents/physicsSolvers/multiphysics/SinglePhasePoromechanics.cpp	Refactors errors to pass `DataContext`.
src/coreComponents/physicsSolvers/multiphysics/PoromechanicsSolver.hpp	Refactors throws to pass solver-specific `DataContext`.
src/coreComponents/physicsSolvers/multiphysics/PoromechanicsInitialization.cpp	Refactors wrapper-context usage in throws.
src/coreComponents/physicsSolvers/multiphysics/PoromechanicsConformingFractures.hpp	Refactors error to pass `DataContext`.
src/coreComponents/physicsSolvers/multiphysics/MultiphasePoromechanics.cpp	Refactors errors to pass `DataContext`.
src/coreComponents/physicsSolvers/multiphysics/CoupledSolver.hpp	Refactors solver-not-found path to throw with wrapper `DataContext`.
src/coreComponents/physicsSolvers/multiphysics/CoupledReservoirAndWellsBase.cpp	Refactors throw message to avoid embedded context text.
src/coreComponents/physicsSolvers/multiphysics/CompositionalMultiphaseReservoirAndWells.cpp	Refactors errors/throws to pass multiple contexts.
src/coreComponents/physicsSolvers/inducedSeismicity/SpringSlider.cpp	Refactors error to pass multiple contexts.
src/coreComponents/physicsSolvers/fluidFlow/wells/kernels/SinglePhaseWellKernels.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/physicsSolvers/fluidFlow/wells/kernels/CompositionalMultiphaseWellKernels.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/physicsSolvers/fluidFlow/wells/WellSolverBase.cpp	Refactors throw to pass `DataContext`.
src/coreComponents/physicsSolvers/fluidFlow/wells/SinglePhaseWell.cpp	Refactors errors/throws to pass `DataContext`.
src/coreComponents/physicsSolvers/fluidFlow/proppantTransport/ProppantTransport.cpp	Refactors errors/warnings to pass `DataContext`.
src/coreComponents/physicsSolvers/fluidFlow/StencilDataCollection.cpp	Refactors errors/throws to pass `DataContext`.
src/coreComponents/physicsSolvers/fluidFlow/SourceFluxStatistics.cpp	Refactors warning/error messages and context parameters.
src/coreComponents/physicsSolvers/fluidFlow/SinglePhaseStatistics.cpp	Refactors warning to pass `DataContext`.
src/coreComponents/physicsSolvers/fluidFlow/SinglePhaseHybridFVM.cpp	Refactors throw/warning paths and adds logger include.
src/coreComponents/physicsSolvers/fluidFlow/SinglePhaseBase.cpp	Refactors throws/logs to avoid embedded context strings.
src/coreComponents/physicsSolvers/fluidFlow/ReactiveCompositionalMultiphaseOBL.cpp	Refactors throws/warnings to pass `DataContext`.
src/coreComponents/physicsSolvers/fluidFlow/ImmiscibleMultiphaseFlow.cpp	Refactors warnings/errors to pass `DataContext`.
src/coreComponents/physicsSolvers/fluidFlow/FlowSolverBase.cpp	Refactors errors to pass `DataContext`.
src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseStatistics.cpp	Refactors throw to include `DataContext`.
src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseHybridFVM.cpp	Refactors errors/throws/warnings and adds logger include.
src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseFVM.cpp	Refactors errors to pass `DataContext`.
src/coreComponents/physicsSolvers/PhysicsSolverBase.hpp	Refactors error to pass `DataContext` separately.
src/coreComponents/physicsSolvers/PhysicsSolverBase.cpp	Refactors errors/warnings to pass `DataContext`.
src/coreComponents/physicsSolvers/NonlinearSolverParameters.cpp	Refactors input validation errors to pass wrapper `DataContext`.
src/coreComponents/physicsSolvers/LinearSolverParameters.cpp	Refactors input validation errors to pass wrapper `DataContext`.
src/coreComponents/physicsSolvers/FieldStatisticsBase.hpp	Refactors throw message to avoid embedded context string.
src/coreComponents/mesh/simpleGeometricObjects/ThickPlane.cpp	Refactors errors to pass `DataContext`.
src/coreComponents/mesh/simpleGeometricObjects/Box.cpp	Refactors errors to pass `DataContext`.
src/coreComponents/mesh/generators/WellGeneratorBase.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/mesh/generators/VTKWellGenerator.cpp	Refactors error to pass `DataContext`.
src/coreComponents/mesh/generators/VTKMeshGenerator.cpp	Refactors throw/error to pass `DataContext`.
src/coreComponents/mesh/generators/ParticleBlock.cpp	Refactors error to pass `DataContext`.
src/coreComponents/mesh/generators/InternalMeshGenerator.cpp	Refactors errors to pass `DataContext`.
src/coreComponents/mesh/generators/CellBlock.cpp	Refactors error to pass `DataContext`.
src/coreComponents/mesh/WellElementSubRegion.cpp	Refactors throw messages to avoid embedded context prefix.
src/coreComponents/mesh/WellElementRegion.cpp	Adds `DataContext` to throw and updates comments.
src/coreComponents/mesh/SurfaceElementRegion.hpp	Refactors error message + passes `DataContext`.
src/coreComponents/mesh/PerforationData.cpp	Adds missing `DataContext` to throws.
src/coreComponents/mesh/Perforation.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/mesh/ObjectManagerBase.cpp	Refactors error to pass `DataContext`.
src/coreComponents/mesh/MeshObjectPath.cpp	Refactors throws to use names + pass `DataContext`.
src/coreComponents/mesh/MeshLevel.cpp	Refactors error to pass multiple `DataContext`s.
src/coreComponents/mesh/FaceManager.cpp	Refactors errors to pass `DataContext`.
src/coreComponents/mesh/FaceElementSubRegion.cpp	Refactors warnings/errors to pass `DataContext`.
src/coreComponents/mesh/ElementRegionManager.hpp	Refactors errors to avoid embedded context text.
src/coreComponents/mesh/ElementRegionManager.cpp	Refactors errors to pass multiple `DataContext`s.
src/coreComponents/mesh/CellElementSubRegion.cpp	Refactors errors; introduces new format-string/arg mismatch risk.
src/coreComponents/mesh/CellElementRegionSelector.cpp	Refactors throws to avoid embedded wrapper context in message.
src/coreComponents/mesh/CellElementRegion.cpp	Refactors throws to avoid embedded context text.
src/coreComponents/integrationTests/meshTests/testElementRegions.cpp	Updates test expectations for new exception strings (currently broken).
src/coreComponents/functions/TableFunction.cpp	Refactors error/throw formatting and context usage.
src/coreComponents/finiteVolume/HybridMimeticDiscretization.cpp	Refactors error to pass `DataContext`.
src/coreComponents/fileIO/Outputs/VTKOutput.cpp	Refactors input validation errors/logs to pass `DataContext`.
src/coreComponents/fileIO/Outputs/SiloOutput.cpp	Refactors logs/throws to avoid embedded context in message.
src/coreComponents/fileIO/Outputs/MemoryStatsOutput.cpp	Refactors error to pass `DataContext`.
src/coreComponents/fieldSpecification/TractionBoundaryCondition.cpp	Refactors logs/errors and enum string formatting.
src/coreComponents/fieldSpecification/PerfectlyMatchedLayer.cpp	Refactors throws to avoid embedded context in message.
src/coreComponents/fieldSpecification/FieldSpecificationManager.cpp	Adds missing `DataContext` to throws.
src/coreComponents/fieldSpecification/EquilibriumInitialCondition.cpp	Refactors throws/warnings to pass `DataContext`.
src/coreComponents/fieldSpecification/AquiferBoundaryCondition.cpp	Refactors throws to pass `DataContext` (including table context).
src/coreComponents/events/PeriodicEvent.cpp	Refactors throw messages to avoid embedded context.
src/coreComponents/dataRepository/Group.hpp	Refactors domain/type errors to avoid embedded context prefixes.
src/coreComponents/dataRepository/Group.cpp	Refactors error/throw messages to avoid embedded context.
src/coreComponents/constitutiveDrivers/solid/TriaxialDriver.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutiveDrivers/fluid/multiFluid/PVTDriver.cpp	Refactors warnings to avoid embedded wrapper context in message.
src/coreComponents/constitutive/thermalConductivity/SinglePhaseThermalConductivity.cpp	Refactors throw message + passes `DataContext`.
src/coreComponents/constitutive/thermalConductivity/MultiPhaseVolumeWeightedThermalConductivity.cpp	Refactors throws to avoid embedded full-name text.
src/coreComponents/constitutive/thermalConductivity/MultiPhaseThermalConductivityBase.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/thermalConductivity/MultiPhaseConstantThermalConductivity.cpp	Refactors throw message + passes `DataContext`.
src/coreComponents/constitutive/solid/PerfectlyPlastic.cpp	Adds missing `DataContext` to throw.
src/coreComponents/constitutive/solid/ModifiedCamClay.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/solid/ElasticOrthotropic.cpp	Refactors errors to pass `DataContext`.
src/coreComponents/constitutive/solid/ElasticIsotropicPressureDependent.cpp	Refactors errors/throws to pass `DataContext`.
src/coreComponents/constitutive/solid/ElasticIsotropic.cpp	Refactors errors to pass `DataContext`.
src/coreComponents/constitutive/solid/DruckerPragerExtended.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/solid/DruckerPrager.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/solid/DelftEgg.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/solid/Damage.cpp	Refactors errors to pass `DataContext`.
src/coreComponents/constitutive/solid/CoupledSolid.hpp	Refactors errors to pass `DataContext`.
src/coreComponents/constitutive/solid/CeramicDamage.cpp	Adds missing `DataContext` to throws.
src/coreComponents/constitutive/relativePermeability/VanGenuchtenStone2RelativePermeability.cpp	Refactors validation throws to pass `DataContext`.
src/coreComponents/constitutive/relativePermeability/VanGenuchtenBakerRelativePermeability.cpp	Refactors validation throws to pass `DataContext`.
src/coreComponents/constitutive/relativePermeability/TableRelativePermeabilityHelpers.cpp	Refactors validation messages/contexts.
src/coreComponents/constitutive/relativePermeability/TableRelativePermeability.cpp	Refactors throws to avoid embedded full-name text.
src/coreComponents/constitutive/relativePermeability/RelativePermeabilityBase.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/relativePermeability/BrooksCoreyStone2RelativePermeability.cpp	Refactors validation throws to pass `DataContext`.
src/coreComponents/constitutive/relativePermeability/BrooksCoreyRelativePermeability.cpp	Refactors validation throws to pass `DataContext`.
src/coreComponents/constitutive/relativePermeability/BrooksCoreyBakerRelativePermeability.cpp	Refactors validation throws to pass `DataContext`.
src/coreComponents/constitutive/permeability/PressurePermeability.cpp	Refactors error to pass `DataContext`.
src/coreComponents/constitutive/fluid/twophaseimmisciblefluid/TwoPhaseImmiscibleFluid.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/fluid/singlefluid/ThermalCompressibleSinglePhaseFluid.cpp	Refactors validation throws to pass `DataContext`.
src/coreComponents/constitutive/fluid/singlefluid/SlurryFluidBase.cpp	Refactors errors to pass `DataContext`.
src/coreComponents/constitutive/fluid/singlefluid/ProppantSlurryFluid.cpp	Refactors validation errors to pass `DataContext`.
src/coreComponents/constitutive/fluid/singlefluid/ParticleFluid.cpp	Refactors validation errors to pass `DataContext`.
src/coreComponents/constitutive/fluid/singlefluid/CompressibleSinglePhaseFluid.cpp	Refactors validation throws to pass `DataContext`.
src/coreComponents/constitutive/fluid/multifluid/reactive/ReactiveBrineFluid.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/fluid/multifluid/constant/InvariantImmiscibleFluid.cpp	Refactors throws but introduces invalid GEOS_FMT format strings.
src/coreComponents/constitutive/fluid/multifluid/compositional/parameters/PressureTemperatureCoordinates.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/fluid/multifluid/compositional/parameters/KValueFlashParameters.cpp	Adds missing `DataContext` to throws.
src/coreComponents/constitutive/fluid/multifluid/compositional/parameters/ImmiscibleWaterParameters.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/fluid/multifluid/compositional/parameters/FlashParameters.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/fluid/multifluid/compositional/parameters/EquationOfState.hpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/fluid/multifluid/compositional/parameters/CriticalVolume.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/fluid/multifluid/compositional/parameters/BrineSalinity.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/fluid/multifluid/compositional/models/ConstantViscosity.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/fluid/multifluid/compositional/CompositionalMultiphaseFluidPVTPackage.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/fluid/multifluid/compositional/CompositionalMultiphaseFluid.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/fluid/multifluid/blackOil/DeadOilFluid.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/fluid/multifluid/blackOil/BlackOilFluidBase.cpp	Refactors throws to pass wrapper `DataContext`.
src/coreComponents/constitutive/fluid/multifluid/blackOil/BlackOilFluid.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/fluid/multifluid/MultiFluidBase.cpp	Refactors validation throws to pass `DataContext`.
src/coreComponents/constitutive/dispersion/LinearIsotropicDispersion.cpp	Refactors throw message + passes `DataContext`.
src/coreComponents/constitutive/diffusion/DiffusionBase.cpp	Refactors throws to pass wrapper `DataContext`s.
src/coreComponents/constitutive/diffusion/ConstantDiffusion.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/contact/HydraulicApertureTable.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/contact/CoulombFriction.cpp	Refactors throw message formatting.
src/coreComponents/constitutive/contact/BartonBandis.cpp	Adds missing `DataContext` to throw.
src/coreComponents/constitutive/capillaryPressure/VanGenuchtenCapillaryPressure.cpp	Refactors validation throws to pass `DataContext`.
src/coreComponents/constitutive/capillaryPressure/TableCapillaryPressureHelpers.cpp	Refactors validation messages/contexts and removes unused name parameter.
src/coreComponents/constitutive/capillaryPressure/TableCapillaryPressure.cpp	Refactors throws to avoid embedded full-name text.
src/coreComponents/constitutive/capillaryPressure/JFunctionCapillaryPressure.cpp	Refactors throws to avoid embedded full-name text.
src/coreComponents/constitutive/capillaryPressure/CapillaryPressureBase.cpp	Refactors throws to pass `DataContext`.
src/coreComponents/constitutive/capillaryPressure/BrooksCoreyCapillaryPressure.cpp	Refactors validation throws to pass `DataContext`.
src/coreComponents/constitutive/ConstitutivePassThruHandler.hpp	Refactors error to pass `DataContext`.
src/coreComponents/constitutive/ConstitutivePassThru.hpp	Refactors errors to pass `DataContext`.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-11T19:26:48Z

src/coreComponents/mesh/CellElementSubRegion.cpp

      GEOS_ERROR( GEOS_FMT( "Volume calculation not supported for element type {} in subregion {}",
-                            m_elementType, getDataContext() ) );
+                            m_elementType ), getDataContext()  );
    }
  }

  GEOS_ERROR_IF( m_elementVolume[k] <= 0.0,
                 GEOS_FMT( "Negative volume for element {} type {} in subregion {}",
-                           k, m_elementType, getDataContext() ) );
+                           k, m_elementType ), getDataContext()  );


The GEOS_FMT format strings contain two/three {} placeholders but only pass one/two arguments (the subregion identifier was dropped). With fmt/std::format this will raise a format_error when the error path is hit, masking the intended diagnostic. Pass the missing subregion value (e.g., name/context string) or remove the extra {} placeholders so placeholders and arguments match.

Copilot · 2026-02-11T19:26:49Z

src/coreComponents/constitutive/fluid/multifluid/constant/InvariantImmiscibleFluid.cpp

  integer numPhase = numFluidPhases();
  // check densities and viscosities size
  GEOS_THROW_IF_NE_MSG( m_densities.size(), numPhase,
-                        GEOS_FMT( "%s: 'Densities' must have %d values", getFullName(), numPhase ), InputError );
+                        GEOS_FMT( "'Densities' must have %d values", numPhase ), InputError, getDataContext() );
  GEOS_THROW_IF_NE_MSG( m_viscosities.size(), numPhase,
-                        GEOS_FMT( "%s: 'Viscosities' must have %d values", getFullName(), numPhase ), InputError );
+                        GEOS_FMT( "'Viscosities' must have %d values", numPhase ), InputError, getDataContext() );

  integer numComponents = numFluidComponents();
  // check tacit assumption of one component per phase
  GEOS_THROW_IF_NE_MSG( numComponents, numPhase,
-                        GEOS_FMT( "%d number of components must be equato to %d number of phases", getFullName(), numPhase ), InputError );
+                        GEOS_FMT( "number of components must be equato to %d number of phases", numPhase ), InputError, getDataContext() );
 }


These GEOS_FMT strings use printf-style %d but GEOS_FMT is backed by fmt/std::format (uses {} placeholders). As written, the formatting will throw (extra argument / invalid format), so the intended InputError message may never be produced. Replace %d with {} (and consider also fixing the typo "equato" -> "equal").

Copilot · 2026-02-11T19:26:49Z

src/coreComponents/integrationTests/meshTests/testElementRegions.cpp

+      std::vector< string > strEq{
+        "***** Rank 0: No cellBlock name is satisfying the qualifier 'helloWorld'."
+        "Available cellBlock list: { 1, 2, 5, 6 }"
+        "Available region attribute list: { 1_hexahedra, 1_pyramids, 1_tetrahedra, 2_hexahedra, 2_pyramids, 2_tetrahedra, 5_hexahedra, 5_pyramids, 5_tetrahedra, 6_hexahedra, 6_pyramids, 6_tetrahedra }"
+      };
+      for( auto const & str : strEq )
      {
-        bool isExceptionContainingStr = expStr.find( str ) != string::npos;
-        EXPECT_TRUE( isExceptionContainingStr ) << GEOS_FMT( "Test case '{}' exception did not mention the string '{}'. Exception string:\n{}",
-                                                             testCase.name, str, e.what() );
+        EXPECT_TRUE( string( e.what()).find( str ) );
      }


This test will fail: (1) the first two string literals in strEq are missing a comma, so they concatenate into a single string; (2) EXPECT_TRUE(string(e.what()).find(str)) is incorrect because find returns 0 when the substring is at the beginning (evaluates to false) and it never compares against npos. Store std::string expStr = e.what(); and use EXPECT_NE(expStr.find(str), std::string::npos) with correctly separated expected substrings.

tjb-ltk · 2026-02-12T22:08:35Z

src/coreComponents/mesh/WellElementRegion.cpp

You may not have all the information needed to do the check in well generator

amandinehry added 30 commits April 25, 2025 17:05

creation of an object header that logs errors and warnings in a yaml …

c846586

…file

Set up ErrorHandling

f1713fa

traits errors commented (to treat)

4e5250f

Set up test

94b775c

Modification to properly format the yaml so that it can be parsed if …

1cb8aa3

…necessary

Test to add variadic arguments

9d5e16a

draft: retrieve data contexts info

2f7660c

Added additional information in the yaml - not functional missing the…

6036551

… link between GEOS_THROW_CTX_IF and LVARRAY_THROW_IF_TEST( EXP, MSG, TYPE )

First attempt at outputting exceptions

46b4904

Complete: code for outputting errors into yaml

e1aed93

Manage the text contained in the potential exception

bc953be

First attempt: Handling the text contained in the potential exception…

1a434bc

… in try/catch statements Problem: Retrieves everything that was thrown, so not just the message.

Complete: yaml output for PVT tables error

acf4d99

YAML error message well formatted

ee58884

Fix duplication error

32a0237

Add variadic parameters to GEOS_THROW_CTX_IF

589270f

Reorganization after operational tests

9b65581

Apply the output error functionality in yaml to all geos errors

b13f0a6

Latest update for exception handling (try/catch in main)

6de2c6a

Add priority to the error message into the yaml file

5830aee

Update of the commit named "latest update for exception handling (try…

2b27c41

…/catch in main)": remove useless try/catch

set priority

86f793e

errors cli modification: add --errors-output

8a8117e

errors cli modification: add --errors-output

2c0f5aa

Replace original macros

eb2f691

Correction: replace original macros

7b5f293

Reacting with the command line option -e / --errors-output

670ddfa

Add the rank on which the error is catch for error and warning outputs

d08a30f

Unit test to check if the contents of the yaml file match exactly wha…

5a6c1a0

…t is expected.

MelReyCG approved these changes Jan 20, 2026

View reviewed changes

dkachuma approved these changes Jan 23, 2026

View reviewed changes

paveltomin removed request for CusiniM, Guotong-Ren, matteofrigo5, paveltomin and rasimHZ January 26, 2026 16:21

Merge branch 'develop' into feat/dudes/display-dataContext

93e59db

arng40 requested a review from jafranc as a code owner January 27, 2026 09:39

arng40 and others added 6 commits January 28, 2026 10:17

Merge branch 'develop' into feat/dudes/display-dataContext

dd4f0ce

Merge branch 'develop' into feat/dudes/display-dataContext

717753a

Merge branch 'develop' into feat/dudes/display-dataContext

73b4c32

Merge branch 'develop' into feat/dudes/display-dataContext

3acf825

Merge branch 'develop' into feat/dudes/display-dataContext

4d298c3

remove remnants of debugging

6069521

OmarDuran reviewed Feb 10, 2026

View reviewed changes

delete diff.txt file

0d1a828

OmarDuran approved these changes Feb 10, 2026

View reviewed changes

Merge remote-tracking branch 'origin/develop' into feat/dudes/display…

0d73fe5

…-dataContext

jafranc approved these changes Feb 11, 2026

View reviewed changes

jhuang2601 approved these changes Feb 11, 2026

View reviewed changes

rrsettgast requested a review from Copilot February 11, 2026 19:21

Copilot started reviewing on behalf of rrsettgast February 11, 2026 19:22 View session

Copilot AI reviewed Feb 11, 2026

View reviewed changes

arng40 and others added 2 commits February 12, 2026 10:15

fix test after merge

1d04a1e

Merge branch 'develop' into feat/dudes/display-dataContext

27dc02e

tjb-ltk reviewed Feb 12, 2026

View reviewed changes

src/coreComponents/mesh/WellElementRegion.cpp

Copy link

Contributor

tjb-ltk Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may not have all the information needed to do the check in well generator

tjb-ltk approved these changes Feb 12, 2026

View reviewed changes

rrsettgast merged commit cf245f7 into develop Feb 13, 2026
21 of 22 checks passed

rrsettgast deleted the feat/dudes/display-dataContext branch February 13, 2026 00:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: Remove getDataContext duplication #3895

refactor: Remove getDataContext duplication #3895

Uh oh!

arng40 commented Oct 31, 2025 •

edited

Loading

Uh oh!

MelReyCG left a comment

Uh oh!

dkachuma left a comment

Uh oh!

OmarDuran Feb 10, 2026

Uh oh!

arng40 Feb 11, 2026

Uh oh!

OmarDuran left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Feb 11, 2026

Uh oh!

Copilot AI Feb 11, 2026

Uh oh!

Copilot AI Feb 11, 2026

Uh oh!

tjb-ltk Feb 12, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

refactor: Remove getDataContext duplication #3895

refactor: Remove getDataContext duplication #3895

Uh oh!

Conversation

arng40 commented Oct 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MelReyCG left a comment

Choose a reason for hiding this comment

Uh oh!

dkachuma left a comment

Choose a reason for hiding this comment

Uh oh!

OmarDuran Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

arng40 Feb 11, 2026

Choose a reason for hiding this comment

Uh oh!

OmarDuran left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

Uh oh!

tjb-ltk Feb 12, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

arng40 commented Oct 31, 2025 •

edited

Loading