refactor: Remove getDataContext duplication

scripts/ci_build_and_test_in_container.sh

@@ -282,6 +282,7 @@ if [[ "${BUILD_EXE_ONLY}" = true ]]; then
   or_die cmake --build . -j $NPROC --target geosx
 else
   or_die cmake --build . -j $NPROC
+  # TODO: for the moment, installation is disabled to save some space on the runner, but must be re-enabled in the future.
   #or_die cmake --install .
 
   if [[ ! -z "${DATA_BASENAME_WE}" ]]; then

src/coreComponents/constitutive/contact/HydraulicApertureTable.cpp

@@ -120,7 +120,7 @@ void HydraulicApertureTable::validateApertureTable( TableFunction const & apertu
 
   GEOS_THROW_IF( coords.size() == 0,
                  getFullName() << ": Empty aperture table.",
-                 InputError );
+                 InputError,getDataContext() );
 
   GEOS_THROW_IF( coords.size() > 1,
                  getFullName() << ": Aperture limiter table cannot be greater than a 1D table.",

src/coreComponents/constitutive/fluid/singlefluid/ParticleFluid.cpp

@@ -83,33 +83,27 @@ void ParticleFluid::postInputInitialization()
   ParticleFluidBase::postInputInitialization();
 
   GEOS_ERROR_IF( m_proppantDensity < 500.0,
-                 "Invalid proppantDensity in ParticleFluid "
-                 << getDataContext() << ", which must >= 500.0 ",
+                 "Invalid proppantDensity in ParticleFluid which must >= 500.0 ",
                  getDataContext() );
 
   GEOS_ERROR_IF( m_proppantDiameter < 10e-6,
-                 "Invalid proppantDiameter in ParticleFluid "
-                 << getDataContext() << ", which must >= 10e-6 ",
+                 "Invalid proppantDiameter in ParticleFluid, which must >= 10e-6 ",
                  getDataContext() );
 
   GEOS_ERROR_IF( m_hinderedSettlingCoefficient< 0.0 || m_hinderedSettlingCoefficient > 10.0,
-                 "Invalid hinderedSettlingCoefficient in ParticleFluid "
-                 << getDataContext() << ", which must between 0 and 10 ",
+                 "Invalid hinderedSettlingCoefficient in ParticleFluid, which must between 0 and 10 ",
                  getDataContext() );
 
   GEOS_ERROR_IF( m_collisionAlpha < 1.0,
-                 "Invalid collisionAlpha in ParticleFluid "
-                 << getDataContext() << ", which must >= 1 ",
+                 "Invalid collisionAlpha in ParticleFluid , which must >= 1 ",
                  getDataContext() );
 
   GEOS_ERROR_IF( m_collisionBeta < 0.0,
-                 "Invalid collisionBeta in ParticleFluid "
-                 << getDataContext() << ", which must >= 0",
+                 "Invalid collisionBeta in ParticleFluid , which must >= 0",
                  getDataContext() );
 
   GEOS_ERROR_IF( m_slipConcentration > 0.3,
-                 "Invalid slipConcentration in ParticleFluid "
-                 << getDataContext() << ", which must <= 0.3",
+                 "Invalid slipConcentration in ParticleFluid, which must <= 0.3",
                  getDataContext() );
 
   m_packPermeabilityCoef = pow( m_sphericity * m_proppantDiameter, 2.0 ) / 180.0;

src/coreComponents/constitutive/permeability/PressurePermeability.cpp

@@ -65,7 +65,7 @@ void PressurePermeability::postInputInitialization()
   for( localIndex i=0; i < 3; i++ )
   {
     GEOS_ERROR_IF( std::abs( m_pressureDependenceConstants[i] ) < 1e-15 && m_presModelType == PressureModelType::Hyperbolic,
-                   getDataContext() << ": the pressure dependent constant at component " << i << " is too close to zero, which is not allowed for the hyperbolic model.",
+                   "The pressure dependent constant at component " << i << " is too close to zero, which is not allowed for the hyperbolic model.",
                    getDataContext() );
   }
 }

src/coreComponents/constitutive/relativePermeability/TableRelativePermeabilityHelpers.cpp

@@ -37,17 +37,14 @@ TableRelativePermeabilityHelpers::validateRelativePermeabilityTable( TableFuncti
   ArrayOfArraysView< real64 const > coords = relPermTable.getCoordinates();
 
   GEOS_THROW_IF_NE_MSG( relPermTable.getInterpolationMethod(), TableFunction::InterpolationType::Linear,
-                        GEOS_FMT( "{}: TableFunction '{}' interpolation method must be linear",
-                                  fullConstitutiveName, relPermTable.getDataContext() ),
-                        InputError );
+                        GEOS_FMT( "{}: TableFunction interpolation method must be linear", fullConstitutiveName ),
+                        InputError, relPermTable.getDataContext() );
   GEOS_THROW_IF_NE_MSG( relPermTable.numDimensions(), 1,
-                        GEOS_FMT( "{}: TableFunction '{}' must have a single independent coordinate",
-                                  fullConstitutiveName, relPermTable.getDataContext() ),
-                        InputError );
+                        GEOS_FMT( "{}: TableFunction must have a single independent coordinate", fullConstitutiveName ),
+                        InputError, relPermTable.getDataContext() );
   GEOS_THROW_IF_LT_MSG( coords.sizeOfArray( 0 ), 2,
-                        GEOS_FMT( "{}: TableFunction `{}` must contain at least two values",
-                                  fullConstitutiveName, relPermTable.getDataContext() ),
-                        InputError );
+                        GEOS_FMT( "{}: TableFunction must contain at least two values", fullConstitutiveName ),
+                        InputError, relPermTable.getDataContext() );
 
   arraySlice1d< real64 const > phaseVolFrac = coords[0];
   arrayView1d< real64 const > const relPerm = relPermTable.getValues();
@@ -59,23 +56,21 @@ TableRelativePermeabilityHelpers::validateRelativePermeabilityTable( TableFuncti
 
   // note that the TableFunction class has already checked that coords.sizeOfArray( 0 ) == relPerm.size()
   GEOS_THROW_IF( !isZero( relPerm[0] ),
-                 GEOS_FMT( "{}: TableFunction '{}' first value must be equal to 0",
-                           fullConstitutiveName, relPermTable.getDataContext() ),
+                 GEOS_FMT( "{}: TableFunction first value must be equal to 0", fullConstitutiveName ),
                  InputError, relPermTable.getDataContext() );
   for( localIndex i = 1; i < coords.sizeOfArray( 0 ); ++i )
   {
     // check phase volume fraction
     GEOS_THROW_IF( phaseVolFrac[i] < 0 || phaseVolFrac[i] > 1,
-                   GEOS_FMT( "{}: TableFunction '{}' values must be between 0 and 1",
-                             fullConstitutiveName, relPermTable.getDataContext() ),
+                   GEOS_FMT( "{}: TableFunction values must be between 0 and 1", fullConstitutiveName ),
                    InputError, relPermTable.getDataContext() );
 
     // note that the TableFunction class has already checked that the coordinates are monotone
 
     // check phase relative permeability
     GEOS_THROW_IF( !isZero( relPerm[i] ) && (relPerm[i] - relPerm[i-1]) < 1e-15,
-                   GEOS_FMT( "{}: TableFunction '{}' values must be strictly increasing (|Delta kr| > 1e-15 between two non-zero values)",
-                             fullConstitutiveName, relPermTable.getDataContext() ),
+                   GEOS_FMT( "{}: TableFunction values must be strictly increasing (|Delta kr| > 1e-15 between two non-zero values)",
+                             fullConstitutiveName ),
                    InputError, relPermTable.getDataContext() );
 
     if( isZero( relPerm[i-1] ) && !isZero( relPerm[i] ) )

src/coreComponents/constitutive/solid/Damage.cpp

@@ -100,20 +100,20 @@ void Damage< BASE >::postInputInitialization()
   BASE::postInputInitialization();
 
   GEOS_ERROR_IF( m_extDrivingForceFlag != 0 && m_extDrivingForceFlag!= 1,
-                 this->getDataContext() << ": invalid external driving force flag option - must"
-                                           " be 0 or 1",
+                 "invalid external driving force flag option - must"
+                 " be 0 or 1",
                  this->getDataContext() );
   GEOS_ERROR_IF( m_extDrivingForceFlag == 1 && m_defaultTensileStrength <= 0.0,
-                 this->getDataContext() << ": tensile strength must be input and positive when the"
-                                           " external driving force flag is turned on",
+                 "tensile strength must be input and positive when the"
+                 " external driving force flag is turned on",
                  this->getDataContext()  );
   GEOS_ERROR_IF( m_extDrivingForceFlag == 1 && m_defaultCompressiveStrength  <= 0.0,
-                 this->getDataContext() << ": compressive strength must be input and positive when the"
-                                           " external driving force flag is turned on",
+                 "compressive strength must be input and positive when the"
+                 " external driving force flag is turned on",
                  this->getDataContext()  );
   GEOS_ERROR_IF( m_extDrivingForceFlag == 1 && m_defaultDeltaCoefficient < 0.0,
-                 this->getDataContext() << ": delta coefficient must be input and non-negative when the"
-                                           " external driving force flag is turned on",
+                 "delta coefficient must be input and non-negative when the"
+                 " external driving force flag is turned on",
                  this->getDataContext()  );
 
   // set results as array default values

src/coreComponents/constitutiveDrivers/fluid/multiFluid/PVTDriver.cpp

@@ -103,18 +103,18 @@ void PVTDriver::postInputInitialization()
 {
   // Validate some inputs
   GEOS_ERROR_IF( m_outputMassDensity != 0 && m_outputMassDensity != 1,
-                 getWrapperDataContext( viewKeyStruct::outputMassDensityString() ) <<
-                 ": option can be either 0 (false) or 1 (true)",
+                 viewKeyStruct::outputMassDensityString() <<
+                 "option can be either 0 (false) or 1 (true)",
                  getWrapperDataContext( viewKeyStruct::outputMassDensityString() ) );
 
   GEOS_ERROR_IF( m_outputCompressibility != 0 && m_outputCompressibility != 1,
-                 getWrapperDataContext( viewKeyStruct::outputCompressibilityString() ) <<
-                 ": option can be either 0 (false) or 1 (true)",
+                 viewKeyStruct::outputCompressibilityString() <<
+                 "option can be either 0 (false) or 1 (true)",
                  getWrapperDataContext( viewKeyStruct::outputCompressibilityString() ) );
 
   GEOS_ERROR_IF( m_outputPhaseComposition != 0 && m_outputPhaseComposition != 1,
-                 getWrapperDataContext( viewKeyStruct::outputPhaseCompositionString() ) <<
-                 ": option can be either 0 (false) or 1 (true)",
+                 viewKeyStruct::outputPhaseCompositionString() <<
+                 "option can be either 0 (false) or 1 (true)",
                  getWrapperDataContext( viewKeyStruct::outputPhaseCompositionString() ) );
 
   GEOS_WARNING_IF( m_precision < minPrecision,

src/coreComponents/constitutiveDrivers/solid/TriaxialDriver.cpp

@@ -151,11 +151,11 @@ void TriaxialDriver::postInputInitialization()
   // may overwrite it.
 
   GEOS_THROW_IF( !isEqual( m_initialStress, m_table( 0, SIG0 ), 1e-6 ),
-                 getDataContext() << ": Initial stress values indicated by initialStress and axialFunction(time=0) appear inconsistent",
+                 "Initial stress values indicated by initialStress and axialFunction(time=0) appear inconsistent",
                  InputError, getDataContext() );
 
   GEOS_THROW_IF( !isEqual( m_initialStress, m_table( 0, SIG1 ), 1e-6 ),
-                 getDataContext() << ": Initial stress values indicated by initialStress and radialFunction(time=0) appear inconsistent",
+                 "Initial stress values indicated by initialStress and radialFunction(time=0) appear inconsistent",
                  InputError, getDataContext() );
 }
 

src/coreComponents/dataRepository/Group.cpp

@@ -77,7 +77,7 @@ WrapperBase & Group::registerWrapper( std::unique_ptr< WrapperBase > wrapper )
 void Group::deregisterWrapper( string const & name )
 {
   GEOS_ERROR_IF( !hasWrapper( name ),
-                 "Wrapper " << name << " doesn't exist in Group" << getDataContext() << '.',
+                 "Wrapper " << name << " doesn't exist in Group.",
                  getDataContext() );
   m_wrappers.erase( name );
   m_conduitNode.remove( name );
@@ -250,8 +250,7 @@ void Group::processInputFile( xmlWrapper::xmlNode const & targetNode,
                      GEOS_FMT( "Error in {}: XML Node at '{}' contains unused attribute '{}'.\n"
                                "Valid attributes are:\n{}\nFor more details, please refer to documentation at:\n"
                                "http://geosx-geosx.readthedocs-hosted.com/en/latest/docs/sphinx/userGuide/Index.html",
-                               getDataContext(), targetNode.path(), attributeName,
-                               dumpInputOptions() ),
+                               targetNode.path(), attributeName, dumpInputOptions() ),
                      InputError, getDataContext() );
     }
   }

src/coreComponents/events/PeriodicEvent.cpp

@@ -270,18 +270,16 @@ void PeriodicEvent::validate() const
   constexpr auto determinesTimeStepSize = ExecutableGroup::TimesteppingBehavior::DeterminesTimeStepSize;
 
   GEOS_THROW_IF( m_timeFrequency > 0 && target->getTimesteppingBehavior() == determinesTimeStepSize,
-                 GEOS_FMT( "`{}`: This event targets an object that automatically selects the time "
+                 GEOS_FMT( "This event targets an object that automatically selects the time "
                            "step size. Therefore, `{}` cannot be used here. However, forcing a "
                            "constant time step size can still be achived with `{}`.",
-                           getDataContext(), viewKeyStruct::timeFrequencyString(),
-                           EventBase::viewKeyStruct::forceDtString() ),
+                           viewKeyStruct::timeFrequencyString(), EventBase::viewKeyStruct::forceDtString() ),
                  InputError, getDataContext() );
   GEOS_THROW_IF( m_cycleFrequency != 1 && target->getTimesteppingBehavior() == determinesTimeStepSize,
-                 GEOS_FMT( "`{}`: This event targets an object that automatically selects the time "
+                 GEOS_FMT( "This event targets an object that automatically selects the time "
                            "step size. Therefore, `{}` cannot be used here. However, forcing a "
                            "constant time step size can still be achived with `{}`.",
-                           getDataContext(), viewKeyStruct::cycleFrequencyString(),
-                           EventBase::viewKeyStruct::forceDtString() ),
+                           viewKeyStruct::cycleFrequencyString(), EventBase::viewKeyStruct::forceDtString() ),
                  InputError, getDataContext() );
 }
 

src/coreComponents/fieldSpecification/AquiferBoundaryCondition.cpp

@@ -115,9 +115,8 @@ AquiferBoundaryCondition::AquiferBoundaryCondition( string const & name, Group *
 void AquiferBoundaryCondition::postInputInitialization()
 {
   GEOS_THROW_IF_LE_MSG( m_permeability, 0.0,
-                        getCatalogName() << " " << getDataContext() <<
-                        ": the aquifer permeability cannot be equal to zero or negative",
-                        InputError );
+                        getCatalogName() << ": the aquifer permeability cannot be equal to zero or negative",
+                        InputError, getDataContext() );
 
   if( m_pressureInfluenceFunctionName.empty() )
   {
@@ -127,37 +126,34 @@ void AquiferBoundaryCondition::postInputInitialization()
   {
     FunctionManager const & functionManager = FunctionManager::getInstance();
     GEOS_THROW_IF( !functionManager.hasGroup( m_pressureInfluenceFunctionName ),
-                   getCatalogName() << " " << getDataContext() <<
-                   ": the pressure influence table " << m_pressureInfluenceFunctionName << " could not be found",
+                   getCatalogName() << " : the pressure influence table " << m_pressureInfluenceFunctionName << " could not be found",
                    InputError, getDataContext() );
 
     TableFunction const & pressureInfluenceFunction = functionManager.getGroup< TableFunction >( m_pressureInfluenceFunctionName );
     GEOS_THROW_IF( pressureInfluenceFunction.getInterpolationMethod() != TableFunction::InterpolationType::Linear,
-                   getCatalogName() << " " << getDataContext() <<
-                   ": The interpolation method for the pressure influence function table " <<
-                   pressureInfluenceFunction.getDataContext() <<
+                   getCatalogName() << " : The interpolation method for the pressure influence function table " <<
                    " should be TableFunction::InterpolationType::Linear",
-                   InputError, getDataContext() );
+                   InputError, pressureInfluenceFunction.getDataContext(), getDataContext() );
   }
 
   computeTimeConstant();
   computeInfluxConstant();
 
   GEOS_THROW_IF_LE_MSG( m_timeConstant, 0.0,
-                        getCatalogName() << " " << getDataContext() <<
-                        ": the aquifer time constant is equal to zero or negative, the simulation cannot procede",
-                        InputError );
+                        getCatalogName() <<
+                        " : the aquifer time constant is equal to zero or negative, the simulation cannot procede",
+                        InputError, getDataContext() );
 
   GEOS_THROW_IF_LE_MSG( m_influxConstant, 0.0,
-                        getCatalogName() << " " << getDataContext() <<
-                        ": the aquifer influx constant is equal to zero or negative, the simulation cannot procede",
-                        InputError );
+                        getCatalogName() <<
+                        " : the aquifer influx constant is equal to zero or negative, the simulation cannot procede",
+                        InputError, getDataContext() );
 
   GEOS_THROW_IF_NE_MSG( m_phaseComponentFraction.size(), LvArray::integerConversion< int >( m_phaseComponentNames.size() ),
-                        getCatalogName() << " " << getDataContext() <<
-                        ": the sizes of " << viewKeyStruct::aquiferWaterPhaseComponentFractionString() <<
+                        getCatalogName() <<
+                        " : the sizes of " << viewKeyStruct::aquiferWaterPhaseComponentFractionString() <<
                         " and " << viewKeyStruct::aquiferWaterPhaseComponentNamesString() << " are inconsistent",
-                        InputError );
+                        InputError, getDataContext() );
 
 }