fix: error in MappedVector::insert

inputFiles/lagrangianContactMechanics/TFrac_smoke.xml

@@ -17,14 +17,6 @@
 <!-- SPHINX_SOLVER_END -->
 </Solvers>
 
-  <NumericalMethods>
-    <FiniteElements>
-      <FiniteElementSpace
-        name="FE1"
-        order="1"/>
-    </FiniteElements>
-  </NumericalMethods>
-
   <!-- SPHINX_MESH -->
   <Mesh>
     <InternalMesh

inputFiles/wavePropagation/acous3D_Q3_abc_fs_smoke.xml

@@ -25,13 +25,4 @@
       xMin="{ -0.01, -0.01, 100.99 }"
       xMax="{ 101.01, 101.01, 101.01 }"/>
   </Geometry>
-
-    <!-- The free surface condition the domain -->
-  <FieldSpecifications>
-    <FieldSpecification
-      name="zposFreeSurface"
-      objectPath="mesh/FE2/faceManager"
-      fieldName="FreeSurface"
-      setNames="{ zpos }"/>
-  </FieldSpecifications>
 </Problem>

inputFiles/wavePropagation/acous3D_Q3_firstOrder_fs_smoke.xml

@@ -25,13 +25,4 @@
       xMin="{ -0.01, -0.01, 100.99 }"
       xMax="{ 101.01, 101.01, 101.01 }"/>
   </Geometry>
-
-    <!-- The free surface condition the domain -->
-  <FieldSpecifications>
-    <FieldSpecification
-      name="zposFreeSurface"
-      objectPath="mesh/FE1/faceManager"
-      fieldName="FreeSurface"
-      setNames="{ zpos }"/>
-  </FieldSpecifications>
 </Problem>

inputFiles/wavePropagation/acous3D_abc_fs_smoke.xml

@@ -25,13 +25,4 @@
       xMin="{ -0.01, -0.01, 100.99 }"
       xMax="{ 101.01, 101.01, 101.01 }"/>
   </Geometry>
-
-    <!-- The free surface condition the domain -->
-  <FieldSpecifications>
-    <FieldSpecification
-      name="zposFreeSurface"
-      objectPath="faceManager"
-      fieldName="FreeSurface"
-      setNames="{ zpos }"/>
-  </FieldSpecifications>
 </Problem>

inputFiles/wavePropagation/acous3D_firstOrder_fs_smoke.xml

@@ -25,13 +25,4 @@
       xMin="{ -0.01, -0.01, 100.99 }"
       xMax="{ 101.01, 101.01, 101.01 }"/>
   </Geometry>
-
-    <!-- The free surface condition the domain -->
-  <FieldSpecifications>
-    <FieldSpecification
-      name="zposFreeSurface"
-      objectPath="faceManager"
-      fieldName="FreeSurface"
-      setNames="{ zpos }"/>
-  </FieldSpecifications>
 </Problem>

inputFiles/wavePropagation/acous3D_vti_smoke.xml

@@ -165,14 +165,6 @@
       fieldName="acousticVelocity"
       scale="1500"
       setNames="{ all }"/>
-
-    <!-- 3) The free surface condition the domain -->
-    <FieldSpecification
-      name="zposFreeSurface"
-      objectPath="faceManager"
-      fieldName="FreeSurface"
-      scale="0.0"
-      setNames="{ zpos }"/>
   </FieldSpecifications>
 
   <Events

src/coreComponents/constitutive/ConstitutiveBase.cpp

@@ -53,7 +53,7 @@ void ConstitutiveBase::allocateConstitutiveData( Group & parent, localIndex cons
       if( wrapper.second->sizedFromParent() )
       {
         string const wrapperName = makeFieldName( this->getName(), wrapper.first );
-        parent.registerWrapper( wrapper.second->clone( wrapperName, parent ) ).
+        parent.registerWrapper( wrapper.second->clone( wrapperName, parent ), true ).
           setRestartFlags( RestartFlags::NO_WRITE );
       }
     }
@@ -64,7 +64,7 @@ void ConstitutiveBase::allocateConstitutiveData( Group & parent, localIndex cons
     if( wrapper.second->sizedFromParent() )
     {
       string const wrapperName = makeFieldName( this->getName(), wrapper.first );
-      parent.registerWrapper( wrapper.second->clone( wrapperName, parent ) ).
+      parent.registerWrapper( wrapper.second->clone( wrapperName, parent ), true ).
         setRestartFlags( RestartFlags::NO_WRITE );
     }
   }

src/coreComponents/constitutive/ConstitutiveManager.cpp

@@ -41,12 +41,14 @@ ConstitutiveManager::~ConstitutiveManager()
 {}
 
 
-Group * ConstitutiveManager::createChild( string const & childKey, string const & childName )
+Group * ConstitutiveManager::createChild( string const & childKey,
+                                          string const & childName,
+                                          bool const allowExistence )
 {
   GEOS_LOG_RANK_0( GEOS_FMT( "{}: adding {} {}", getName(), childKey, childName ) );
   std::unique_ptr< ConstitutiveBase > material =
     ConstitutiveBase::CatalogInterface::factory( childKey, getDataContext(), childName, this );
-  return &registerGroup< ConstitutiveBase >( childName, std::move( material ) );
+  return &registerGroup< ConstitutiveBase >( std::move( material ), allowExistence );
 }
 
 
@@ -92,7 +94,7 @@ ConstitutiveManager::hangConstitutiveRelation( string const & constitutiveRelati
                              numConstitutivePointsPerParentIndex ) );
 
   ConstitutiveBase &
-  materialGroup = constitutiveGroup->registerGroup< ConstitutiveBase >( constitutiveRelationInstanceName, std::move( material ) );
+  materialGroup = constitutiveGroup->registerGroup< ConstitutiveBase >( std::move( material ) );
   materialGroup.setSizedFromParent( 1 );
   materialGroup.resize( constitutiveGroup->size() );
 

src/coreComponents/constitutive/ConstitutiveManager.hpp

@@ -48,7 +48,9 @@ class ConstitutiveManager : public dataRepository::Group
   ConstitutiveManager( string const & name,
                        Group * const parent );
 
-  virtual Group * createChild( string const & childKey, string const & childName ) override final;
+  virtual Group * createChild( string const & childKey,
+                               string const & childName,
+                               bool const allowExistence=false ) override final;
 
   /// This function is used to expand any catalogs in the data structure
   virtual void expandObjectCatalogs() override;

src/coreComponents/constitutive/fluid/multifluid/MultiFluidBase.cpp

@@ -37,16 +37,16 @@ MultiFluidBase::MultiFluidBase( string const & name, Group * const parent )
 
   registerWrapper( viewKeyStruct::componentNamesString(), &m_componentNames ).
     setInputFlag( InputFlags::OPTIONAL ).
-    setDescription( "List of component names" );
+    setDescription( "List of fluid components (e.g. CH4, H2O, C5H12)" );
 
   registerWrapper( viewKeyStruct::componentMolarWeightString(), &m_componentMolarWeight ).
     setInputFlag( InputFlags::OPTIONAL ).
-    setDescription( "Component molar weights" );
+    setDescription( "Molar weights of components" );
 
   registerWrapper( viewKeyStruct::phaseNamesString(), &m_phaseNames ).
     setRTTypeName( rtTypes::CustomTypes::groupNameRefArray ).
     setInputFlag( InputFlags::OPTIONAL ).
-    setDescription( "List of fluid phases" );
+    setDescription( "List of fluid phases (e.g. gas, water, oil)" );
 
   registerWrapper( viewKeyStruct::useMassString(), &m_useMass ).
     setRestartFlags( RestartFlags::NO_WRITE ).

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

@@ -11,18 +11,14 @@ InvariantImmiscibleFluid::InvariantImmiscibleFluid( string const & name, Group *
   : MultiFluidBase( name, parent )
 {
   // Override input flags for mandatory options
+  getWrapperBase( viewKeyStruct::componentNamesString() )
+    .setInputFlag( dataRepository::InputFlags::REQUIRED );
 
-  registerWrapper( viewKeyStruct::componentNamesString(), &m_componentNames )
-    .setInputFlag( dataRepository::InputFlags::REQUIRED )
-    .setDescription( "List of fluid components (e.g. CH4, H2O, C5H12)" );
-
-  registerWrapper( viewKeyStruct::phaseNamesString(), &m_phaseNames )
-    .setInputFlag( dataRepository::InputFlags::REQUIRED )
-    .setDescription( "List of fluid phases (e.g. gas, water, oil)" );
+  getWrapperBase( viewKeyStruct::componentMolarWeightString() )
+    .setInputFlag( dataRepository::InputFlags::REQUIRED );
 
-  registerWrapper( viewKeyStruct::componentMolarWeightString(), &m_componentMolarWeight )
-    .setInputFlag( dataRepository::InputFlags::REQUIRED )
-    .setDescription( "Molar weights of components" );
+  getWrapperBase( viewKeyStruct::phaseNamesString() )
+    .setInputFlag( dataRepository::InputFlags::REQUIRED );
 
   // Densities: constant phase densities
   registerWrapper( "densities", &m_densities )

src/coreComponents/constitutive/unitTests/FluidModelTest_impl.hpp

@@ -516,7 +516,7 @@ void FluidModelTest< FLUID_TYPE, NUM_COMP, NUM_PHASE >::createFunctionManager()
   // TODO: FunctionManager is a singleton
   string const name = FunctionManager::catalogName();
   auto functionManager = std::make_unique< FunctionManager >( name, &m_parent );
-  m_parent.registerGroup( name, std::move( functionManager ) );
+  m_parent.registerGroup( std::move( functionManager ) );
 }
 
 } // namespace testing

src/coreComponents/dataRepository/Group.cpp

@@ -67,13 +67,6 @@ Group::CatalogInterface::CatalogType & Group::getCatalog()
   return catalog;
 }
 
-WrapperBase & Group::registerWrapper( std::unique_ptr< WrapperBase > wrapper )
-{
-  // Extract `wrapperName` first to prevent from UB call order in the `insert` call.
-  string const wrapperName = wrapper->getName();
-  return *m_wrappers.insert( wrapperName, wrapper.release(), true );
-}
-
 void Group::deregisterWrapper( string const & name )
 {
   GEOS_ERROR_IF( !hasWrapper( name ),
@@ -275,12 +268,10 @@ void Group::registerDataOnMeshRecursive( Group & meshBodies )
   }
 }
 
-Group * Group::createChild( string const & childKey, string const & childName )
+Group * Group::createChild( string const & childKey, string const & childName, bool const allowExistence )
 {
   GEOS_LOG_RANK_0( "Adding Object " << childKey<<" named "<< childName<<" from Group::Catalog." );
-  return &registerGroup( childName,
-                         CatalogInterface::factory( childKey, getDataContext(),
-                                                    childName, this ) );
+  return &registerGroup( CatalogInterface::factory( childKey, getDataContext(), childName, this ), allowExistence );
 }
 
 void Group::printDataHierarchy( integer const indent ) const
@@ -749,5 +740,67 @@ stdVector< string > Group::getWrappersNames() const
   return wrappersNames;
 }
 
+void Group::insertWrapper( std::unique_ptr< WrapperBase > wrapper, bool const allowExistence )
+{
+  GEOS_ERROR_IF( !wrapper, "Trying to register a nullptr WrapperBase with " << getPath() );
+
+  // Extract data from wrapper in case it's free'd in insert.
+  string const name = wrapper->getName();
+  std::type_info const & typeId = wrapper->getTypeId();
+  string const typeName = wrapper->getRTTypeName();
+
+  WrapperBase * const ret = m_wrappers.insert( name, wrapper.release(), true );
+
+  if( ret == nullptr )
+  {
+    WrapperBase const & existingWrapper = getWrapperBase( name );
+    bool const typesMatch = existingWrapper.getTypeId() == typeId;
+
+    if( !allowExistence || !typesMatch )
+    {
+      string registrationString = "";
+      if( !existingWrapper.getRegisteringObjects().empty() )
+      {
+        std::ostringstream oss;
+        oss << ". The existing wrapper was registered by the following:";
+        for( string const & object : existingWrapper.getRegisteringObjects() )
+        {
+          oss << "\n\t" << object;
+        }
+
+        registrationString = oss.str();
+      }
+
+      GEOS_ERROR( "Tried registering a wrapper \"" << name << "\" of type " <<  typeName <<
+                  " with \"" << getPath() << "\"\n" <<
+                  "A wrapper of this name already exists with type " << existingWrapper.getRTTypeName() << registrationString );
+    }
+  }
+}
+
+void Group::insertGroup( Group * const newObject, bool const takeOwnership, bool const allowExistence )
+{
+  GEOS_ERROR_IF( !newObject, "Attempting to register a nullptr as a subgroup of " << getPath() );
+
+  newObject->m_parent = this;
+
+  // Extract data from newObject in case it's free'd in insert.
+  string const name = newObject->getName();
+  std::type_info const & typeId = typeid( *newObject );
+
+  Group * const ret = m_subGroups.insert( name, newObject, takeOwnership );
+
+  if( ret == nullptr )
+  {
+    Group const & existingGroup = getGroup( name );
+    std::type_info const & existingTypeId = typeid( existingGroup );
+
+    GEOS_ERROR_IF( !allowExistence || (existingTypeId != typeId),
+                   "Tried registering a Group \"" << name << "\" of type " << rtTypes::getTypeName( typeId ) <<
+                   " with \"" << getPath() << "\"\n" <<
+                   "A Group of this name already exists with type " << rtTypes::getTypeName( existingTypeId ) );
+  }
+}
+
 } /* end namespace dataRepository */
 } /* end namespace geos  */