set a flag from surfaceGenrator to fs

src/coreComponents/dataRepository/Group.cpp

@@ -408,7 +408,6 @@ void Group::initializePostInitialConditions()
 
   for( auto const & groupName : initOrder )
   {
-    std::cout << "groupName: "<< groupName << std::endl;
     getGroup( groupName ).initializePostInitialConditions();
   }
 

src/coreComponents/fieldSpecification/FieldSpecificationBase.cpp

@@ -82,10 +82,14 @@ FieldSpecificationBase::FieldSpecificationBase( string const & name, Group * par
     setInputFlag( InputFlags::OPTIONAL ).
     setDescription( "Time at which the boundary condition will stop being applied." );
 
-  registerWrapper( viewKeyStruct::errorAsWarningString(), &m_errorAsWarning ).
-    setApplyDefaultValue( 1 ).
+  registerWrapper( viewKeyStruct::emptySetErrorModeString(), &m_emptySetErrorMode ).
+    setApplyDefaultValue( setErrorMode::Error ).
     setInputFlag( InputFlags::OPTIONAL ).
-    setDescription( "Converts an error into a warning" );
+    setDescription( "Set the log state when we a “set” does not target any region\n"
+                    "When set to 0, no output\n"
+                    "When set to 1, output an error\n"
+                    "When set to 2, output a throw\n" );
+
 }
 
 

src/coreComponents/fieldSpecification/FieldSpecificationBase.hpp

@@ -108,6 +108,8 @@ class FieldSpecificationBase : public dataRepository::Group
   /// deleted move assignement
   FieldSpecificationBase & operator=( FieldSpecificationBase && ) = delete;
 
+  enum setErrorMode : integer { Silent = 0, Error = 1, SurfaceGeneratorWarning = 2 };
+
   /**
    * @brief Apply this field specification to the discretization
    *
@@ -393,7 +395,7 @@ class FieldSpecificationBase : public dataRepository::Group
     /// @return The key for endTime
     constexpr static char const * endTimeString() { return "endTime"; }
     /// @return The key errorAsWarning
-    constexpr static char const * errorAsWarningString() { return "errorAsWarning"; }
+    constexpr static char const * emptySetErrorModeString() { return "errorAsWarning"; }
   };
 
   /**
@@ -554,7 +556,7 @@ class FieldSpecificationBase : public dataRepository::Group
  */
   integer getErrorAsWarning() const
   {
-    return m_errorAsWarning;
+    return m_emptySetErrorMode;
   }
 
 
@@ -602,7 +604,7 @@ class FieldSpecificationBase : public dataRepository::Group
   string m_bcApplicationFunctionName;
 
   /// Value indicating whether we converts an error into a warning
-  integer m_errorAsWarning;
+  integer m_emptySetErrorMode;
 };
 
 

src/coreComponents/fieldSpecification/FieldSpecificationManager.cpp

@@ -250,19 +250,21 @@ void FieldSpecificationManager::validateBoundaryConditions( MeshLevel & mesh ) c
           {
             std::ostringstream message;
             message << GEOS_FMT( "{}: this FieldSpecification targets (an) empty set(s)\n"
-                                 "The box {}  does not select any region.\n"
-                                 "If the simulation does not involve the SurfaceGenerator, check the content of the set `{}` in `{}`.\n",
-                                 fs.getDataContext(), object.getDataContext(),
-                                 mapEntry.first, fs.getObjectPath());
-            if( fs.getErrorAsWarning() )
+                                 "The box {}  does not select any region.\n",
+                                 fs.getDataContext(), object.getDataContext());
+            Wrapper< integer > const & wrapper = fs.getWrapper< integer >( FieldSpecificationBase::viewKeyStruct::emptySetErrorModeString());
+            switch( wrapper.getDefaultValue() )
             {
-              message << GEOS_FMT( "You can set `errorAsWarning` to `0` in {} to disable the error.",
-                                   fs.getDataContext() );
-              GEOS_ERROR( message.str() );
-            }
-            else
-            {
-              GEOS_WARNING( message.str() );
+              case  FieldSpecificationBase::setErrorMode::Silent:
+                break;
+              case  FieldSpecificationBase::setErrorMode::Error:
+                GEOS_ERROR( message.str()  );
+                break;
+              case  FieldSpecificationBase::setErrorMode::SurfaceGeneratorWarning:
+                message << GEOS_FMT( "As the simulation includes a SurfaceGenerator, the set may be modified later",
+                                     fs.getDataContext() );
+                GEOS_WARNING( message.str() );
+                break;
             }
           }
         } );

src/coreComponents/physicsSolvers/surfaceGeneration/SurfaceGenerator.cpp

@@ -22,14 +22,12 @@
 #include "mesh/mpiCommunications/CommunicationTools.hpp"
 #include "mesh/mpiCommunications/NeighborCommunicator.hpp"
 #include "mesh/mpiCommunications/SpatialPartition.hpp"
+#include "fieldSpecification/FieldSpecificationManager.hpp"
 #include "finiteElement/FiniteElementDiscretization.hpp"
 #include "finiteVolume/FiniteVolumeManager.hpp"
 #include "finiteVolume/FluxApproximationBase.hpp"
 #include "mesh/SurfaceElementRegion.hpp"
 #include "mesh/utilities/ComputationalGeometry.hpp"
-#include "mesh/ObjectManagerBase.hpp"
-#include "mesh/MeshManager.hpp"
-#include "mesh/generators/VTKMeshGenerator.hpp"
 #include "physicsSolvers/solidMechanics/SolidMechanicsFields.hpp"
 #include "physicsSolvers/solidMechanics/SolidMechanicsLagrangianFEM.hpp"
 #include "physicsSolvers/solidMechanics/kernels/SolidMechanicsLagrangianFEMKernels.hpp"
@@ -205,21 +203,6 @@ void SurfaceGenerator::postInputInitialization()
   GEOS_ERROR_IF( binaryOptions.count( m_mpiCommOrder ) == 0,
                  getWrapperDataContext( viewKeyStruct::mpiCommOrderString() ) <<
                  ": option can be either 0 (false) or 1 (true)" );
-
-  DomainPartition & domain = this->getGroupByPath< DomainPartition >( "/Problem/domain" );                 //this->getGroupByPath<DomainPartition>("/Problem/domain");
-  forDiscretizationOnMeshTargets( domain.getMeshBodies(), [&] ( string const &,
-                                                                MeshLevel & meshLevel,
-                                                                string_array const & )
-  {
-    NodeManager & nodeManager = meshLevel.getNodeManager();
-    std::cout << "postInputInitialization "<< nodeManager.getName() << std::endl;
-    nodeManager.sets().forWrappers< SortedArray< localIndex > >( [&] ( auto & wrapper )
-    {
-      std::cout << wrapper.getName() << ": "<< wrapper.size()<< std::endl;
-    } );
-
-  } );
-
 }
 
 SurfaceGenerator::~SurfaceGenerator()
@@ -294,38 +277,13 @@ void SurfaceGenerator::registerDataOnMesh( Group & meshBodies )
     // TODO: handle this automatically in registerField()
     faceManager.getField< surfaceGeneration::K_IC >().resizeDimension< 1 >( 3 );
 
-    std::cout << "registerDataOnMesh "<< nodeManager.getName() << std::endl;
-
     Group & problemManager = this->getGroupByPath( "/Problem" );
-    MeshManager & meshManager = problemManager.getGroup< MeshManager >( "Mesh" );
-    bool useExternalSet = false;
-    meshManager.forSubGroups( [&]( Group & subGroup )
+    FieldSpecificationManager & fsm =  problemManager.getGroup< FieldSpecificationManager >( "FieldSpecifications" );
+    fsm.forSubGroups< FieldSpecificationBase >( [&] ( FieldSpecificationBase & fs )
     {
-      if( dynamic_cast< VTKMeshGenerator * >(&subGroup) != nullptr )
-      {
-        useExternalSet = true;
-      }
+      fs.getWrapper< integer >( FieldSpecificationBase::viewKeyStruct::emptySetErrorModeString())
+        .setDefaultValue( FieldSpecificationBase::setErrorMode::SurfaceGeneratorWarning );
     } );
-
-    auto checkSetsObjManager = [&]<typename T>(T obj/*, type qqch ici*/)
-    {
-      obj.sets().forWrappers< SortedArray< localIndex > >( [&] ( auto & wrapper )
-      {
-        std::cout << wrapper.getName() << ": "<< wrapper.size()<< std::endl;
-        if( wrapper.size() == 0 )
-        {
-          if( wrapper.getName() == ObjectManagerBase::viewKeyStruct::externalSetString() && useExternalSet )
-          {
-            GEOS_ERROR( "Select nothing" );
-          }
-          else
-          {}
-        }
-      } );
-    }
-
-    checkSetsObjManager( nodeManager );
-
   } );
 
 
@@ -459,15 +417,6 @@ void SurfaceGenerator::initializePostInitialConditionsPreSubGroups()
         }
       }
     }
-
-    NodeManager & nodeManager = meshLevel.getNodeManager();
-    std::cout << "initializePostInitialConditionsPreSubGroups "<< nodeManager.getName() << std::endl;
-    nodeManager.sets().forWrappers< SortedArray< localIndex > >( [&] ( auto & wrapper )
-    {
-      std::cout << wrapper.getName() << ": "<< wrapper.size()<< std::endl;
-    } );
-
-
   } );
 }
 

src/coreComponents/schema/schema.xsd

@@ -1231,7 +1231,11 @@ This keyword is ignored for single-phase flow simulations-->
 		<xsd:attribute name="direction" type="R1Tensor" default="{0,0,0}" />
 		<!--endTime => Time at which the boundary condition will stop being applied.-->
 		<xsd:attribute name="endTime" type="real64" default="1e+99" />
-		<!--errorAsWarning => Converts an error into a warning-->
+		<!--errorAsWarning => Set the log state when we a “set” does not target any region
+When set to 0, no output
+When set to 1, output an error
+When set to 2, output a throw
+-->
 		<xsd:attribute name="errorAsWarning" type="integer" default="1" />
 		<!--functionName => Name of function that specifies variation of the boundary condition.-->
 		<xsd:attribute name="functionName" type="groupNameRef" default="" />
@@ -1258,7 +1262,11 @@ This keyword is ignored for single-phase flow simulations-->
 		<xsd:attribute name="direction" type="R1Tensor" default="{0,0,0}" />
 		<!--endTime => Time at which the boundary condition will stop being applied.-->
 		<xsd:attribute name="endTime" type="real64" default="1e+99" />
-		<!--errorAsWarning => Converts an error into a warning-->
+		<!--errorAsWarning => Set the log state when we a “set” does not target any region
+When set to 0, no output
+When set to 1, output an error
+When set to 2, output a throw
+-->
 		<xsd:attribute name="errorAsWarning" type="integer" default="1" />
 		<!--fieldName => Name of field that boundary condition is applied to.-->
 		<xsd:attribute name="fieldName" type="groupNameRef" default="" />
@@ -1286,7 +1294,11 @@ This keyword is ignored for single-phase flow simulations-->
 		<xsd:attribute name="direction" type="R1Tensor" default="{0,0,0}" />
 		<!--endTime => Time at which the boundary condition will stop being applied.-->
 		<xsd:attribute name="endTime" type="real64" default="1e+99" />
-		<!--errorAsWarning => Converts an error into a warning-->
+		<!--errorAsWarning => Set the log state when we a “set” does not target any region
+When set to 0, no output
+When set to 1, output an error
+When set to 2, output a throw
+-->
 		<xsd:attribute name="errorAsWarning" type="integer" default="1" />
 		<!--fieldName => Name of field that boundary condition is applied to.-->
 		<xsd:attribute name="fieldName" type="groupNameRef" default="" />
@@ -1324,7 +1336,11 @@ This keyword is ignored for single-phase flow simulations-->
 		<xsd:attribute name="endTime" type="real64" default="1e+99" />
 		<!--equilibrationTolerance => Tolerance in the fixed-point iteration scheme used for hydrostatic initialization-->
 		<xsd:attribute name="equilibrationTolerance" type="real64" default="0.001" />
-		<!--errorAsWarning => Converts an error into a warning-->
+		<!--errorAsWarning => Set the log state when we a “set” does not target any region
+When set to 0, no output
+When set to 1, output an error
+When set to 2, output a throw
+-->
 		<xsd:attribute name="errorAsWarning" type="integer" default="1" />
 		<!--functionName => Name of function that specifies variation of the boundary condition.-->
 		<xsd:attribute name="functionName" type="groupNameRef" default="" />
@@ -1352,7 +1368,11 @@ This keyword is ignored for single-phase flow simulations-->
 		<xsd:attribute name="direction" type="R1Tensor" default="{0,0,0}" />
 		<!--endTime => Time at which the boundary condition will stop being applied.-->
 		<xsd:attribute name="endTime" type="real64" default="1e+99" />
-		<!--errorAsWarning => Converts an error into a warning-->
+		<!--errorAsWarning => Set the log state when we a “set” does not target any region
+When set to 0, no output
+When set to 1, output an error
+When set to 2, output a throw
+-->
 		<xsd:attribute name="errorAsWarning" type="integer" default="1" />
 		<!--functionName => Name of function that specifies variation of the boundary condition.-->
 		<xsd:attribute name="functionName" type="groupNameRef" default="" />
@@ -1390,7 +1410,11 @@ This keyword is ignored for single-phase flow simulations-->
 		<xsd:attribute name="direction" type="R1Tensor" default="{0,0,0}" />
 		<!--endTime => Time at which the boundary condition will stop being applied.-->
 		<xsd:attribute name="endTime" type="real64" default="1e+99" />
-		<!--errorAsWarning => Converts an error into a warning-->
+		<!--errorAsWarning => Set the log state when we a “set” does not target any region
+When set to 0, no output
+When set to 1, output an error
+When set to 2, output a throw
+-->
 		<xsd:attribute name="errorAsWarning" type="integer" default="1" />
 		<!--functionName => Name of a function that specifies the variation of the production rate variations of this SourceFlux.Multiplied by scale. If no function is provided, a constant value of 1 is used.The produced fluid rate unit is in kg by default, or in mole if the flow solver uses moles.-->
 		<xsd:attribute name="functionName" type="groupNameRef" default="" />
@@ -1414,7 +1438,11 @@ This keyword is ignored for single-phase flow simulations-->
 		<xsd:attribute name="direction" type="R1Tensor" default="{0,0,0}" />
 		<!--endTime => Time at which the boundary condition will stop being applied.-->
 		<xsd:attribute name="endTime" type="real64" default="1e+99" />
-		<!--errorAsWarning => Converts an error into a warning-->
+		<!--errorAsWarning => Set the log state when we a “set” does not target any region
+When set to 0, no output
+When set to 1, output an error
+When set to 2, output a throw
+-->
 		<xsd:attribute name="errorAsWarning" type="integer" default="1" />
 		<!--functionName => Name of function that specifies variation of the boundary condition.-->
 		<xsd:attribute name="functionName" type="groupNameRef" default="" />
@@ -1735,7 +1763,11 @@ Information output from lower logLevels is added with the desired log level
 		<xsd:attribute name="distanceFromHead" type="real64" use="required" />
 		<!--perfStatusTable => Table defining perforation status as a function of time. The name must correspond to a TableFunction in the Functions section.-->
 		<xsd:attribute name="perfStatusTable" type="real64_array2d" default="{{0}}" />
-		<!--perfStatusTableName => Name of table function defining perforation status as a function of time. If none specified, a table function with be created internally and assigned the same name as the perforation.-->
+		<!--perfStatusTableName => Name of table function defining perforation status as a function of time:
+- The first row sets the perforation time coordinates,
+- The following row is the perforation status ( 0.0 for closed, 1.0 for opened) for each time coordinate.
+If none specified, a table function with be created internally and assigned the name formed by well and perforation names, separated by '_'.
+A table that opens the perforation at t=100, and closes it at t=200 could be `{{ 0, 100, 200 },{ 0.0, 1.0, 0.0 }}`-->
 		<xsd:attribute name="perfStatusTableName" type="groupNameRef" default="" />
 		<!--skinFactor => Perforation skin factor-->
 		<xsd:attribute name="skinFactor" type="real64" default="0" />

src/coreComponents/schema/schema.xsd.other

@@ -3558,8 +3558,8 @@
 		<xsd:attribute name="topWellElementIndex" type="integer" />
 		<!--wellControlsName => (no description available)-->
 		<xsd:attribute name="wellControlsName" type="groupNameRef" />
-		<!--wellLocalElementGlobaleIndex => (no description available)-->
-		<xsd:attribute name="wellLocalElementGlobaleIndex" type="globalIndex_array" />
+		<!--wellLocalElementGlobalIndex => (no description available)-->
+		<xsd:attribute name="wellLocalElementGlobalIndex" type="globalIndex_array" />
 		<!--wellLocalElementStatus => (no description available)-->
 		<xsd:attribute name="wellLocalElementStatus" type="integer_array" />
 	</xsd:complexType>
@@ -3589,7 +3589,7 @@
 		<xsd:attribute name="numPerforationsGlobal" type="globalIndex" />
 		<!--perforationName => Perforation name-->
 		<xsd:attribute name="perforationName" type="string_array" />
-		<!--perforationStatus => Table of time vs perforation open/close status -->
+		<!--perforationStatus => Table of time vs perforation open/close status-->
 		<xsd:attribute name="perforationStatus" type="integer_array" />
 		<!--perforationStatusTableName => Perforation status table name-->
 		<xsd:attribute name="perforationStatusTableName" type="string_array" />