-
Notifications
You must be signed in to change notification settings - Fork 89
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'swaziri/experimental' into swaziri/configLoop_acceleration
- Loading branch information
Showing
34 changed files
with
1,058 additions
and
288 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| baselines: | ||
| bucket: geosx | ||
| baseline: integratedTests/baseline_integratedTests-pr3448-8959-1ff97b3 | ||
| baseline: integratedTests/baseline_integratedTests-pr2957-9029-ff99ac0 | ||
| allow_fail: | ||
| all: '' | ||
| streak: '' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
inputFiles/singlePhaseFlow/FieldCaseTutorial3_composite_smoke.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| <?xml version="1.0" ?> | ||
|
|
||
| <Problem> | ||
| <Included> | ||
| <File name="./FieldCaseTutorial3_base.xml" /> | ||
| </Included> | ||
|
|
||
| <!-- SPHINX_FIELD_CASE_COMPOSITE_MESH --> | ||
| <ExternalDataSource> | ||
| <VTKHierarchicalDataSource | ||
| name="synthetic" | ||
| file="synthetic.vtpc"/> | ||
| </ExternalDataSource> | ||
|
|
||
| <Mesh> | ||
| <VTKMesh | ||
| name="SyntheticMesh" | ||
| repositoryName="synthetic"> | ||
| <Region | ||
| name="Region1" | ||
| id="1" | ||
| pathInRepository="/Root/Mesh/Region1"/> | ||
| <Region | ||
| name="Region2" | ||
| id="2" | ||
| pathInRepository="/Root/Mesh/Region2"/> | ||
| <Region | ||
| name="Region3" | ||
| id="3" | ||
| pathInRepository="/Root/Mesh/Region3"/> | ||
| </VTKMesh> | ||
| </Mesh> | ||
| <!-- SPHINX_FIELD_CASE_COMPOSITE_MESH --> | ||
|
|
||
| <!-- SPHINX_FIELD_CASE_EVENTS --> | ||
| <Events maxTime="100.0e6"> | ||
| <PeriodicEvent name="solverApplications" | ||
| forceDt="10.0e6" | ||
| target="/Solvers/SinglePhaseFlow" /> | ||
|
|
||
| <PeriodicEvent name="outputs" | ||
| timeFrequency="10.0e6" | ||
| target="/Outputs/reservoir_with_properties" /> | ||
| </Events> | ||
| <!-- SPHINX_FIELD_CASE_EVENTS_END --> | ||
|
|
||
| </Problem> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <?xml version="1.0"?> | ||
| <VTKFile type="vtkPartitionedDataSetCollection" version="1.0" byte_order="LittleEndian" header_type="UInt32" compressor="vtkZLibDataCompressor"> | ||
| <vtkPartitionedDataSetCollection> | ||
| <Partitions index="0" name="Region1"> | ||
| <DataSet index="0" file="synthetic/synthetic_0_0.vtu"/> | ||
| </Partitions> | ||
| <Partitions index="1" name="Region2"> | ||
| <DataSet index="0" file="synthetic/synthetic_1_0.vtu"/> | ||
| </Partitions> | ||
| <Partitions index="2" name="Region3"> | ||
| <DataSet index="0" file="synthetic/synthetic_2_0.vtu"/> | ||
| </Partitions> | ||
| <DataAssembly encoding="base64"> | ||
| PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxSb290IHR5cGU9InZ0a0RhdGFBc3NlbWJseSIgdmVyc2lvbj0iMS4wIiBpZD0iMCIgdnRrX3R5cGU9IjM4IiB2dGtfY2F0ZWdvcnk9Inhmb3JtZWRfaGllcmFyY2h5IiBsYWJlbD0iZGF0YSI+CiAgPE1lc2ggaWQ9IjEiIGxhYmVsPSJTeW50aGV0aWNNZXNoIj4KICAgIDxSZWdpb24xIGlkPSIyIiBsYWJlbD0iUmVnaW9uMSIgbnVtYmVyX29mX3BhcnRpdGlvbnM9IjEiPgogICAgICA8ZGF0YXNldCBpZD0iMCIgLz4KICAgIDwvUmVnaW9uMT4KICAgIDxSZWdpb24yIGlkPSIzIiBsYWJlbD0iUmVnaW9uMiIgbnVtYmVyX29mX3BhcnRpdGlvbnM9IjEiPgogICAgICA8ZGF0YXNldCBpZD0iMSIgLz4KICAgIDwvUmVnaW9uMj4KICAgIDxSZWdpb24zIGlkPSI0IiBsYWJlbD0iUmVnaW9uMyIgbnVtYmVyX29mX3BhcnRpdGlvbnM9IjEiPgogICAgICA8ZGF0YXNldCBpZD0iMiIgLz4KICAgIDwvUmVnaW9uMz4KICA8L01lc2g+CjwvUm9vdD4K | ||
| </DataAssembly> | ||
| </vtkPartitionedDataSetCollection> | ||
| </VTKFile> |
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * ------------------------------------------------------------------------------------------------------------ | ||
| * 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. | ||
| * ------------------------------------------------------------------------------------------------------------ | ||
| */ | ||
|
|
||
| #include "ExternalDataSourceBase.hpp" | ||
|
|
||
| namespace geos | ||
| { | ||
| using namespace dataRepository; | ||
|
|
||
| ExternalDataSourceBase::ExternalDataSourceBase( string const & name, Group * const parent ): | ||
| Group( name, parent ) | ||
| { | ||
| setInputFlags( InputFlags::OPTIONAL_NONUNIQUE ); | ||
| } | ||
|
|
||
| Group * ExternalDataSourceBase::createChild( string const & childKey, string const & childName ) | ||
| { | ||
| GEOS_LOG_RANK_0( "Adding External Data Source: " << childKey << ", " << childName ); | ||
| std::unique_ptr< ExternalDataSourceBase > event = ExternalDataSourceBase::CatalogInterface::factory( childKey, childName, this ); | ||
| return &this->registerGroup< ExternalDataSourceBase >( childName, std::move( event ) ); | ||
| } | ||
|
|
||
| void ExternalDataSourceBase::expandObjectCatalogs() | ||
| { | ||
| // Only add children if the parent is of type EventManager | ||
| // otherwise, this would fall into a loop | ||
| if( strcmp( this->getParent().getName().c_str(), "ExternalDataSource" ) == 0 ) | ||
| { | ||
| for( auto & catalogIter: ExternalDataSourceBase::getCatalog()) | ||
| { | ||
| createChild( catalogIter.first, catalogIter.first ); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| ExternalDataSourceBase::CatalogInterface::CatalogType & ExternalDataSourceBase::getCatalog() | ||
| { | ||
| static ExternalDataSourceBase::CatalogInterface::CatalogType catalog; | ||
| return catalog; | ||
| } | ||
|
|
||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| /* | ||
| * ------------------------------------------------------------------------------------------------------------ | ||
| * 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 ExternalDataSourceBase.hpp | ||
| */ | ||
|
|
||
| #ifndef GEOS_MESH_EXTERNALDATASOURCEBASE_HPP | ||
| #define GEOS_MESH_EXTERNALDATASOURCEBASE_HPP | ||
|
|
||
| #include "dataRepository/Group.hpp" | ||
| #include "dataRepository/WrapperBase.hpp" | ||
| #include "codingUtilities/Utilities.hpp" | ||
| #include "common/DataTypes.hpp" | ||
|
|
||
|
|
||
| namespace geos | ||
| { | ||
|
|
||
| /** | ||
| * @class ExternalDataSourceBase | ||
| * @brief The ExternalDataSourceBase class provides an abstract base class implementation for different mesh types. | ||
| * The ExternalDataSourceBase is the Group specialization for different type of mesh handling. | ||
| */ | ||
| class ExternalDataSourceBase : public dataRepository::Group | ||
| { | ||
| public: | ||
|
|
||
| /** | ||
| * @brief Main constructor for ExternalDataSourceBase base class. | ||
| * @param[in] name of the ExternalDataSourceBase object | ||
| * @param[in] parent the parent Group pointer for the ExternalDataSourceBase object | ||
| */ | ||
| explicit ExternalDataSourceBase( string const & name, | ||
| Group * const parent ); | ||
|
|
||
| /// This function is used to expand any catalogs in the data structure | ||
| virtual void expandObjectCatalogs() override; | ||
|
|
||
| /// using alias for templated Catalog ExternalDataSourceBase type | ||
| using CatalogInterface = dataRepository::CatalogInterface< ExternalDataSourceBase, string const &, Group * const >; | ||
|
|
||
| /** | ||
| * @brief Create a new geometric object (box, plane, etc) as a child of this group. | ||
| * @param childKey the catalog key of the new geometric object to create | ||
| * @param childName the name of the new geometric object in the repository | ||
| * @return the group child | ||
| */ | ||
| virtual Group * createChild( string const & childKey, string const & childName ) override; | ||
|
|
||
| /** | ||
| * @brief Accessor for the singleton Catalog object | ||
| * @return a static reference to the Catalog object | ||
| */ | ||
| static CatalogInterface::CatalogType & getCatalog(); | ||
|
|
||
| /** | ||
| * @brief This function provides the capability to open an external data repository | ||
| * from another component whatever its format. | ||
| */ | ||
| virtual void open() = 0; | ||
| }; | ||
|
|
||
| } | ||
|
|
||
| #endif /* GEOS_MESH_EXTERNALDATASOURCEBASE_HPP */ |
Oops, something went wrong.