Merge branch 'develop' into feature/han12/pygeosx_docker

Author: bmhan12

.integrated_tests.yaml

@@ -1,6 +1,6 @@
 baselines:
   bucket: geosx
-  baseline: integratedTests/baseline_integratedTests-pr3653-11335-b8096ce
+  baseline: integratedTests/baseline_integratedTests-pr3679-11653-e066fbb
 
 allow_fail:
   all: ''

BASELINE_NOTES.md

@@ -6,6 +6,10 @@ 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 #3679 (2025-05-27) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3679-11653-e066fbb.tar.gz>
+=====================
+Removed `maxStableDt` and `registerWrapper` for `meshTargets`.
+
 PR #3653 (2025-05-13) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3653-11335-b8096ce.tar.gz>
 =====================
 Change black oil phase labelling for gas only cells.

inputFiles/compositionalMultiphaseWell/simpleCo2InjTutorial_base.xml

@@ -97,7 +97,7 @@
 
     <PressurePorosity
       name="rockPorosity"
-      defaultReferencePorosity="0.1"
+      defaultReferencePorosity="0.05"
       referencePressure="1.0e7"
       compressibility="4.5e-10"/>
 
@@ -144,7 +144,7 @@
       setNames="{ all }"
       objectPath="ElementRegions/reservoir"
       fieldName="rockPerm_permeability"
-      scale="3e-15"
+      scale="1.5e-15"
       functionName="permzFunc"/>
 
     <FieldSpecification

src/coreComponents/common/CMakeLists.txt

@@ -29,6 +29,7 @@ set( common_headers
      format/table/TableFormatter.hpp
      format/table/TableData.hpp
      format/EnumStrings.hpp
+     format/LogPart.hpp
      format/Format.hpp
      format/StringUtilities.hpp
      logger/Logger.hpp
@@ -72,6 +73,7 @@ set( common_sources
      format/table/TableLayout.cpp
      format/table/TableFormatter.cpp
      format/table/TableData.cpp
+     format/LogPart.cpp
      format/StringUtilities.cpp
      logger/Logger.cpp
      BufferAllocator.cpp
@@ -153,6 +155,6 @@ install( TARGETS common LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
 
 if( GEOS_ENABLE_TESTS )
   add_subdirectory( unitTests )
-  add_subdirectory( format/table/unitTests )
   add_subdirectory( format/unitTests )
+  add_subdirectory( format/table/unitTests )
 endif()

src/coreComponents/common/format/LogPart.cpp

@@ -0,0 +1,224 @@
+/*
+ * ------------------------------------------------------------------------------------------------------------
+ * SPDX-License-Identifier: LGPL-2.1-only
+ *
+ * Copyright (c) 2018-2020 Lawrence Livermore National Security LLC
+ * Copyright (c) 2018-2020 The Board of Trustees of the Leland Stanford Junior University
+ * Copyright (c) 2018-2020 TotalEnergies
+ * Copyright (c) 2019-     GEOSX Contributors
+ * All rights reserved
+ *
+ * See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details.
+ * ------------------------------------------------------------------------------------------------------------
+ */
+
+/**
+ * @file LogPart.cpp
+ */
+
+#include "LogPart.hpp"
+#include "common/format/StringUtilities.hpp"
+#include <algorithm>
+
+using namespace geos::stringutilities;
+namespace geos
+{
+
+LogPart::LogPart( string_view logPartTitle, bool enableOutput )
+{
+  m_formattedStartDescription.m_title = logPartTitle;
+  m_formattedEndDescription.m_title = GEOS_FMT( "{}{}", m_prefixEndTitle, logPartTitle );
+
+  m_enableOutput = enableOutput;
+}
+
+void LogPart::addDescription( string_view description )
+{
+  size_t compareWidth = m_width;
+  m_startDescription.m_names.push_back( stringutilities::divideLines< string >( compareWidth, description ) );
+  m_startDescription.m_values.push_back( std::vector< string >() );
+}
+
+void LogPart::addEndDescription( string_view description )
+{
+  size_t compareWidth = m_width;
+  m_endDescription.m_names.push_back( stringutilities::divideLines< string >( compareWidth, description ) );
+  m_endDescription.m_values.push_back( std::vector< string >() );
+
+}
+
+
+void LogPart::setMinWidth( size_t const & minWidth )
+{
+  m_minWidth = minWidth;
+}
+
+void LogPart::setMaxWidth( size_t const & maxWidth )
+{
+  m_maxWidth = maxWidth;
+}
+
+
+double clamp( double v, double min, double max )
+{
+  return std::min( max, std::max( min, v ));
+}
+
+void LogPart::formatDescriptions( LogPart::Description & description,
+                                  FormattedDescription & formattedDescription )
+{
+  std::vector< string > & formattedLines = formattedDescription.m_lines;
+  size_t const borderSpaceWidth = m_nbBorderChar * 2 + m_borderMargin * 2;
+
+  size_t const formattingCharSize = borderSpaceWidth;
+  size_t & maxNameSize = formattedDescription.m_maxNameWidth;
+  size_t & maxValueSize = formattedDescription.m_maxValueWidth;
+
+  formattedLines.reserve( description.m_names.size() * 2 );
+
+  /// clamp
+  m_width = std::min( m_maxWidth, std::max( m_minWidth, m_width ));
+
+  for( size_t idxName = 0; idxName < description.m_names.size(); idxName++ )
+  {
+    auto const & nonFormattedNames =  description.m_names[idxName];
+    auto const & nonFormattedValues =  description.m_values[idxName];
+
+    // Format name with no values associated
+    if( nonFormattedValues.empty())
+    {
+      size_t maxLineLength = m_width - borderSpaceWidth;
+      auto wrappedNames = stringutilities::wrapTextToMaxLength( nonFormattedNames, maxLineLength );
+
+      for( auto & name : wrappedNames )
+      {
+        auto const currMaxNameSize = std::max( name.size(), maxNameSize );
+        if( currMaxNameSize + formattingCharSize < m_width )
+        {
+          // append space at the end of name if needed
+          name.reserve( m_width - borderSpaceWidth );
+          name.append( std::string( m_width - currMaxNameSize - formattingCharSize, ' ' ));
+        }
+        formattedLines.push_back( name );
+      }
+      continue;
+    }
+
+    // Format name with values assiociated
+    size_t maxLineLength = m_width - maxNameSize - formattingCharSize - m_delimiter.size();
+    auto wrappedValues = stringutilities::wrapTextToMaxLength( nonFormattedValues, maxLineLength );
+
+    // format name
+    std::vector< string > formatNames {nonFormattedNames};
+    for( size_t idxSubName = 0; idxSubName < formatNames.size(); idxSubName++ )
+    {
+      size_t const spaces = idxSubName < wrappedValues.size() ?
+                            maxNameSize  - formatNames[idxSubName].size() :
+                            m_width - formatNames[idxSubName].size() - formattingCharSize;
+      // append space at the end of name if needed
+      formatNames[idxSubName].reserve( formatNames[idxSubName].size() + spaces );
+      formatNames[idxSubName].append( spaces, ' ' );
+    }
+
+    size_t const lineCount = std::max( formatNames.size(), wrappedValues.size());
+
+    // format values
+    size_t const minValueSizeRequired = m_width - maxNameSize - formattingCharSize - m_delimiter.size();
+    for( auto & wrappedValue : wrappedValues )
+    {
+      wrappedValue.reserve( minValueSizeRequired );
+      wrappedValue.append( minValueSizeRequired - wrappedValue.size(), ' ' );
+    }
+    maxValueSize = std::max( maxValueSize,
+                             (std::max_element( wrappedValues.begin(), wrappedValues.end() ))->size() );
+
+    // add the first line
+    string firstLine;
+    firstLine.reserve( formatNames.front().size() + m_delimiter.size() + wrappedValues.front().size());
+    firstLine.append( formatNames.front()).append( m_delimiter ).append( wrappedValues.front());
+    formattedLines.push_back( firstLine );
+
+    // combination name + value
+    for( size_t idxLine = 1; idxLine < lineCount; ++idxLine )
+    {
+      if( idxLine < formatNames.size() && idxLine < wrappedValues.size())
+      { // name + value
+        formattedLines.push_back( GEOS_FMT( "{}{}{}", formatNames[idxLine], m_delimiter, wrappedValues[idxLine] ));
+      }
+      else if( idxLine < formatNames.size())
+      { // subnames remaining
+        formattedLines.push_back( formatNames[idxLine] );
+      }
+      else if( idxLine < wrappedValues.size())
+      { // subvalues remaining
+        size_t const spaceAvailable = maxNameSize + wrappedValues[idxLine].size() + m_delimiter.size();
+        formattedLines.push_back( GEOS_FMT( "{:>{}}", wrappedValues[idxLine], spaceAvailable ));
+      }
+    }
+  }
+}
+
+string LogPart::outputDescription( FormattedDescription & formattedDescription )
+{
+  std::ostringstream oss;
+  string const borderCharacters = string( m_nbBorderChar, m_borderCharacter );
+  string const borderSpaces = string( m_borderMargin, ' ' );
+
+  for( auto const & line : formattedDescription.m_lines )
+  {
+    oss << borderCharacters;
+    oss << borderSpaces << line <<  borderSpaces;
+    oss << borderCharacters << '\n';
+  }
+  return oss.str();
+}
+
+string LogPart::outputTitle( LogPart::FormattedDescription & formattedDescription )
+{
+  size_t const titleRowLength =  m_width;
+  string const borderCharacters =  string( m_nbBorderChar, m_borderCharacter );
+
+  return GEOS_FMT( "\n{}{:^{}}{}\n",
+                   borderCharacters,
+                   formattedDescription.m_title,
+                   titleRowLength  - 4,
+                   borderCharacters );
+}
+
+void LogPart::begin( std::ostream & os )
+{
+  if( !m_enableOutput )
+    return;
+
+
+  if( !m_startDescription.m_names.empty())
+  {
+    formatDescriptions( m_startDescription, m_formattedStartDescription );
+  }
+
+  string const line = string( m_width, m_borderCharacter );
+  os << '\n' << line;
+  os << outputTitle( m_formattedStartDescription );
+  os << line << '\n';
+  os << outputDescription( m_formattedStartDescription ) << '\n';
+}
+
+void LogPart::end( std::ostream & os )
+{
+  if( !m_enableOutput )
+    return;
+
+  formatDescriptions( m_endDescription, m_formattedEndDescription );
+
+  string const line =  string( m_width, m_borderCharacter );
+  if( !m_endDescription.m_names.empty() )
+  {
+    os << '\n';
+    os << outputDescription( m_formattedEndDescription );
+    os << line;
+  }
+  os << outputTitle( m_formattedEndDescription );
+  os << line << "\n\n";
+}
+
+}