Skip to content

Commit 652a70d

Browse files
committed
Fixing more tests.
1 parent a18aeed commit 652a70d

File tree

9 files changed

+15
-46
lines changed

9 files changed

+15
-46
lines changed

inputFiles/lagrangianContactMechanics/TFrac_smoke.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@
1717
<!-- SPHINX_SOLVER_END -->
1818
</Solvers>
1919

20-
<NumericalMethods>
21-
<FiniteElements>
22-
<FiniteElementSpace
23-
name="FE1"
24-
order="1"/>
25-
</FiniteElements>
26-
</NumericalMethods>
27-
2820
<!-- SPHINX_MESH -->
2921
<Mesh>
3022
<InternalMesh

inputFiles/wavePropagation/acous3D_firstOrder_fs_smoke.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,4 @@
2525
xMin="{ -0.01, -0.01, 100.99 }"
2626
xMax="{ 101.01, 101.01, 101.01 }"/>
2727
</Geometry>
28-
29-
<!-- The free surface condition the domain -->
30-
<FieldSpecifications>
31-
<FieldSpecification
32-
name="zposFreeSurface"
33-
objectPath="faceManager"
34-
fieldName="FreeSurface"
35-
setNames="{ zpos }"/>
36-
</FieldSpecifications>
3728
</Problem>

src/coreComponents/mesh/ElementRegionManager.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,7 @@ void ElementRegionManager::expandObjectCatalogs()
9393
{
9494
for( string const & key : getUserAvailableKeys() )
9595
{
96-
Group & elementRegions = this->getGroup( ElementRegionManager::groupKeyStruct::elementRegionsGroup() );
97-
98-
std::unique_ptr< Group > region =
99-
CatalogInterface::factory( key, getDataContext(), key, &elementRegions );
100-
101-
elementRegions.registerGroup( std::move( region ), true );
96+
this->createChild( key, key, true );
10297
}
10398
}
10499

@@ -275,6 +270,7 @@ void ElementRegionManager::buildSets( NodeManager const & nodeManager )
275270
arrayView1d< bool const > const nodeInCurSet = nodeInSet[setName];
276271

277272
SortedArray< localIndex > & targetSet = elementSets.registerWrapper< SortedArray< localIndex > >( setName, true ).reference();
273+
targetSet.clear();
278274
for( localIndex k = 0; k < subRegion.size(); ++k )
279275
{
280276
localIndex const numNodes = subRegion.numNodesPerElement( k );

src/coreComponents/mesh/ObjectManagerBase.cpp

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,9 @@ ObjectManagerBase::CatalogInterface::CatalogType & ObjectManagerBase::getCatalog
8989

9090
SortedArray< localIndex > & ObjectManagerBase::createSet( const string & newSetName )
9191
{
92-
if( m_sets.hasWrapper( newSetName ) )
93-
{
94-
return m_sets.getReference< SortedArray< localIndex > >( newSetName );
95-
}
96-
else
97-
{
98-
return m_sets.registerWrapper< SortedArray< localIndex > >( newSetName ).reference();
99-
}
92+
auto & set = m_sets.registerWrapper< SortedArray< localIndex > >( newSetName, true ).reference();
93+
set.clear();
94+
return set;
10095
}
10196

10297
void ObjectManagerBase::constructSetFromSetAndMap( SortedArrayView< localIndex const > const & inputSet,

src/coreComponents/mesh/ObjectManagerBase.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ class ObjectManagerBase : public dataRepository::Group
574574

575575
m_registeredField.insert( FIELD_TRAIT::key());
576576

577-
return this->registerWrapper< typename FIELD_TRAIT::type >( FIELD_TRAIT::key() ).
577+
return this->registerWrapper< typename FIELD_TRAIT::type >( FIELD_TRAIT::key(), nullptr, true ).
578578
setApplyDefaultValue( defaultValue ).
579579
setPlotLevel( FIELD_TRAIT::plotLevel ).
580580
setRestartFlags( FIELD_TRAIT::restartFlag ).

src/coreComponents/mesh/ParticleManager.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,7 @@ void ParticleManager::expandObjectCatalogs()
102102
string const key = iter->first;
103103
if( key.find( "ParticleRegion" ) != string::npos )
104104
{
105-
Group & particleRegions = this->getGroup( ParticleManager::groupKeyStruct::particleRegionsGroup() );
106-
107-
std::unique_ptr< Group > region =
108-
CatalogInterface::factory( key, getDataContext(), key, &particleRegions );
109-
110-
particleRegions.registerGroup( std::move( region ), true );
105+
this->createChild( key, key, true );
111106
}
112107
}
113108
}

src/coreComponents/physicsSolvers/PhysicsSolverBase.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1264,12 +1264,12 @@ string PhysicsSolverBase::getConstitutiveName( ParticleSubRegionBase const & sub
12641264
template< typename CONSTITUTIVE >
12651265
void PhysicsSolverBase::setConstitutiveName( ElementSubRegionBase & subRegion, string const & wrapperName, string const & constitutiveType ) const
12661266
{
1267-
subRegion.registerWrapper< string >( wrapperName ).
1268-
setPlotLevel( dataRepository::PlotLevel::NOPLOT ).
1269-
setRestartFlags( dataRepository::RestartFlags::NO_WRITE ).
1270-
setSizedFromParent( 0 );
1267+
string & constitutiveName = subRegion.registerWrapper< string >( wrapperName, true ).
1268+
setPlotLevel( dataRepository::PlotLevel::NOPLOT ).
1269+
setRestartFlags( dataRepository::RestartFlags::NO_WRITE ).
1270+
setSizedFromParent( 0 ).
1271+
reference();
12711272

1272-
string & constitutiveName = subRegion.getReference< string >( wrapperName );
12731273
constitutiveName = getConstitutiveName< CONSTITUTIVE >( subRegion );
12741274
GEOS_ERROR_IF( constitutiveName.empty(), GEOS_FMT( "{}: {} constitutive model not found on subregion {}",
12751275
getDataContext(), constitutiveType, subRegion.getName() ) );

src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,7 @@ void CompositionalMultiphaseBase::computeHydrostaticEquilibrium( DomainPartition
12891289
// Step 3.5: create hydrostatic pressure table
12901290

12911291
string const tableName = fs.getName() + "_" + subRegion.getName() + "_" + phaseNames[ipInit] + "_table";
1292-
TableFunction * const presTable = dynamicCast< TableFunction * >( functionManager.createChild( TableFunction::catalogName(), tableName ) );
1292+
TableFunction * const presTable = dynamicCast< TableFunction * >( functionManager.createChild( TableFunction::catalogName(), tableName, true ) );
12931293
presTable->setTableCoordinates( elevationValues, { units::Distance } );
12941294
presTable->setTableValues( pressureValues, units::Pressure );
12951295
presTable->setInterpolationMethod( TableFunction::InterpolationType::Linear );

src/coreComponents/schema/schema.xsd.other

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@
516516
<!--fractureStencil => (no description available)-->
517517
<xsd:attribute name="fractureStencil" type="geos_SurfaceElementStencil" />
518518
<!--targetRegions => List of regions to build the stencil for-->
519-
<xsd:attribute name="targetRegions" type="geos_mapBase_lt_string_cm_-geos_internal_StdVectorWrapper_lt_string_cm_-std_allocator_lt_string-_gt__cm_-true_gt__cm_-std_integral_constant_lt_bool_cm_-true_gt_-_gt_" />
519+
<xsd:attribute name="targetRegions" type="geos_mapBase_lt_string_cm_-geos_internal_StdVectorWrapper_lt_string_cm_-std_allocator_lt_string-_gt__cm_-false_gt__cm_-std_integral_constant_lt_bool_cm_-true_gt_-_gt_" />
520520
</xsd:complexType>
521521
<xsd:complexType name="OutputsType">
522522
<xsd:choice minOccurs="0" maxOccurs="unbounded">
@@ -1508,7 +1508,7 @@
15081508
<xsd:element name="MeshBodies" type="MeshBodiesType" />
15091509
</xsd:choice>
15101510
<!--Neighbors => (no description available)-->
1511-
<xsd:attribute name="Neighbors" type="geos_internal_StdVectorWrapper_lt_geos_NeighborCommunicator_cm_-std_allocator_lt_geos_NeighborCommunicator_gt__cm_-true_gt_" />
1511+
<xsd:attribute name="Neighbors" type="geos_internal_StdVectorWrapper_lt_geos_NeighborCommunicator_cm_-std_allocator_lt_geos_NeighborCommunicator_gt__cm_-false_gt_" />
15121512
<!--partitionManager => (no description available)-->
15131513
<xsd:attribute name="partitionManager" type="geos_PartitionBase" />
15141514
</xsd:complexType>

0 commit comments

Comments
 (0)