refactor: cleanup logInfo

inputFiles/compositionalMultiphaseFlow/benchmarks/SPE11/b/include/dirichlet_boundary_vti.xml

@@ -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>

inputFiles/compositionalMultiphaseFlow/benchmarks/SPE11/b/spe11b_vti_source_base.xml

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

inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml

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

inputFiles/compositionalMultiphaseFlow/co2_flux_dirichlet.xml

@@ -125,7 +125,6 @@
       objectPath="ElementRegions/region"
       fieldName="pressure"
       initialCondition="1"
-      logLevel="2"
       scale="1.1e6" />
     <FieldSpecification
       name="initial_temperature"

inputFiles/compositionalMultiphaseFlow/deadoil_3ph_staircase_3d.xml

@@ -202,7 +202,6 @@
     <!-- Injection pressure: ~100 bar -->
     <FieldSpecification
       name="sourceTermPressure"
-      logLevel="1"
       objectPath="faceManager"
       fieldName="pressure"
       scale="1e7"
@@ -241,7 +240,6 @@
     <!-- Production pressure: ~50 bar, -->
     <FieldSpecification
       name="sinkTermPressure"
-      logLevel="1"
       objectPath="faceManager"
       fieldName="pressure"
       scale="5e6"

inputFiles/compositionalMultiphaseFlow/overallCompositionFormulation/co2_2d_plume/co2_2d_plume_Z.xml

@@ -133,7 +133,6 @@
       objectPath="ElementRegions/region"
       fieldName="pressure"
       initialCondition="1"
-      logLevel="2"
       scale="1.1e6" />
     <FieldSpecification
       name="initial_temperature"

inputFiles/inducedSeismicity/SeismicityRate_analytical_verification_smoke.xml

@@ -74,8 +74,7 @@
         fieldName="projectedShearTraction"
         scale="1.0"
         functionName="shearStress_function"
-        setNames="{ all }"
-        logLevel="0"/>
+        setNames="{ all }"/>
     </FieldSpecifications>
 
     <Functions>

inputFiles/singlePhaseFlow/compressible_2d_2fluids_hybrid.xml

@@ -170,7 +170,6 @@
 
     <FieldSpecification
       name="sourceTerm"
-      logLevel="1"	
       objectPath="faceManager"
       fieldName="pressure"
       scale="5e7"

inputFiles/singlePhaseFlow/staircase_3d.xml

@@ -135,7 +135,6 @@
 
     <FieldSpecification
       name="sourceTerm"
-      logLevel="1"	
       objectPath="faceManager"
       fieldName="pressure"
       scale="5e6"

inputFiles/thermalMultiphaseFlow/co2_thermal_2d.xml

@@ -202,7 +202,6 @@
 
     <FieldSpecification
       name="sourcePressure"
-      logLevel="1"
       setNames="{ source1, source2 }"     
       objectPath="faceManager"
       fieldName="pressure"

inputFiles/thermalSinglePhaseFlowFractures/egsCollab_thermalFlow/egsCollab_thermalFlow_initialCond_base.xml

@@ -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"

inputFiles/thermalSinglePhaseFlowFractures/egsCollab_thermalFlow/egsCollab_thermalFlow_injection_base.xml

@@ -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"

src/coreComponents/constitutive/fluid/multifluid/CO2Brine/CO2BrineFluid.cpp

@@ -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 >
@@ -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
@@ -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
@@ -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,

src/coreComponents/constitutive/fluid/multifluid/LogLevelsInfo.hpp

@@ -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

src/coreComponents/constitutive/fluid/multifluid/reactive/ReactiveBrineFluid.cpp

@@ -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 >
@@ -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

src/coreComponents/constitutiveDrivers/fluid/multiFluid/LogLevelsInfo.hpp

@@ -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

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

@@ -96,8 +96,7 @@ PVTDriver::PVTDriver( const string & name,
     setApplyDefaultValue( "none" ).
     setDescription( "Baseline file" );
 
-  addLogLevel< logInfo::Initialisation >();
-  addLogLevel< logInfo::Results >();
+  addLogLevel< logInfo::LogOutput >();
 }
 
 void PVTDriver::postInputInitialization()
@@ -212,19 +211,19 @@ bool PVTDriver::execute( real64 const GEOS_UNUSED_PARAM( time_n ),
 
   // depending on logLevel, print some useful info
 
-  GEOS_LOG_LEVEL_RANK_0( logInfo::Initialisation, "Launching PVT Driver" );
-  GEOS_LOG_LEVEL_RANK_0( logInfo::Initialisation, "  Fluid .................. " << m_fluidName );
-  GEOS_LOG_LEVEL_RANK_0( logInfo::Initialisation, "  Type ................... " << baseFluid.getCatalogName() );
-  GEOS_LOG_LEVEL_RANK_0( logInfo::Initialisation, "  No. of Phases .......... " << m_numPhases );
-  GEOS_LOG_LEVEL_RANK_0( logInfo::Initialisation, "  No. of Components ...... " << m_numComponents );
-  GEOS_LOG_LEVEL_RANK_0( logInfo::Initialisation, "  Pressure Control ....... " << m_pressureFunctionName );
-  GEOS_LOG_LEVEL_RANK_0( logInfo::Initialisation, "  Temperature Control .... " << m_temperatureFunctionName );
-  GEOS_LOG_LEVEL_RANK_0( logInfo::Initialisation, "  Steps .................. " << m_numSteps );
-  GEOS_LOG_LEVEL_RANK_0( logInfo::Initialisation, "  Output ................. " << m_outputFile );
-  GEOS_LOG_LEVEL_RANK_0( logInfo::Initialisation, "  Baseline ............... " << m_baselineFile );
-  GEOS_LOG_LEVEL_RANK_0( logInfo::Initialisation, "  Output Mass Density .... " << m_outputMassDensity );
-  GEOS_LOG_LEVEL_RANK_0( logInfo::Initialisation, "  Output Compressibility . " << m_outputCompressibility );
-  GEOS_LOG_LEVEL_RANK_0( logInfo::Initialisation, "  Output Phase Comp. ..... " << m_outputPhaseComposition );
+  GEOS_LOG_LEVEL_RANK_0( logInfo::LogOutput, "Launching PVT Driver" );
+  GEOS_LOG_LEVEL_RANK_0( logInfo::LogOutput, "  Fluid .................. " << m_fluidName );
+  GEOS_LOG_LEVEL_RANK_0( logInfo::LogOutput, "  Type ................... " << baseFluid.getCatalogName() );
+  GEOS_LOG_LEVEL_RANK_0( logInfo::LogOutput, "  No. of Phases .......... " << m_numPhases );
+  GEOS_LOG_LEVEL_RANK_0( logInfo::LogOutput, "  No. of Components ...... " << m_numComponents );
+  GEOS_LOG_LEVEL_RANK_0( logInfo::LogOutput, "  Pressure Control ....... " << m_pressureFunctionName );
+  GEOS_LOG_LEVEL_RANK_0( logInfo::LogOutput, "  Temperature Control .... " << m_temperatureFunctionName );
+  GEOS_LOG_LEVEL_RANK_0( logInfo::LogOutput, "  Steps .................. " << m_numSteps );
+  GEOS_LOG_LEVEL_RANK_0( logInfo::LogOutput, "  Output ................. " << m_outputFile );
+  GEOS_LOG_LEVEL_RANK_0( logInfo::LogOutput, "  Baseline ............... " << m_baselineFile );
+  GEOS_LOG_LEVEL_RANK_0( logInfo::LogOutput, "  Output Mass Density .... " << m_outputMassDensity );
+  GEOS_LOG_LEVEL_RANK_0( logInfo::LogOutput, "  Output Compressibility . " << m_outputCompressibility );
+  GEOS_LOG_LEVEL_RANK_0( logInfo::LogOutput, "  Output Phase Comp. ..... " << m_outputPhaseComposition );
 
   // create a dummy discretization with one quadrature point for
   // storing constitutive data
@@ -386,7 +385,7 @@ void PVTDriver::compareWithBaseline()
 
   // success
 
-  GEOS_LOG_LEVEL_RANK_0( logInfo::Results, "  Comparison ............. Internal results consistent with baseline." );
+  GEOS_LOG_LEVEL_RANK_0( logInfo::LogOutput, "  Comparison ............. Internal results consistent with baseline." );
 
   file.close();
 }