From 590865f1a8f726200dc2e19139034ce66577eb4a Mon Sep 17 00:00:00 2001 From: Gerasimos Chourdakis Date: Wed, 17 May 2023 16:12:19 +0300 Subject: [PATCH] Remove XML tag solver-interface (#1662) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge Configuration and SolverInterfaceConfiguration classes Remove SolverInterfaceConfiguration files Remove solver-interface tag from all XML files Update formatter to version 3 and reformat everything Co-authored-by: Frédéric Simonis --- .pre-commit-config.yaml | 2 +- docs/changelog/1662.md | 1 + examples/solverdummies/precice-config.xml | 86 +++--- ...ummationActionTest-testConfiguration-1.xml | 1 - .../tests/explicit-coupling-scheme-1.xml | 8 - .../tests/explicit-coupling-scheme-2.xml | 7 - .../tests/multi-solver-coupling-1.xml | 14 - .../tests/multi-solver-coupling-2.xml | 18 -- .../tests/multi-solver-coupling-3.xml | 16 - .../tests/multi-solver-coupling-4.xml | 16 - .../parallel-explicit-coupling-datainit.xml | 7 - ...-implicit-cplscheme-relax-const-config.xml | 11 - .../serial-explicit-coupling-datainit.xml | 7 - ...ial-implicit-cplscheme-absolute-config.xml | 10 - ...-implicit-cplscheme-relax-const-config.xml | 11 - src/mesh/config/DataConfiguration.cpp | 2 +- src/precice/config/Configuration.cpp | 79 ++++- src/precice/config/Configuration.hpp | 80 ++++- .../config/ParticipantConfiguration.hpp | 1 - .../config/SolverInterfaceConfiguration.cpp | 106 ------- .../config/SolverInterfaceConfiguration.hpp | 127 -------- src/precice/impl/ParticipantImpl.cpp | 8 +- src/precice/impl/ParticipantImpl.hpp | 6 +- src/precice/impl/ValidationMacros.hpp | 8 +- src/precice/tests/config-checker.xml | 102 ++++--- src/sources.cmake | 2 - src/xml/XMLTag.cpp | 2 +- src/xml/tests/xmlparser_nstest.xml | 1 - src/xml/tests/xmlparser_occtest.xml | 3 - src/xml/tests/xmlparser_test.xml | 4 - src/xml/tests/xmltest-nesting-config.xml | 1 - tests/parallel/CouplingOnLine.xml | 60 ++-- tests/parallel/ExportTimeseries.xml | 78 +++-- tests/parallel/GlobalRBFPartitioning.xml | 90 +++--- tests/parallel/GlobalRBFPartitioningPETSc.xml | 90 +++--- tests/parallel/LocalRBFPartitioning.xml | 90 +++--- tests/parallel/LocalRBFPartitioningPETSc.xml | 90 +++--- .../NearestProjectionRePartitioning.xml | 66 ++-- tests/parallel/PrimaryRankSockets.xml | 84 +++--- .../TestBoundingBoxInitialization.xml | 62 ++-- .../TestBoundingBoxInitializationTwoWay.xml | 82 +++-- tests/parallel/TestFinalize.xml | 86 +++--- tests/parallel/UserDefinedMPICommunicator.xml | 84 +++--- .../UserDefinedMPICommunicatorPetRBF.xml | 92 +++--- .../AccessReceivedMeshAndMapping.xml | 70 +++-- .../AccessReceivedMeshEmptyPartition.xml | 42 ++- ...ReceivedMeshEmptyPartitionTwoLevelInit.xml | 42 ++- .../AccessReceivedMeshNoOverlap.xml | 42 ++- ...ccessReceivedMeshNoOverlapTwoLevelInit.xml | 42 ++- .../AccessReceivedMeshOverlap.xml | 42 ++- .../AccessReceivedMeshOverlapNoWrite.xml | 42 ++- ...ReceivedMeshOverlapNoWriteTwoLevelInit.xml | 42 ++- .../AccessReceivedMeshOverlapTwoLevelInit.xml | 42 ++- ...stributedCommunicationGatherScatterMPI.xml | 86 +++--- .../TestDistributedCommunicationP2PMPI.xml | 86 +++--- ...TestDistributedCommunicationP2PSockets.xml | 86 +++--- .../EnforceGatherScatterEmptyPrimaryRank.xml | 84 +++--- ...eGatherScatterEmptyReceivedPrimaryRank.xml | 84 +++--- .../ConstructAndExplicitFinalize.xml | 82 +++-- tests/parallel/lifecycle/ConstructOnly.xml | 82 +++-- tests/parallel/lifecycle/Full.xml | 82 +++-- tests/parallel/lifecycle/ImplicitFinalize.xml | 82 +++-- .../GradientTestParallelScalar.xml | 82 +++-- .../GradientTestParallelVector.xml | 84 +++--- .../GradientTestParallelWriteVector.xml | 66 ++-- .../mapping-volume/ParallelCube1To3.xml | 64 ++-- .../mapping-volume/ParallelCube3To1.xml | 62 ++-- .../ParallelCubeConservative1To3.xml | 70 +++-- .../ParallelCubeConservative3To1.xml | 78 +++-- .../mapping-volume/ParallelSquare1To2.xml | 60 ++-- .../mapping-volume/ParallelSquare2To1.xml | 60 ++-- .../ParallelSquareConservative1To2.xml | 60 ++-- .../ParallelTriangleConservative2To1.xml | 60 ++-- tests/quasi-newton/parallel/TestQN1.xml | 102 ++++--- .../parallel/TestQN1EmptyPartition.xml | 102 ++++--- tests/quasi-newton/parallel/TestQN2.xml | 106 ++++--- .../parallel/TestQN2EmptyPartition.xml | 106 ++++--- tests/quasi-newton/parallel/TestQN3.xml | 102 ++++--- .../parallel/TestQN3EmptyPartition.xml | 102 ++++--- tests/quasi-newton/serial/TestQN1.xml | 100 +++---- tests/quasi-newton/serial/TestQN2.xml | 104 ++++--- tests/quasi-newton/serial/TestQN3.xml | 100 +++---- tests/serial/AitkenAcceleration.xml | 90 +++--- tests/serial/PreconditionerBug.xml | 100 +++---- .../serial/SendMeshToMultipleParticipants.xml | 110 ++++--- tests/serial/SummationActionTwoSources.xml | 118 ++++---- .../TestExplicitWithDataMultipleReadWrite.xml | 72 +++-- .../serial/TestExplicitWithSolverGeometry.xml | 94 +++--- tests/serial/TestImplicit.xml | 86 +++--- tests/serial/TestReadAPI.xml | 86 +++--- .../action-timings/ActionTimingsExplicit.xml | 95 +++--- .../action-timings/ActionTimingsImplicit.xml | 94 +++--- tests/serial/circular/Explicit.xml | 116 ++++--- .../testConvergenceMeasures1.xml | 88 +++--- .../testConvergenceMeasures2.xml | 96 +++--- .../testConvergenceMeasures3.xml | 96 +++--- .../DirectAccessReadWrite.xml | 56 ++-- .../DirectAccessWithDataInitialization.xml | 74 +++-- .../DirectAccessWithWaveform.xml | 74 +++-- tests/serial/direct-mesh-access/Explicit.xml | 42 ++- .../direct-mesh-access/ExplicitAndMapping.xml | 70 +++-- .../direct-mesh-access/ExplicitRead.xml | 42 ++- tests/serial/direct-mesh-access/Implicit.xml | 64 ++-- tests/serial/explicit/TestExplicitMPI.xml | 82 +++-- .../serial/explicit/TestExplicitMPISingle.xml | 82 +++-- tests/serial/explicit/TestExplicitSockets.xml | 82 +++-- tests/serial/initialize-data/Explicit.xml | 82 +++-- tests/serial/initialize-data/Implicit.xml | 91 +++--- tests/serial/initialize-data/ImplicitBoth.xml | 91 +++--- tests/serial/initialize-data/ReadMapping.xml | 60 ++-- tests/serial/initialize-data/WriteMapping.xml | 60 ++-- .../ConstructAndExplicitFinalize.xml | 82 +++-- tests/serial/lifecycle/ConstructOnly.xml | 82 +++-- tests/serial/lifecycle/Full.xml | 82 +++-- tests/serial/lifecycle/ImplicitFinalize.xml | 82 +++-- .../GradientTestBidirectionalReadScalar.xml | 84 +++--- .../GradientTestBidirectionalReadVector.xml | 82 +++-- .../GradientTestBidirectionalWriteScalar.xml | 82 +++-- .../GradientTestBidirectionalWriteVector.xml | 82 +++-- ...dientTestUnidirectionalReadBlockVector.xml | 62 ++-- .../GradientTestUnidirectionalReadScalar.xml | 62 ++-- .../GradientTestUnidirectionalReadVector.xml | 62 ++-- .../MappingNearestProjectionEdges.xml | 60 ++-- ...DiagonalNearestProjectionEdgesTallKite.xml | 60 ++-- ...DiagonalNearestProjectionEdgesWideKite.xml | 60 ++-- .../QuadMappingNearestProjectionEdges.xml | 60 ++-- .../GaussianShapeParameter.xml | 68 ++--- .../GaussianSupportRadius.xml | 68 ++--- .../testQuadMappingScaledConsistentOnA.xml | 60 ++-- .../testQuadMappingScaledConsistentOnB.xml | 60 ++-- .../testTetraOnA.xml | 60 ++-- .../testTetraOnB.xml | 60 ++-- .../testVolumetricOnA2D.xml | 60 ++-- .../testVolumetricOnB2D.xml | 60 ++-- .../OneTetraConservativeRead.xml | 60 ++-- .../OneTetraConservativeWrite.xml | 60 ++-- tests/serial/mapping-volume/OneTetraRead.xml | 60 ++-- tests/serial/mapping-volume/OneTetraWrite.xml | 60 ++-- .../OneTriangleConservativeRead.xml | 60 ++-- .../OneTriangleConservativeWrite.xml | 60 ++-- .../serial/mapping-volume/OneTriangleRead.xml | 60 ++-- .../mapping-volume/OneTriangleWrite.xml | 60 ++-- .../mesh-requirements/NearestNeighborA.xml | 52 ++-- .../mesh-requirements/NearestNeighborB.xml | 52 ++-- .../NearestProjection2DA.xml | 56 ++-- .../NearestProjection2DB.xml | 56 ++-- tests/serial/multi-coupling/MultiCoupling.xml | 282 +++++++++--------- .../MultiCouplingFourSolvers1.xml | 240 +++++++-------- .../MultiCouplingFourSolvers2.xml | 242 +++++++-------- .../MultiCouplingThreeSolvers1.xml | 156 +++++----- .../MultiCouplingThreeSolvers2.xml | 172 +++++------ .../MultiCouplingThreeSolvers3.xml | 162 +++++----- .../MultipleReadFromMappings.xml | 76 +++-- .../MultipleReadToMappings.xml | 94 +++--- .../MultipleWriteFromMappings.xml | 84 +++--- .../MultipleWriteFromMappingsAndData.xml | 102 ++++--- .../MultipleWriteToMappings.xml | 106 ++++--- .../ThreeSolversExplicitExplicit.xml | 110 ++++--- .../ThreeSolversExplicitImplicit.xml | 128 ++++---- .../ThreeSolversFirstParticipant.xml | 112 ++++--- .../ThreeSolversImplicitExplicit.xml | 128 ++++---- .../three-solvers/ThreeSolversParallel.xml | 128 ++++---- .../ReadWriteScalarDataWithSubcycling.xml | 92 +++--- .../ReadWriteScalarDataWithSubcycling.xml | 82 +++-- .../DoNothingWithSubcycling.xml | 82 +++-- .../ReadWriteScalarDataFirstParticipant.xml | 82 +++-- ...riteScalarDataFirstParticipantInitData.xml | 82 +++-- .../ReadWriteScalarDataWithSubcycling.xml | 82 +++-- .../ReadWriteScalarDataWithWaveform.xml | 82 +++-- .../DoNothingWithSubcycling.xml | 142 +++++---- .../ReadWriteScalarDataWithSubcycling.xml | 142 +++++---- ...iteScalarDataWithWaveformSamplingFirst.xml | 142 +++++---- .../ReadWriteScalarDataWithSubcycling.xml | 86 +++--- ...iteScalarDataWithWaveformSamplingFirst.xml | 86 +++--- ...larDataWithWaveformSamplingFirstNoInit.xml | 86 +++--- ...riteScalarDataWithWaveformSamplingZero.xml | 86 +++--- ...eScalarDataWithWaveformSubcyclingFirst.xml | 86 +++--- ...eScalarDataWithWaveformSubcyclingMixed.xml | 86 +++--- ...teScalarDataWithWaveformSubcyclingZero.xml | 86 +++--- .../ReadWriteScalarDataFirstParticipant.xml | 86 +++--- ...teScalarDataFirstParticipantChangingDt.xml | 86 +++--- ...ScalarDataFirstParticipantFixedWindows.xml | 86 +++--- .../ReadWriteScalarDataWithSubcycling.xml | 86 +++--- ...iteScalarDataWithWaveformSamplingFirst.xml | 86 +++--- ...larDataWithWaveformSamplingFirstNoInit.xml | 86 +++--- ...riteScalarDataWithWaveformSamplingZero.xml | 86 +++--- ...eScalarDataWithWaveformSubcyclingFirst.xml | 86 +++--- ...eScalarDataWithWaveformSubcyclingMixed.xml | 86 +++--- ...teScalarDataWithWaveformSubcyclingZero.xml | 86 +++--- .../WatchIntegralScaleAndNoScale.xml | 64 ++-- .../whitebox/TestConfigurationComsol.xml | 118 ++++---- .../whitebox/TestConfigurationPeano.xml | 118 ++++---- .../whitebox/TestExplicitWithDataScaling.xml | 66 ++-- 193 files changed, 6887 insertions(+), 7573 deletions(-) create mode 100644 docs/changelog/1662.md delete mode 100644 src/precice/config/SolverInterfaceConfiguration.cpp delete mode 100644 src/precice/config/SolverInterfaceConfiguration.hpp diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index af6522b0bc..2efbe6b1b7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,7 +17,7 @@ repos: - id: end-of-file-fixer # Custom repo for the preCICE configuration formatter - repo: https://github.com/precice/precice-pre-commit-hooks - rev: 'v2.1' + rev: 'v3.1' hooks: - id: format-precice-config - repo: https://github.com/codespell-project/codespell diff --git a/docs/changelog/1662.md b/docs/changelog/1662.md new file mode 100644 index 0000000000..d4ee3c4954 --- /dev/null +++ b/docs/changelog/1662.md @@ -0,0 +1 @@ +- Removed the XML configuration tag `` and moved all attributes to the parent `` tag. diff --git a/examples/solverdummies/precice-config.xml b/examples/solverdummies/precice-config.xml index 0e7aab6c78..7f199aee27 100644 --- a/examples/solverdummies/precice-config.xml +++ b/examples/solverdummies/precice-config.xml @@ -1,5 +1,5 @@ - + - - - + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/src/action/tests/SummationActionTest-testConfiguration-1.xml b/src/action/tests/SummationActionTest-testConfiguration-1.xml index 25057116c6..a31585904f 100644 --- a/src/action/tests/SummationActionTest-testConfiguration-1.xml +++ b/src/action/tests/SummationActionTest-testConfiguration-1.xml @@ -16,7 +16,6 @@ - diff --git a/src/cplscheme/tests/explicit-coupling-scheme-1.xml b/src/cplscheme/tests/explicit-coupling-scheme-1.xml index 355c362835..5ab98fe313 100644 --- a/src/cplscheme/tests/explicit-coupling-scheme-1.xml +++ b/src/cplscheme/tests/explicit-coupling-scheme-1.xml @@ -12,29 +12,21 @@ - - - - - - - - diff --git a/src/cplscheme/tests/explicit-coupling-scheme-2.xml b/src/cplscheme/tests/explicit-coupling-scheme-2.xml index 41024bde02..a38b82024c 100644 --- a/src/cplscheme/tests/explicit-coupling-scheme-2.xml +++ b/src/cplscheme/tests/explicit-coupling-scheme-2.xml @@ -12,27 +12,20 @@ - - - - - - - diff --git a/src/cplscheme/tests/multi-solver-coupling-1.xml b/src/cplscheme/tests/multi-solver-coupling-1.xml index 017c17b814..6ca4027209 100644 --- a/src/cplscheme/tests/multi-solver-coupling-1.xml +++ b/src/cplscheme/tests/multi-solver-coupling-1.xml @@ -12,26 +12,20 @@ - - - - - - @@ -40,26 +34,18 @@ - - - - - - - - diff --git a/src/cplscheme/tests/multi-solver-coupling-2.xml b/src/cplscheme/tests/multi-solver-coupling-2.xml index 79e24df04e..f3286259e8 100644 --- a/src/cplscheme/tests/multi-solver-coupling-2.xml +++ b/src/cplscheme/tests/multi-solver-coupling-2.xml @@ -12,26 +12,20 @@ - - - - - - @@ -40,34 +34,22 @@ - - - - - - - - - - - - diff --git a/src/cplscheme/tests/multi-solver-coupling-3.xml b/src/cplscheme/tests/multi-solver-coupling-3.xml index b78f4fe872..6fb28d7224 100644 --- a/src/cplscheme/tests/multi-solver-coupling-3.xml +++ b/src/cplscheme/tests/multi-solver-coupling-3.xml @@ -12,26 +12,20 @@ - - - - - - @@ -40,30 +34,20 @@ - - - - - - - - - - diff --git a/src/cplscheme/tests/multi-solver-coupling-4.xml b/src/cplscheme/tests/multi-solver-coupling-4.xml index fd94ff0ac5..4cc44caa79 100644 --- a/src/cplscheme/tests/multi-solver-coupling-4.xml +++ b/src/cplscheme/tests/multi-solver-coupling-4.xml @@ -12,26 +12,20 @@ - - - - - - @@ -40,30 +34,20 @@ - - - - - - - - - - diff --git a/src/cplscheme/tests/parallel-explicit-coupling-datainit.xml b/src/cplscheme/tests/parallel-explicit-coupling-datainit.xml index 42d4cba095..934696403f 100644 --- a/src/cplscheme/tests/parallel-explicit-coupling-datainit.xml +++ b/src/cplscheme/tests/parallel-explicit-coupling-datainit.xml @@ -14,27 +14,20 @@ - - - - - - - diff --git a/src/cplscheme/tests/parallel-implicit-cplscheme-relax-const-config.xml b/src/cplscheme/tests/parallel-implicit-cplscheme-relax-const-config.xml index 9d5e309367..b53141249b 100644 --- a/src/cplscheme/tests/parallel-implicit-cplscheme-relax-const-config.xml +++ b/src/cplscheme/tests/parallel-implicit-cplscheme-relax-const-config.xml @@ -12,38 +12,27 @@ - - - - - - - - - - - diff --git a/src/cplscheme/tests/serial-explicit-coupling-datainit.xml b/src/cplscheme/tests/serial-explicit-coupling-datainit.xml index 15dfe1c780..79957cb1c6 100644 --- a/src/cplscheme/tests/serial-explicit-coupling-datainit.xml +++ b/src/cplscheme/tests/serial-explicit-coupling-datainit.xml @@ -14,27 +14,20 @@ - - - - - - - diff --git a/src/cplscheme/tests/serial-implicit-cplscheme-absolute-config.xml b/src/cplscheme/tests/serial-implicit-cplscheme-absolute-config.xml index de3e6e563b..c237e2d532 100644 --- a/src/cplscheme/tests/serial-implicit-cplscheme-absolute-config.xml +++ b/src/cplscheme/tests/serial-implicit-cplscheme-absolute-config.xml @@ -12,34 +12,24 @@ - - - - - - - - - - diff --git a/src/cplscheme/tests/serial-implicit-cplscheme-relax-const-config.xml b/src/cplscheme/tests/serial-implicit-cplscheme-relax-const-config.xml index b966785b42..64ca4bb0d7 100644 --- a/src/cplscheme/tests/serial-implicit-cplscheme-relax-const-config.xml +++ b/src/cplscheme/tests/serial-implicit-cplscheme-relax-const-config.xml @@ -12,38 +12,27 @@ - - - - - - - - - - - diff --git a/src/mesh/config/DataConfiguration.cpp b/src/mesh/config/DataConfiguration.cpp index 52b7466c82..a1775e50f7 100644 --- a/src/mesh/config/DataConfiguration.cpp +++ b/src/mesh/config/DataConfiguration.cpp @@ -22,7 +22,7 @@ DataConfiguration::DataConfiguration(xml::XMLTag &parent) XMLTag tagVector(*this, VALUE_VECTOR, XMLTag::OCCUR_ARBITRARY, TAG); tagVector.setDocumentation("Defines a vector data set to be assigned to meshes. The number of " "components of each data entry depends on the spatial dimensions set " - "in tag ."); + "in tag ."); tagVector.addAttribute(attrName); parent.addSubtag(tagVector); } diff --git a/src/precice/config/Configuration.cpp b/src/precice/config/Configuration.cpp index 9a259b2c23..cf26c365ad 100644 --- a/src/precice/config/Configuration.cpp +++ b/src/precice/config/Configuration.cpp @@ -1,5 +1,21 @@ #include "Configuration.hpp" +#include +#include +#include +#include +#include "ParticipantConfiguration.hpp" +#include "cplscheme/config/CouplingSchemeConfiguration.hpp" #include "logging/LogMacros.hpp" +#include "m2n/config/M2NConfiguration.hpp" +#include "mesh/Mesh.hpp" +#include "mesh/config/DataConfiguration.hpp" +#include "mesh/config/MeshConfiguration.hpp" +#include "precice/config/SharedPointer.hpp" +#include "precice/impl/MeshContext.hpp" +#include "precice/impl/ParticipantState.hpp" +#include "precice/impl/SharedPointer.hpp" +#include "utils/assertion.hpp" +#include "xml/ConfigParser.hpp" #include "xml/XMLAttribute.hpp" namespace precice { @@ -11,8 +27,7 @@ namespace config { Configuration::Configuration() : _tag(*this, "precice-configuration", xml::XMLTag::OCCUR_ONCE), _logConfig(_tag), // This must be the first configuration to be constructed - _profilingConfig(_tag), - _solverInterfaceConfig(_tag) + _profilingConfig(_tag) { _tag.setDocumentation("Main tag containing preCICE configuration."); _tag.addNamespace("data"); @@ -26,6 +41,26 @@ Configuration::Configuration() auto attrSyncMode = xml::makeXMLAttribute("sync-mode", false) .setDocumentation("sync-mode enabled additional inter- and intra-participant synchronizations"); _tag.addAttribute(attrSyncMode); + + auto attrDimensions = xml::makeXMLAttribute("dimensions", 2) + .setDocumentation("Determines the spatial dimensionality of the configuration") + .setOptions({2, 3}); + _tag.addAttribute(attrDimensions); + + auto attrExperimental = xml::makeXMLAttribute("experimental", false) + .setDocumentation("Enable experimental features."); + _tag.addAttribute(attrExperimental); + + _dataConfiguration = std::make_shared( + _tag); + _meshConfiguration = std::make_shared( + _tag, _dataConfiguration); + _m2nConfiguration = std::make_shared( + _tag); + _participantConfiguration = std::make_shared( + _tag, _meshConfiguration); + _couplingSchemeConfiguration = std::make_shared( + _tag, _meshConfiguration, _m2nConfiguration, _participantConfiguration); } xml::XMLTag &Configuration::getXMLTag() @@ -38,6 +73,15 @@ void Configuration::xmlTagCallback(const xml::ConfigurationContext &context, xml PRECICE_TRACE(tag.getName()); if (tag.getName() == "precice-configuration") { precice::syncMode = tag.getBooleanAttributeValue("sync-mode"); + _dimensions = tag.getIntAttributeValue("dimensions"); + _dataConfiguration->setDimensions(_dimensions); + _meshConfiguration->setDimensions(_dimensions); + _participantConfiguration->setDimensions(_dimensions); + _experimental = tag.getBooleanAttributeValue("experimental"); + _couplingSchemeConfiguration->setExperimental(_experimental); + _participantConfiguration->setExperimental(_experimental); + } else { + PRECICE_UNREACHABLE("Received callback from unknown tag '{}'.", tag.getName()); } } @@ -46,12 +90,37 @@ void Configuration::xmlEndTagCallback( xml::XMLTag & tag) { PRECICE_TRACE(tag.getName()); + if (tag.getName() == "precice-configuration") { + //test if both participants do have the exchange meshes + typedef std::map>::value_type neededMeshPair; + for (const neededMeshPair &neededMeshes : _meshConfiguration->getNeededMeshes()) { + bool participantFound = false; + for (const impl::PtrParticipant &participant : _participantConfiguration->getParticipants()) { + if (participant->getName() == neededMeshes.first) { + for (const std::string &neededMesh : neededMeshes.second) { + PRECICE_CHECK(participant->isMeshUsed(neededMesh), + "Participant \"{}\" needs to use the mesh \"{}\" to be able to use it in the coupling scheme. " + "Please either add a provide-mesh or a receive-mesh tag in this participant's configuration, or use a different mesh in the coupling scheme.", + neededMeshes.first, neededMesh); + } + participantFound = true; + break; + } + } + PRECICE_ASSERT(participantFound); + } + } +} + +int Configuration::getDimensions() const +{ + return _dimensions; } -const SolverInterfaceConfiguration & -Configuration::getSolverInterfaceConfiguration() const +const PtrParticipantConfiguration & +Configuration::getParticipantConfiguration() const { - return _solverInterfaceConfig; + return _participantConfiguration; } } // namespace config diff --git a/src/precice/config/Configuration.hpp b/src/precice/config/Configuration.hpp index 1a63624265..ea73a4bd09 100644 --- a/src/precice/config/Configuration.hpp +++ b/src/precice/config/Configuration.hpp @@ -1,9 +1,15 @@ #pragma once #include +#include "SharedPointer.hpp" +#include "boost/smart_ptr.hpp" +#include "cplscheme/SharedPointer.hpp" #include "logging/Logger.hpp" #include "logging/config/LogConfiguration.hpp" -#include "precice/config/SolverInterfaceConfiguration.hpp" +#include "m2n/M2N.hpp" +#include "m2n/config/M2NConfiguration.hpp" +#include "mapping/SharedPointer.hpp" +#include "mesh/SharedPointer.hpp" #include "profiling/config/ProfilingConfiguration.hpp" #include "xml/XMLTag.hpp" @@ -45,13 +51,71 @@ class Configuration : public xml::XMLTag::Listener { virtual void xmlEndTagCallback(const xml::ConfigurationContext &context, xml::XMLTag &tag); /** - * @brief Returns solver interface configuration. + * @brief Returns number of spatial dimensions configured. */ - const SolverInterfaceConfiguration &getSolverInterfaceConfiguration() const; + int getDimensions() const; + + /// @brief Returns whether experimental features are allowed or not + bool allowsExperimental() const + { + return _experimental; + } + + const mesh::PtrDataConfiguration getDataConfiguration() const + { + return _dataConfiguration; + } + + const mesh::PtrMeshConfiguration getMeshConfiguration() const + { + return _meshConfiguration; + } + + const m2n::M2NConfiguration::SharedPointer getM2NConfiguration() const + { + return _m2nConfiguration; + } + + const PtrParticipantConfiguration &getParticipantConfiguration() const; + + const cplscheme::PtrCouplingSchemeConfiguration getCouplingSchemeConfiguration() const + { + return _couplingSchemeConfiguration; + } + + /** + * @brief For manual configuration in test cases. + */ + void setDataConfiguration(mesh::PtrDataConfiguration config) + { + _dataConfiguration = config; + } + + /** + * @brief For manual configuration in test cases. + */ + void setMeshConfiguration(mesh::PtrMeshConfiguration config) + { + _meshConfiguration = config; + } + + /** + * @brief For manual configuration in test cases. + */ + void setParticipantConfiguration(PtrParticipantConfiguration config) + { + _participantConfiguration = config; + } private: logging::Logger _log{"config::Configuration"}; + /// Spatial dimension of problem to be solved. Either 2 or 3. + int _dimensions = -1; + + /// Allow the use of experimental features + bool _experimental = false; + // @brief Root tag of preCICE configuration. xml::XMLTag _tag; @@ -61,7 +125,15 @@ class Configuration : public xml::XMLTag::Listener { // Handle other configuration afterwards precice::profiling::ProfilingConfiguration _profilingConfig; - SolverInterfaceConfiguration _solverInterfaceConfig; + mesh::PtrDataConfiguration _dataConfiguration; + + mesh::PtrMeshConfiguration _meshConfiguration; + + m2n::M2NConfiguration::SharedPointer _m2nConfiguration; + + PtrParticipantConfiguration _participantConfiguration; + + cplscheme::PtrCouplingSchemeConfiguration _couplingSchemeConfiguration; }; } // namespace config diff --git a/src/precice/config/ParticipantConfiguration.hpp b/src/precice/config/ParticipantConfiguration.hpp index e6c4a3defa..5a6957b780 100644 --- a/src/precice/config/ParticipantConfiguration.hpp +++ b/src/precice/config/ParticipantConfiguration.hpp @@ -10,7 +10,6 @@ #include "mapping/config/MappingConfigurationTypes.hpp" #include "mesh/SharedPointer.hpp" #include "partition/ReceivedPartition.hpp" -#include "precice/config/SolverInterfaceConfiguration.hpp" #include "precice/impl/ParticipantState.hpp" #include "precice/impl/SharedPointer.hpp" #include "time/Time.hpp" diff --git a/src/precice/config/SolverInterfaceConfiguration.cpp b/src/precice/config/SolverInterfaceConfiguration.cpp deleted file mode 100644 index 0712dda6f4..0000000000 --- a/src/precice/config/SolverInterfaceConfiguration.cpp +++ /dev/null @@ -1,106 +0,0 @@ -#include "SolverInterfaceConfiguration.hpp" -#include -#include -#include -#include -#include "ParticipantConfiguration.hpp" -#include "cplscheme/config/CouplingSchemeConfiguration.hpp" -#include "logging/LogMacros.hpp" -#include "m2n/config/M2NConfiguration.hpp" -#include "mesh/Mesh.hpp" -#include "mesh/config/DataConfiguration.hpp" -#include "mesh/config/MeshConfiguration.hpp" -#include "precice/config/SharedPointer.hpp" -#include "precice/impl/MeshContext.hpp" -#include "precice/impl/ParticipantState.hpp" -#include "precice/impl/SharedPointer.hpp" -#include "utils/assertion.hpp" -#include "xml/ConfigParser.hpp" -#include "xml/XMLAttribute.hpp" - -namespace precice::config { - -SolverInterfaceConfiguration::SolverInterfaceConfiguration(xml::XMLTag &parent) -{ - using namespace xml; - XMLTag tag(*this, "solver-interface", XMLTag::OCCUR_ONCE); - tag.setDocumentation("Configuration of simulation relevant features."); - auto attrDimensions = makeXMLAttribute("dimensions", 2) - .setDocumentation("Determines the spatial dimensionality of the configuration") - .setOptions({2, 3}); - tag.addAttribute(attrDimensions); - auto attrExperimental = makeXMLAttribute("experimental", false) - .setDocumentation("Enable experimental features."); - tag.addAttribute(attrExperimental); - - _dataConfiguration = std::make_shared( - tag); - _meshConfiguration = std::make_shared( - tag, _dataConfiguration); - _m2nConfiguration = std::make_shared( - tag); - _participantConfiguration = std::make_shared( - tag, _meshConfiguration); - _couplingSchemeConfiguration = std::make_shared( - tag, _meshConfiguration, _m2nConfiguration, _participantConfiguration); - - parent.addSubtag(tag); -} - -void SolverInterfaceConfiguration::xmlTagCallback( - const xml::ConfigurationContext &context, - xml::XMLTag & tag) -{ - PRECICE_TRACE(); - if (tag.getName() == "solver-interface") { - _dimensions = tag.getIntAttributeValue("dimensions"); - _dataConfiguration->setDimensions(_dimensions); - _meshConfiguration->setDimensions(_dimensions); - _participantConfiguration->setDimensions(_dimensions); - _experimental = tag.getBooleanAttributeValue("experimental"); - _couplingSchemeConfiguration->setExperimental(_experimental); - _participantConfiguration->setExperimental(_experimental); - } else { - PRECICE_UNREACHABLE("Received callback from unknown tag '{}'.", tag.getName()); - } -} - -void SolverInterfaceConfiguration::xmlEndTagCallback( - const xml::ConfigurationContext &context, - xml::XMLTag & tag) -{ - PRECICE_TRACE(); - if (tag.getName() == "solver-interface") { - //test if both participants do have the exchange meshes - typedef std::map>::value_type neededMeshPair; - for (const neededMeshPair &neededMeshes : _meshConfiguration->getNeededMeshes()) { - bool participantFound = false; - for (const impl::PtrParticipant &participant : _participantConfiguration->getParticipants()) { - if (participant->getName() == neededMeshes.first) { - for (const std::string &neededMesh : neededMeshes.second) { - PRECICE_CHECK(participant->isMeshUsed(neededMesh), - "Participant \"{}\" needs to use the mesh \"{}\" to be able to use it in the coupling scheme. " - "Please either add a provide-mesh or a receive-mesh tag in this participant's configuration, or use a different mesh in the coupling scheme.", - neededMeshes.first, neededMesh); - } - participantFound = true; - break; - } - } - PRECICE_ASSERT(participantFound); - } - } -} - -int SolverInterfaceConfiguration::getDimensions() const -{ - return _dimensions; -} - -const PtrParticipantConfiguration & -SolverInterfaceConfiguration::getParticipantConfiguration() const -{ - return _participantConfiguration; -} - -} // namespace precice::config diff --git a/src/precice/config/SolverInterfaceConfiguration.hpp b/src/precice/config/SolverInterfaceConfiguration.hpp deleted file mode 100644 index bef3cf4613..0000000000 --- a/src/precice/config/SolverInterfaceConfiguration.hpp +++ /dev/null @@ -1,127 +0,0 @@ -#pragma once - -#include -#include "SharedPointer.hpp" -#include "boost/smart_ptr.hpp" -#include "cplscheme/SharedPointer.hpp" -#include "logging/Logger.hpp" -#include "m2n/M2N.hpp" -#include "m2n/config/M2NConfiguration.hpp" -#include "mapping/SharedPointer.hpp" -#include "mesh/SharedPointer.hpp" -#include "precice/impl/ParticipantState.hpp" -#include "precice/impl/SharedPointer.hpp" -#include "xml/XMLTag.hpp" - -namespace precice { -namespace config { - -/** - * @brief Configures class ParticipantImpl from XML. - */ -class SolverInterfaceConfiguration : public xml::XMLTag::Listener { -public: - SolverInterfaceConfiguration(xml::XMLTag &parent); - - /** - * @brief Destructor. - * - * Deletes geometry configuration and coupling scheme configuration. - */ - virtual ~SolverInterfaceConfiguration() {} - - /** - * @brief Callback method required when using xml::XMLTag. - */ - virtual void xmlTagCallback(const xml::ConfigurationContext &context, xml::XMLTag &callingTag); - - /** - * @brief Callback method required when using xml::XMLTag. - */ - virtual void xmlEndTagCallback(const xml::ConfigurationContext &context, xml::XMLTag &callingTag); - - /** - * @brief Returns number of spatial dimensions configured. - */ - int getDimensions() const; - - /// @brief Returns whether experimental features are allowed or not - bool allowsExperimental() const - { - return _experimental; - } - - const mesh::PtrDataConfiguration getDataConfiguration() const - { - return _dataConfiguration; - } - - const mesh::PtrMeshConfiguration getMeshConfiguration() const - { - return _meshConfiguration; - } - - const m2n::M2NConfiguration::SharedPointer getM2NConfiguration() const - { - return _m2nConfiguration; - } - - const PtrParticipantConfiguration &getParticipantConfiguration() const; - - const cplscheme::PtrCouplingSchemeConfiguration getCouplingSchemeConfiguration() const - { - return _couplingSchemeConfiguration; - } - - /** - * @brief For manual configuration in test cases. - */ - void setDataConfiguration(mesh::PtrDataConfiguration config) - { - _dataConfiguration = config; - } - - /** - * @brief For manual configuration in test cases. - */ - void setMeshConfiguration(mesh::PtrMeshConfiguration config) - { - _meshConfiguration = config; - } - - /** - * @brief For manual configuration in test cases. - */ - void setParticipantConfiguration(PtrParticipantConfiguration config) - { - _participantConfiguration = config; - } - -private: - logging::Logger _log{"config::SolverInterfaceConfiguration"}; - - /// Spatial dimension of problem to be solved. Either 2 or 3. - int _dimensions = -1; - - /// Allow the use of experimental features - bool _experimental = false; - - // @brief Participating solvers in the coupled simulation. - //std::vector _participants; - - // @brief Index (in _participants) of solver accessing the interface. - //int _indexAccessor; - - mesh::PtrDataConfiguration _dataConfiguration; - - mesh::PtrMeshConfiguration _meshConfiguration; - - m2n::M2NConfiguration::SharedPointer _m2nConfiguration; - - PtrParticipantConfiguration _participantConfiguration; - - cplscheme::PtrCouplingSchemeConfiguration _couplingSchemeConfiguration; -}; - -} // namespace config -} // namespace precice diff --git a/src/precice/impl/ParticipantImpl.cpp b/src/precice/impl/ParticipantImpl.cpp index 784ec26b34..52a62d5dff 100644 --- a/src/precice/impl/ParticipantImpl.cpp +++ b/src/precice/impl/ParticipantImpl.cpp @@ -48,7 +48,6 @@ #include "precice/config/Configuration.hpp" #include "precice/config/ParticipantConfiguration.hpp" #include "precice/config/SharedPointer.hpp" -#include "precice/config/SolverInterfaceConfiguration.hpp" #include "precice/impl/CommonErrorMessages.hpp" #include "precice/impl/MappingContext.hpp" #include "precice/impl/MeshContext.hpp" @@ -205,12 +204,7 @@ void ParticipantImpl::configure( PRECICE_INFO("Configuring preCICE with configuration \"{}\"", configurationFileName); PRECICE_INFO("I am participant \"{}\"", _accessorName); } - configure(config.getSolverInterfaceConfiguration()); -} -void ParticipantImpl::configure( - const config::SolverInterfaceConfiguration &config) -{ PRECICE_TRACE(); _meshLock.clear(); @@ -1422,7 +1416,7 @@ void ParticipantImpl::resetWrittenData(bool isAtWindowEnd) } PtrParticipant ParticipantImpl::determineAccessingParticipant( - const config::SolverInterfaceConfiguration &config) + const config::Configuration &config) { const auto &partConfig = config.getParticipantConfiguration(); for (const PtrParticipant &participant : partConfig->getParticipants()) { diff --git a/src/precice/impl/ParticipantImpl.hpp b/src/precice/impl/ParticipantImpl.hpp index 7022ececb4..7041e0accf 100644 --- a/src/precice/impl/ParticipantImpl.hpp +++ b/src/precice/impl/ParticipantImpl.hpp @@ -27,7 +27,7 @@ class Event; } namespace config { -class SolverInterfaceConfiguration; +class Configuration; } } // namespace precice @@ -348,7 +348,7 @@ class ParticipantImpl { * Can be used to configure the ParticipantImpl without xml file. Requires * to manually setup the configuration object. */ - void configure(const config::SolverInterfaceConfiguration &configuration); + void configure(const config::Configuration &configuration); void configureM2Ns(const m2n::M2NConfiguration::SharedPointer &config); @@ -393,7 +393,7 @@ class ParticipantImpl { /// Determines participant accessing this interface from the configuration. impl::PtrParticipant determineAccessingParticipant( - const config::SolverInterfaceConfiguration &config); + const config::Configuration &config); /// Initializes intra-participant communication. void initializeIntraCommunication(); diff --git a/src/precice/impl/ValidationMacros.hpp b/src/precice/impl/ValidationMacros.hpp index d437654e85..94a2634d54 100644 --- a/src/precice/impl/ValidationMacros.hpp +++ b/src/precice/impl/ValidationMacros.hpp @@ -159,8 +159,8 @@ #endif -#define PRECICE_EXPERIMENTAL_API() \ - PRECICE_CHECK(_allowsExperimental, "You called the API function \"{}\", which is part of the experimental API. " \ - "You may unlock the full API by specifying in the configuration. " \ - "Please be aware that experimental features may change in any future version (even minor or bugfix).", \ +#define PRECICE_EXPERIMENTAL_API() \ + PRECICE_CHECK(_allowsExperimental, "You called the API function \"{}\", which is part of the experimental API. " \ + "You may unlock the full API by specifying in the configuration. " \ + "Please be aware that experimental features may change in any future version (even minor or bugfix).", \ __func__) diff --git a/src/precice/tests/config-checker.xml b/src/precice/tests/config-checker.xml index 2e157cb07b..e888fef96f 100644 --- a/src/precice/tests/config-checker.xml +++ b/src/precice/tests/config-checker.xml @@ -1,60 +1,58 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/src/sources.cmake b/src/sources.cmake index 1a781bbaa2..480cc51131 100644 --- a/src/sources.cmake +++ b/src/sources.cmake @@ -244,8 +244,6 @@ target_sources(preciceCore src/precice/config/ParticipantConfiguration.cpp src/precice/config/ParticipantConfiguration.hpp src/precice/config/SharedPointer.hpp - src/precice/config/SolverInterfaceConfiguration.cpp - src/precice/config/SolverInterfaceConfiguration.hpp src/precice/impl/CommonErrorMessages.hpp src/precice/impl/DataContext.cpp src/precice/impl/DataContext.hpp diff --git a/src/xml/XMLTag.cpp b/src/xml/XMLTag.cpp index 95c4e933b9..c21fb4dac9 100644 --- a/src/xml/XMLTag.cpp +++ b/src/xml/XMLTag.cpp @@ -178,7 +178,7 @@ Eigen::VectorXd XMLTag::getEigenVectorXdAttributeValue(const std::string &name, const auto size = iter->second.getValue().size(); PRECICE_CHECK(size == dimensions, "Vector attribute \"{}\" of tag <{}> is {}D, " - "which does not match the dimension of the {}D solver-interface.", + "which does not match the dimension of the {}D precice-configuration.", name, getFullName(), size, dimensions); // Read only first "dimensions" components of the parsed vector values diff --git a/src/xml/tests/xmlparser_nstest.xml b/src/xml/tests/xmlparser_nstest.xml index 29a042694a..2c436276a9 100644 --- a/src/xml/tests/xmlparser_nstest.xml +++ b/src/xml/tests/xmlparser_nstest.xml @@ -2,7 +2,6 @@ - diff --git a/src/xml/tests/xmlparser_occtest.xml b/src/xml/tests/xmlparser_occtest.xml index 945cf73f7c..98535d8792 100644 --- a/src/xml/tests/xmlparser_occtest.xml +++ b/src/xml/tests/xmlparser_occtest.xml @@ -2,12 +2,9 @@ - - - diff --git a/src/xml/tests/xmlparser_test.xml b/src/xml/tests/xmlparser_test.xml index f419b0f867..e3fb46be25 100644 --- a/src/xml/tests/xmlparser_test.xml +++ b/src/xml/tests/xmlparser_test.xml @@ -3,15 +3,11 @@ - - - - diff --git a/src/xml/tests/xmltest-nesting-config.xml b/src/xml/tests/xmltest-nesting-config.xml index a65ffe686a..a0b7a284b1 100644 --- a/src/xml/tests/xmltest-nesting-config.xml +++ b/src/xml/tests/xmltest-nesting-config.xml @@ -8,7 +8,6 @@ - diff --git a/tests/parallel/CouplingOnLine.xml b/tests/parallel/CouplingOnLine.xml index 903a5c60bd..1a62fbe3d1 100644 --- a/tests/parallel/CouplingOnLine.xml +++ b/tests/parallel/CouplingOnLine.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/parallel/ExportTimeseries.xml b/tests/parallel/ExportTimeseries.xml index d64eed9129..3a802bc5ed 100644 --- a/tests/parallel/ExportTimeseries.xml +++ b/tests/parallel/ExportTimeseries.xml @@ -1,48 +1,46 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/GlobalRBFPartitioning.xml b/tests/parallel/GlobalRBFPartitioning.xml index 68dd0a9e7d..338a078bf0 100644 --- a/tests/parallel/GlobalRBFPartitioning.xml +++ b/tests/parallel/GlobalRBFPartitioning.xml @@ -1,54 +1,52 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/GlobalRBFPartitioningPETSc.xml b/tests/parallel/GlobalRBFPartitioningPETSc.xml index 849b861ac4..ab32dab3ce 100644 --- a/tests/parallel/GlobalRBFPartitioningPETSc.xml +++ b/tests/parallel/GlobalRBFPartitioningPETSc.xml @@ -1,54 +1,52 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/LocalRBFPartitioning.xml b/tests/parallel/LocalRBFPartitioning.xml index 0156506b20..90b186020a 100644 --- a/tests/parallel/LocalRBFPartitioning.xml +++ b/tests/parallel/LocalRBFPartitioning.xml @@ -1,54 +1,52 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/LocalRBFPartitioningPETSc.xml b/tests/parallel/LocalRBFPartitioningPETSc.xml index 54d5afbc07..27151c1f60 100644 --- a/tests/parallel/LocalRBFPartitioningPETSc.xml +++ b/tests/parallel/LocalRBFPartitioningPETSc.xml @@ -1,54 +1,52 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/NearestProjectionRePartitioning.xml b/tests/parallel/NearestProjectionRePartitioning.xml index 6d1f2d2e57..79037a7c97 100644 --- a/tests/parallel/NearestProjectionRePartitioning.xml +++ b/tests/parallel/NearestProjectionRePartitioning.xml @@ -1,42 +1,40 @@ - - - + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - + - - - - - - - + + + + + + diff --git a/tests/parallel/PrimaryRankSockets.xml b/tests/parallel/PrimaryRankSockets.xml index f9f64aa726..8aaf3b4907 100644 --- a/tests/parallel/PrimaryRankSockets.xml +++ b/tests/parallel/PrimaryRankSockets.xml @@ -1,51 +1,49 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/TestBoundingBoxInitialization.xml b/tests/parallel/TestBoundingBoxInitialization.xml index 624f154a71..4e4ae398d7 100644 --- a/tests/parallel/TestBoundingBoxInitialization.xml +++ b/tests/parallel/TestBoundingBoxInitialization.xml @@ -1,40 +1,38 @@ - - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/parallel/TestBoundingBoxInitializationTwoWay.xml b/tests/parallel/TestBoundingBoxInitializationTwoWay.xml index 188a42dee6..fae70fb659 100644 --- a/tests/parallel/TestBoundingBoxInitializationTwoWay.xml +++ b/tests/parallel/TestBoundingBoxInitializationTwoWay.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/TestFinalize.xml b/tests/parallel/TestFinalize.xml index 42d3dee007..e968f2eaa1 100644 --- a/tests/parallel/TestFinalize.xml +++ b/tests/parallel/TestFinalize.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/UserDefinedMPICommunicator.xml b/tests/parallel/UserDefinedMPICommunicator.xml index b22f7ac82e..c6f71394f6 100644 --- a/tests/parallel/UserDefinedMPICommunicator.xml +++ b/tests/parallel/UserDefinedMPICommunicator.xml @@ -1,51 +1,49 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/UserDefinedMPICommunicatorPetRBF.xml b/tests/parallel/UserDefinedMPICommunicatorPetRBF.xml index 9baa8ace49..62987d85d7 100644 --- a/tests/parallel/UserDefinedMPICommunicatorPetRBF.xml +++ b/tests/parallel/UserDefinedMPICommunicatorPetRBF.xml @@ -1,55 +1,53 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/direct-mesh-access/AccessReceivedMeshAndMapping.xml b/tests/parallel/direct-mesh-access/AccessReceivedMeshAndMapping.xml index d73906f827..868f8eeffc 100644 --- a/tests/parallel/direct-mesh-access/AccessReceivedMeshAndMapping.xml +++ b/tests/parallel/direct-mesh-access/AccessReceivedMeshAndMapping.xml @@ -1,44 +1,42 @@ - - - - + + + - - - + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/direct-mesh-access/AccessReceivedMeshEmptyPartition.xml b/tests/parallel/direct-mesh-access/AccessReceivedMeshEmptyPartition.xml index acee39ca1f..f525710f36 100644 --- a/tests/parallel/direct-mesh-access/AccessReceivedMeshEmptyPartition.xml +++ b/tests/parallel/direct-mesh-access/AccessReceivedMeshEmptyPartition.xml @@ -1,29 +1,27 @@ - - - + + - - - + + + - - - - + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/parallel/direct-mesh-access/AccessReceivedMeshEmptyPartitionTwoLevelInit.xml b/tests/parallel/direct-mesh-access/AccessReceivedMeshEmptyPartitionTwoLevelInit.xml index e6a7249ee3..6f4b2be59b 100644 --- a/tests/parallel/direct-mesh-access/AccessReceivedMeshEmptyPartitionTwoLevelInit.xml +++ b/tests/parallel/direct-mesh-access/AccessReceivedMeshEmptyPartitionTwoLevelInit.xml @@ -1,29 +1,27 @@ - - - + + - - - + + + - - - - + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/parallel/direct-mesh-access/AccessReceivedMeshNoOverlap.xml b/tests/parallel/direct-mesh-access/AccessReceivedMeshNoOverlap.xml index acee39ca1f..f525710f36 100644 --- a/tests/parallel/direct-mesh-access/AccessReceivedMeshNoOverlap.xml +++ b/tests/parallel/direct-mesh-access/AccessReceivedMeshNoOverlap.xml @@ -1,29 +1,27 @@ - - - + + - - - + + + - - - - + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/parallel/direct-mesh-access/AccessReceivedMeshNoOverlapTwoLevelInit.xml b/tests/parallel/direct-mesh-access/AccessReceivedMeshNoOverlapTwoLevelInit.xml index e6a7249ee3..6f4b2be59b 100644 --- a/tests/parallel/direct-mesh-access/AccessReceivedMeshNoOverlapTwoLevelInit.xml +++ b/tests/parallel/direct-mesh-access/AccessReceivedMeshNoOverlapTwoLevelInit.xml @@ -1,29 +1,27 @@ - - - + + - - - + + + - - - - + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/parallel/direct-mesh-access/AccessReceivedMeshOverlap.xml b/tests/parallel/direct-mesh-access/AccessReceivedMeshOverlap.xml index acee39ca1f..f525710f36 100644 --- a/tests/parallel/direct-mesh-access/AccessReceivedMeshOverlap.xml +++ b/tests/parallel/direct-mesh-access/AccessReceivedMeshOverlap.xml @@ -1,29 +1,27 @@ - - - + + - - - + + + - - - - + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/parallel/direct-mesh-access/AccessReceivedMeshOverlapNoWrite.xml b/tests/parallel/direct-mesh-access/AccessReceivedMeshOverlapNoWrite.xml index acee39ca1f..f525710f36 100644 --- a/tests/parallel/direct-mesh-access/AccessReceivedMeshOverlapNoWrite.xml +++ b/tests/parallel/direct-mesh-access/AccessReceivedMeshOverlapNoWrite.xml @@ -1,29 +1,27 @@ - - - + + - - - + + + - - - - + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/parallel/direct-mesh-access/AccessReceivedMeshOverlapNoWriteTwoLevelInit.xml b/tests/parallel/direct-mesh-access/AccessReceivedMeshOverlapNoWriteTwoLevelInit.xml index e6a7249ee3..6f4b2be59b 100644 --- a/tests/parallel/direct-mesh-access/AccessReceivedMeshOverlapNoWriteTwoLevelInit.xml +++ b/tests/parallel/direct-mesh-access/AccessReceivedMeshOverlapNoWriteTwoLevelInit.xml @@ -1,29 +1,27 @@ - - - + + - - - + + + - - - - + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/parallel/direct-mesh-access/AccessReceivedMeshOverlapTwoLevelInit.xml b/tests/parallel/direct-mesh-access/AccessReceivedMeshOverlapTwoLevelInit.xml index e6a7249ee3..6f4b2be59b 100644 --- a/tests/parallel/direct-mesh-access/AccessReceivedMeshOverlapTwoLevelInit.xml +++ b/tests/parallel/direct-mesh-access/AccessReceivedMeshOverlapTwoLevelInit.xml @@ -1,29 +1,27 @@ - - - + + - - - + + + - - - - + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/parallel/distributed-communication/TestDistributedCommunicationGatherScatterMPI.xml b/tests/parallel/distributed-communication/TestDistributedCommunicationGatherScatterMPI.xml index 6e4a7863ac..137357c484 100644 --- a/tests/parallel/distributed-communication/TestDistributedCommunicationGatherScatterMPI.xml +++ b/tests/parallel/distributed-communication/TestDistributedCommunicationGatherScatterMPI.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/distributed-communication/TestDistributedCommunicationP2PMPI.xml b/tests/parallel/distributed-communication/TestDistributedCommunicationP2PMPI.xml index fd3afcfe17..7761805c01 100644 --- a/tests/parallel/distributed-communication/TestDistributedCommunicationP2PMPI.xml +++ b/tests/parallel/distributed-communication/TestDistributedCommunicationP2PMPI.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/distributed-communication/TestDistributedCommunicationP2PSockets.xml b/tests/parallel/distributed-communication/TestDistributedCommunicationP2PSockets.xml index 1ed8885eac..fdd92b5de9 100644 --- a/tests/parallel/distributed-communication/TestDistributedCommunicationP2PSockets.xml +++ b/tests/parallel/distributed-communication/TestDistributedCommunicationP2PSockets.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/gather-scatter/EnforceGatherScatterEmptyPrimaryRank.xml b/tests/parallel/gather-scatter/EnforceGatherScatterEmptyPrimaryRank.xml index 9ba5cd8b51..1e20789933 100644 --- a/tests/parallel/gather-scatter/EnforceGatherScatterEmptyPrimaryRank.xml +++ b/tests/parallel/gather-scatter/EnforceGatherScatterEmptyPrimaryRank.xml @@ -1,51 +1,49 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/gather-scatter/EnforceGatherScatterEmptyReceivedPrimaryRank.xml b/tests/parallel/gather-scatter/EnforceGatherScatterEmptyReceivedPrimaryRank.xml index 9ba5cd8b51..1e20789933 100644 --- a/tests/parallel/gather-scatter/EnforceGatherScatterEmptyReceivedPrimaryRank.xml +++ b/tests/parallel/gather-scatter/EnforceGatherScatterEmptyReceivedPrimaryRank.xml @@ -1,51 +1,49 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/lifecycle/ConstructAndExplicitFinalize.xml b/tests/parallel/lifecycle/ConstructAndExplicitFinalize.xml index 670c8a4d02..afa6e4272b 100644 --- a/tests/parallel/lifecycle/ConstructAndExplicitFinalize.xml +++ b/tests/parallel/lifecycle/ConstructAndExplicitFinalize.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/lifecycle/ConstructOnly.xml b/tests/parallel/lifecycle/ConstructOnly.xml index 670c8a4d02..afa6e4272b 100644 --- a/tests/parallel/lifecycle/ConstructOnly.xml +++ b/tests/parallel/lifecycle/ConstructOnly.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/lifecycle/Full.xml b/tests/parallel/lifecycle/Full.xml index 670c8a4d02..afa6e4272b 100644 --- a/tests/parallel/lifecycle/Full.xml +++ b/tests/parallel/lifecycle/Full.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/lifecycle/ImplicitFinalize.xml b/tests/parallel/lifecycle/ImplicitFinalize.xml index 670c8a4d02..afa6e4272b 100644 --- a/tests/parallel/lifecycle/ImplicitFinalize.xml +++ b/tests/parallel/lifecycle/ImplicitFinalize.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/mapping-nearest-neighbor-gradient/GradientTestParallelScalar.xml b/tests/parallel/mapping-nearest-neighbor-gradient/GradientTestParallelScalar.xml index 3ab641a4f5..2230efbc3d 100644 --- a/tests/parallel/mapping-nearest-neighbor-gradient/GradientTestParallelScalar.xml +++ b/tests/parallel/mapping-nearest-neighbor-gradient/GradientTestParallelScalar.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/mapping-nearest-neighbor-gradient/GradientTestParallelVector.xml b/tests/parallel/mapping-nearest-neighbor-gradient/GradientTestParallelVector.xml index 64db71bad6..8012b4cf4a 100644 --- a/tests/parallel/mapping-nearest-neighbor-gradient/GradientTestParallelVector.xml +++ b/tests/parallel/mapping-nearest-neighbor-gradient/GradientTestParallelVector.xml @@ -1,51 +1,49 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/parallel/mapping-nearest-neighbor-gradient/GradientTestParallelWriteVector.xml b/tests/parallel/mapping-nearest-neighbor-gradient/GradientTestParallelWriteVector.xml index 086aac1f6d..95ac245d44 100644 --- a/tests/parallel/mapping-nearest-neighbor-gradient/GradientTestParallelWriteVector.xml +++ b/tests/parallel/mapping-nearest-neighbor-gradient/GradientTestParallelWriteVector.xml @@ -1,42 +1,40 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/parallel/mapping-volume/ParallelCube1To3.xml b/tests/parallel/mapping-volume/ParallelCube1To3.xml index 67bb1c7463..d62013537d 100644 --- a/tests/parallel/mapping-volume/ParallelCube1To3.xml +++ b/tests/parallel/mapping-volume/ParallelCube1To3.xml @@ -1,41 +1,39 @@ - - - + + - - - + + + - - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/parallel/mapping-volume/ParallelCube3To1.xml b/tests/parallel/mapping-volume/ParallelCube3To1.xml index 76a203e9d0..c623809390 100644 --- a/tests/parallel/mapping-volume/ParallelCube3To1.xml +++ b/tests/parallel/mapping-volume/ParallelCube3To1.xml @@ -1,40 +1,38 @@ - - - + + - - - + + + - - - + + + - - - - - + + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/parallel/mapping-volume/ParallelCubeConservative1To3.xml b/tests/parallel/mapping-volume/ParallelCubeConservative1To3.xml index 825efd3f65..f5f61c7a99 100644 --- a/tests/parallel/mapping-volume/ParallelCubeConservative1To3.xml +++ b/tests/parallel/mapping-volume/ParallelCubeConservative1To3.xml @@ -1,44 +1,42 @@ - - - + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/parallel/mapping-volume/ParallelCubeConservative3To1.xml b/tests/parallel/mapping-volume/ParallelCubeConservative3To1.xml index e0e316fd88..77696433f3 100644 --- a/tests/parallel/mapping-volume/ParallelCubeConservative3To1.xml +++ b/tests/parallel/mapping-volume/ParallelCubeConservative3To1.xml @@ -1,48 +1,46 @@ - - - + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - - - + + + + + - + - - - - - - - + + + + + + diff --git a/tests/parallel/mapping-volume/ParallelSquare1To2.xml b/tests/parallel/mapping-volume/ParallelSquare1To2.xml index d38a08bca6..5e90ade5ea 100644 --- a/tests/parallel/mapping-volume/ParallelSquare1To2.xml +++ b/tests/parallel/mapping-volume/ParallelSquare1To2.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/parallel/mapping-volume/ParallelSquare2To1.xml b/tests/parallel/mapping-volume/ParallelSquare2To1.xml index 8dd8a84fff..de3e2d1965 100644 --- a/tests/parallel/mapping-volume/ParallelSquare2To1.xml +++ b/tests/parallel/mapping-volume/ParallelSquare2To1.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/parallel/mapping-volume/ParallelSquareConservative1To2.xml b/tests/parallel/mapping-volume/ParallelSquareConservative1To2.xml index d8c1347096..0de72b088f 100644 --- a/tests/parallel/mapping-volume/ParallelSquareConservative1To2.xml +++ b/tests/parallel/mapping-volume/ParallelSquareConservative1To2.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/parallel/mapping-volume/ParallelTriangleConservative2To1.xml b/tests/parallel/mapping-volume/ParallelTriangleConservative2To1.xml index 19c89da576..d58d16a2d5 100644 --- a/tests/parallel/mapping-volume/ParallelTriangleConservative2To1.xml +++ b/tests/parallel/mapping-volume/ParallelTriangleConservative2To1.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/quasi-newton/parallel/TestQN1.xml b/tests/quasi-newton/parallel/TestQN1.xml index 131f86a374..127f144511 100644 --- a/tests/quasi-newton/parallel/TestQN1.xml +++ b/tests/quasi-newton/parallel/TestQN1.xml @@ -1,60 +1,58 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/tests/quasi-newton/parallel/TestQN1EmptyPartition.xml b/tests/quasi-newton/parallel/TestQN1EmptyPartition.xml index 131f86a374..127f144511 100644 --- a/tests/quasi-newton/parallel/TestQN1EmptyPartition.xml +++ b/tests/quasi-newton/parallel/TestQN1EmptyPartition.xml @@ -1,60 +1,58 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/tests/quasi-newton/parallel/TestQN2.xml b/tests/quasi-newton/parallel/TestQN2.xml index 7a96f73f7a..78775af5ec 100644 --- a/tests/quasi-newton/parallel/TestQN2.xml +++ b/tests/quasi-newton/parallel/TestQN2.xml @@ -1,62 +1,60 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/tests/quasi-newton/parallel/TestQN2EmptyPartition.xml b/tests/quasi-newton/parallel/TestQN2EmptyPartition.xml index 7a96f73f7a..78775af5ec 100644 --- a/tests/quasi-newton/parallel/TestQN2EmptyPartition.xml +++ b/tests/quasi-newton/parallel/TestQN2EmptyPartition.xml @@ -1,62 +1,60 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/tests/quasi-newton/parallel/TestQN3.xml b/tests/quasi-newton/parallel/TestQN3.xml index 0629c64cba..7c5951ea14 100644 --- a/tests/quasi-newton/parallel/TestQN3.xml +++ b/tests/quasi-newton/parallel/TestQN3.xml @@ -1,60 +1,58 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/tests/quasi-newton/parallel/TestQN3EmptyPartition.xml b/tests/quasi-newton/parallel/TestQN3EmptyPartition.xml index 0629c64cba..7c5951ea14 100644 --- a/tests/quasi-newton/parallel/TestQN3EmptyPartition.xml +++ b/tests/quasi-newton/parallel/TestQN3EmptyPartition.xml @@ -1,60 +1,58 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/tests/quasi-newton/serial/TestQN1.xml b/tests/quasi-newton/serial/TestQN1.xml index 0c229edae4..6326fd21bc 100644 --- a/tests/quasi-newton/serial/TestQN1.xml +++ b/tests/quasi-newton/serial/TestQN1.xml @@ -1,59 +1,57 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/tests/quasi-newton/serial/TestQN2.xml b/tests/quasi-newton/serial/TestQN2.xml index 0a17e10c6b..9352185424 100644 --- a/tests/quasi-newton/serial/TestQN2.xml +++ b/tests/quasi-newton/serial/TestQN2.xml @@ -1,61 +1,59 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/tests/quasi-newton/serial/TestQN3.xml b/tests/quasi-newton/serial/TestQN3.xml index 5a2d979339..99aabfa822 100644 --- a/tests/quasi-newton/serial/TestQN3.xml +++ b/tests/quasi-newton/serial/TestQN3.xml @@ -1,59 +1,57 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/tests/serial/AitkenAcceleration.xml b/tests/serial/AitkenAcceleration.xml index 07ff89255c..1326c23322 100644 --- a/tests/serial/AitkenAcceleration.xml +++ b/tests/serial/AitkenAcceleration.xml @@ -1,56 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/tests/serial/PreconditionerBug.xml b/tests/serial/PreconditionerBug.xml index dab30c4cad..dd46b367cc 100644 --- a/tests/serial/PreconditionerBug.xml +++ b/tests/serial/PreconditionerBug.xml @@ -1,59 +1,57 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/tests/serial/SendMeshToMultipleParticipants.xml b/tests/serial/SendMeshToMultipleParticipants.xml index 939d6f07ee..22ec9eb919 100644 --- a/tests/serial/SendMeshToMultipleParticipants.xml +++ b/tests/serial/SendMeshToMultipleParticipants.xml @@ -1,62 +1,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/serial/SummationActionTwoSources.xml b/tests/serial/SummationActionTwoSources.xml index 34a45a0183..3719602e2b 100644 --- a/tests/serial/SummationActionTwoSources.xml +++ b/tests/serial/SummationActionTwoSources.xml @@ -1,71 +1,69 @@ - - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - + + - - - - - - + + + + + + - - - - - - - + + + + + + diff --git a/tests/serial/TestExplicitWithDataMultipleReadWrite.xml b/tests/serial/TestExplicitWithDataMultipleReadWrite.xml index 15b8e03a6a..e6d7b46cba 100644 --- a/tests/serial/TestExplicitWithDataMultipleReadWrite.xml +++ b/tests/serial/TestExplicitWithDataMultipleReadWrite.xml @@ -1,45 +1,43 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/TestExplicitWithSolverGeometry.xml b/tests/serial/TestExplicitWithSolverGeometry.xml index 6d4ac28907..ee24457ebb 100644 --- a/tests/serial/TestExplicitWithSolverGeometry.xml +++ b/tests/serial/TestExplicitWithSolverGeometry.xml @@ -1,56 +1,54 @@ - - - - - + + + + - + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + diff --git a/tests/serial/TestImplicit.xml b/tests/serial/TestImplicit.xml index b731a2fa80..30b707fab1 100644 --- a/tests/serial/TestImplicit.xml +++ b/tests/serial/TestImplicit.xml @@ -1,52 +1,50 @@ - - - - + + + - + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/TestReadAPI.xml b/tests/serial/TestReadAPI.xml index a825c959e2..897b02b100 100644 --- a/tests/serial/TestReadAPI.xml +++ b/tests/serial/TestReadAPI.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/action-timings/ActionTimingsExplicit.xml b/tests/serial/action-timings/ActionTimingsExplicit.xml index 408dd2f972..2245101fc2 100644 --- a/tests/serial/action-timings/ActionTimingsExplicit.xml +++ b/tests/serial/action-timings/ActionTimingsExplicit.xml @@ -1,5 +1,5 @@ - + - - - + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/action-timings/ActionTimingsImplicit.xml b/tests/serial/action-timings/ActionTimingsImplicit.xml index b9b77fc1f5..176f8f62f0 100644 --- a/tests/serial/action-timings/ActionTimingsImplicit.xml +++ b/tests/serial/action-timings/ActionTimingsImplicit.xml @@ -1,5 +1,5 @@ - + - - - + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/circular/Explicit.xml b/tests/serial/circular/Explicit.xml index a690aeb6ab..a0dfc130ca 100644 --- a/tests/serial/circular/Explicit.xml +++ b/tests/serial/circular/Explicit.xml @@ -1,72 +1,70 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + diff --git a/tests/serial/convergence-measures/testConvergenceMeasures1.xml b/tests/serial/convergence-measures/testConvergenceMeasures1.xml index df9a098de5..07f8ef0bd0 100644 --- a/tests/serial/convergence-measures/testConvergenceMeasures1.xml +++ b/tests/serial/convergence-measures/testConvergenceMeasures1.xml @@ -1,53 +1,51 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + diff --git a/tests/serial/convergence-measures/testConvergenceMeasures2.xml b/tests/serial/convergence-measures/testConvergenceMeasures2.xml index 399a0c8b1e..9f7577bdd9 100644 --- a/tests/serial/convergence-measures/testConvergenceMeasures2.xml +++ b/tests/serial/convergence-measures/testConvergenceMeasures2.xml @@ -1,57 +1,55 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + diff --git a/tests/serial/convergence-measures/testConvergenceMeasures3.xml b/tests/serial/convergence-measures/testConvergenceMeasures3.xml index 064c60f3fb..979e9a0fd1 100644 --- a/tests/serial/convergence-measures/testConvergenceMeasures3.xml +++ b/tests/serial/convergence-measures/testConvergenceMeasures3.xml @@ -1,57 +1,55 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + diff --git a/tests/serial/direct-mesh-access/DirectAccessReadWrite.xml b/tests/serial/direct-mesh-access/DirectAccessReadWrite.xml index c8926bcd41..4095da0515 100644 --- a/tests/serial/direct-mesh-access/DirectAccessReadWrite.xml +++ b/tests/serial/direct-mesh-access/DirectAccessReadWrite.xml @@ -1,36 +1,34 @@ - - - - + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/direct-mesh-access/DirectAccessWithDataInitialization.xml b/tests/serial/direct-mesh-access/DirectAccessWithDataInitialization.xml index dbdeda7c8f..7f3e28fff4 100644 --- a/tests/serial/direct-mesh-access/DirectAccessWithDataInitialization.xml +++ b/tests/serial/direct-mesh-access/DirectAccessWithDataInitialization.xml @@ -1,46 +1,44 @@ - - - - + + + - - - + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/direct-mesh-access/DirectAccessWithWaveform.xml b/tests/serial/direct-mesh-access/DirectAccessWithWaveform.xml index 649ad7f50d..09157e2bf9 100644 --- a/tests/serial/direct-mesh-access/DirectAccessWithWaveform.xml +++ b/tests/serial/direct-mesh-access/DirectAccessWithWaveform.xml @@ -1,46 +1,44 @@ - - - - + + + - - - + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/direct-mesh-access/Explicit.xml b/tests/serial/direct-mesh-access/Explicit.xml index acee39ca1f..f525710f36 100644 --- a/tests/serial/direct-mesh-access/Explicit.xml +++ b/tests/serial/direct-mesh-access/Explicit.xml @@ -1,29 +1,27 @@ - - - + + - - - + + + - - - - + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/direct-mesh-access/ExplicitAndMapping.xml b/tests/serial/direct-mesh-access/ExplicitAndMapping.xml index d73906f827..868f8eeffc 100644 --- a/tests/serial/direct-mesh-access/ExplicitAndMapping.xml +++ b/tests/serial/direct-mesh-access/ExplicitAndMapping.xml @@ -1,44 +1,42 @@ - - - - + + + - - - + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/direct-mesh-access/ExplicitRead.xml b/tests/serial/direct-mesh-access/ExplicitRead.xml index 5fae7ed432..4c31c89acf 100644 --- a/tests/serial/direct-mesh-access/ExplicitRead.xml +++ b/tests/serial/direct-mesh-access/ExplicitRead.xml @@ -1,29 +1,27 @@ - - - + + - - - + + + - - - - + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/direct-mesh-access/Implicit.xml b/tests/serial/direct-mesh-access/Implicit.xml index 860e972611..1d2487cea9 100644 --- a/tests/serial/direct-mesh-access/Implicit.xml +++ b/tests/serial/direct-mesh-access/Implicit.xml @@ -1,41 +1,39 @@ - - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/explicit/TestExplicitMPI.xml b/tests/serial/explicit/TestExplicitMPI.xml index 35e3bbe1d6..66bc949e89 100644 --- a/tests/serial/explicit/TestExplicitMPI.xml +++ b/tests/serial/explicit/TestExplicitMPI.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/explicit/TestExplicitMPISingle.xml b/tests/serial/explicit/TestExplicitMPISingle.xml index 0054ec38f5..c040f8f37a 100644 --- a/tests/serial/explicit/TestExplicitMPISingle.xml +++ b/tests/serial/explicit/TestExplicitMPISingle.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/explicit/TestExplicitSockets.xml b/tests/serial/explicit/TestExplicitSockets.xml index 0f8b70d62d..88e9fda077 100644 --- a/tests/serial/explicit/TestExplicitSockets.xml +++ b/tests/serial/explicit/TestExplicitSockets.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/initialize-data/Explicit.xml b/tests/serial/initialize-data/Explicit.xml index 5740c312f5..a6a55e04fd 100644 --- a/tests/serial/initialize-data/Explicit.xml +++ b/tests/serial/initialize-data/Explicit.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/initialize-data/Implicit.xml b/tests/serial/initialize-data/Implicit.xml index 0bbc8aa0bb..3a0d29cc82 100644 --- a/tests/serial/initialize-data/Implicit.xml +++ b/tests/serial/initialize-data/Implicit.xml @@ -1,57 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/initialize-data/ImplicitBoth.xml b/tests/serial/initialize-data/ImplicitBoth.xml index ecc094755a..37fc1461c2 100644 --- a/tests/serial/initialize-data/ImplicitBoth.xml +++ b/tests/serial/initialize-data/ImplicitBoth.xml @@ -1,57 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/initialize-data/ReadMapping.xml b/tests/serial/initialize-data/ReadMapping.xml index 98665673a5..0dabc924ce 100644 --- a/tests/serial/initialize-data/ReadMapping.xml +++ b/tests/serial/initialize-data/ReadMapping.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/initialize-data/WriteMapping.xml b/tests/serial/initialize-data/WriteMapping.xml index 5c1bd8b872..21b92c1f8f 100644 --- a/tests/serial/initialize-data/WriteMapping.xml +++ b/tests/serial/initialize-data/WriteMapping.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/lifecycle/ConstructAndExplicitFinalize.xml b/tests/serial/lifecycle/ConstructAndExplicitFinalize.xml index 670c8a4d02..afa6e4272b 100644 --- a/tests/serial/lifecycle/ConstructAndExplicitFinalize.xml +++ b/tests/serial/lifecycle/ConstructAndExplicitFinalize.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/lifecycle/ConstructOnly.xml b/tests/serial/lifecycle/ConstructOnly.xml index 670c8a4d02..afa6e4272b 100644 --- a/tests/serial/lifecycle/ConstructOnly.xml +++ b/tests/serial/lifecycle/ConstructOnly.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/lifecycle/Full.xml b/tests/serial/lifecycle/Full.xml index 670c8a4d02..afa6e4272b 100644 --- a/tests/serial/lifecycle/Full.xml +++ b/tests/serial/lifecycle/Full.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/lifecycle/ImplicitFinalize.xml b/tests/serial/lifecycle/ImplicitFinalize.xml index 670c8a4d02..afa6e4272b 100644 --- a/tests/serial/lifecycle/ImplicitFinalize.xml +++ b/tests/serial/lifecycle/ImplicitFinalize.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/mapping-nearest-neighbor-gradient/GradientTestBidirectionalReadScalar.xml b/tests/serial/mapping-nearest-neighbor-gradient/GradientTestBidirectionalReadScalar.xml index 7d8f158720..8936ff5a50 100644 --- a/tests/serial/mapping-nearest-neighbor-gradient/GradientTestBidirectionalReadScalar.xml +++ b/tests/serial/mapping-nearest-neighbor-gradient/GradientTestBidirectionalReadScalar.xml @@ -1,51 +1,49 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/mapping-nearest-neighbor-gradient/GradientTestBidirectionalReadVector.xml b/tests/serial/mapping-nearest-neighbor-gradient/GradientTestBidirectionalReadVector.xml index 8cd8dc8bee..4653c7c78b 100644 --- a/tests/serial/mapping-nearest-neighbor-gradient/GradientTestBidirectionalReadVector.xml +++ b/tests/serial/mapping-nearest-neighbor-gradient/GradientTestBidirectionalReadVector.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/mapping-nearest-neighbor-gradient/GradientTestBidirectionalWriteScalar.xml b/tests/serial/mapping-nearest-neighbor-gradient/GradientTestBidirectionalWriteScalar.xml index 9f7deacad0..358d18d32f 100644 --- a/tests/serial/mapping-nearest-neighbor-gradient/GradientTestBidirectionalWriteScalar.xml +++ b/tests/serial/mapping-nearest-neighbor-gradient/GradientTestBidirectionalWriteScalar.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/mapping-nearest-neighbor-gradient/GradientTestBidirectionalWriteVector.xml b/tests/serial/mapping-nearest-neighbor-gradient/GradientTestBidirectionalWriteVector.xml index 6f3e49c07c..000fc8237b 100644 --- a/tests/serial/mapping-nearest-neighbor-gradient/GradientTestBidirectionalWriteVector.xml +++ b/tests/serial/mapping-nearest-neighbor-gradient/GradientTestBidirectionalWriteVector.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/mapping-nearest-neighbor-gradient/GradientTestUnidirectionalReadBlockVector.xml b/tests/serial/mapping-nearest-neighbor-gradient/GradientTestUnidirectionalReadBlockVector.xml index 69fa2e13ae..75315390ab 100644 --- a/tests/serial/mapping-nearest-neighbor-gradient/GradientTestUnidirectionalReadBlockVector.xml +++ b/tests/serial/mapping-nearest-neighbor-gradient/GradientTestUnidirectionalReadBlockVector.xml @@ -1,40 +1,38 @@ - - - - + + + - - - + + + - - - + + + - + - - - - + + + + - - - - - - + + + + + + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-nearest-neighbor-gradient/GradientTestUnidirectionalReadScalar.xml b/tests/serial/mapping-nearest-neighbor-gradient/GradientTestUnidirectionalReadScalar.xml index d36a320ffd..06c5e061e4 100644 --- a/tests/serial/mapping-nearest-neighbor-gradient/GradientTestUnidirectionalReadScalar.xml +++ b/tests/serial/mapping-nearest-neighbor-gradient/GradientTestUnidirectionalReadScalar.xml @@ -1,40 +1,38 @@ - - - - + + + - - - + + + - - - + + + - + - - - - + + + + - - - - - - + + + + + + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-nearest-neighbor-gradient/GradientTestUnidirectionalReadVector.xml b/tests/serial/mapping-nearest-neighbor-gradient/GradientTestUnidirectionalReadVector.xml index 69fa2e13ae..75315390ab 100644 --- a/tests/serial/mapping-nearest-neighbor-gradient/GradientTestUnidirectionalReadVector.xml +++ b/tests/serial/mapping-nearest-neighbor-gradient/GradientTestUnidirectionalReadVector.xml @@ -1,40 +1,38 @@ - - - - + + + - - - + + + - - - + + + - + - - - - + + + + - - - - - - + + + + + + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-nearest-projection/MappingNearestProjectionEdges.xml b/tests/serial/mapping-nearest-projection/MappingNearestProjectionEdges.xml index 3deea493b9..8d20d5961a 100644 --- a/tests/serial/mapping-nearest-projection/MappingNearestProjectionEdges.xml +++ b/tests/serial/mapping-nearest-projection/MappingNearestProjectionEdges.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-nearest-projection/QuadMappingDiagonalNearestProjectionEdgesTallKite.xml b/tests/serial/mapping-nearest-projection/QuadMappingDiagonalNearestProjectionEdgesTallKite.xml index 3deea493b9..8d20d5961a 100644 --- a/tests/serial/mapping-nearest-projection/QuadMappingDiagonalNearestProjectionEdgesTallKite.xml +++ b/tests/serial/mapping-nearest-projection/QuadMappingDiagonalNearestProjectionEdgesTallKite.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-nearest-projection/QuadMappingDiagonalNearestProjectionEdgesWideKite.xml b/tests/serial/mapping-nearest-projection/QuadMappingDiagonalNearestProjectionEdgesWideKite.xml index 3deea493b9..8d20d5961a 100644 --- a/tests/serial/mapping-nearest-projection/QuadMappingDiagonalNearestProjectionEdgesWideKite.xml +++ b/tests/serial/mapping-nearest-projection/QuadMappingDiagonalNearestProjectionEdgesWideKite.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-nearest-projection/QuadMappingNearestProjectionEdges.xml b/tests/serial/mapping-nearest-projection/QuadMappingNearestProjectionEdges.xml index 3deea493b9..8d20d5961a 100644 --- a/tests/serial/mapping-nearest-projection/QuadMappingNearestProjectionEdges.xml +++ b/tests/serial/mapping-nearest-projection/QuadMappingNearestProjectionEdges.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-rbf-gaussian/GaussianShapeParameter.xml b/tests/serial/mapping-rbf-gaussian/GaussianShapeParameter.xml index f2823c9082..d6713d4a1e 100644 --- a/tests/serial/mapping-rbf-gaussian/GaussianShapeParameter.xml +++ b/tests/serial/mapping-rbf-gaussian/GaussianShapeParameter.xml @@ -1,43 +1,41 @@ - - - + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - + + + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-rbf-gaussian/GaussianSupportRadius.xml b/tests/serial/mapping-rbf-gaussian/GaussianSupportRadius.xml index 6d9c812753..378f3602b1 100644 --- a/tests/serial/mapping-rbf-gaussian/GaussianSupportRadius.xml +++ b/tests/serial/mapping-rbf-gaussian/GaussianSupportRadius.xml @@ -1,43 +1,41 @@ - - - + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - + + + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-scaled-consistent/testQuadMappingScaledConsistentOnA.xml b/tests/serial/mapping-scaled-consistent/testQuadMappingScaledConsistentOnA.xml index 125051d011..1e581194eb 100644 --- a/tests/serial/mapping-scaled-consistent/testQuadMappingScaledConsistentOnA.xml +++ b/tests/serial/mapping-scaled-consistent/testQuadMappingScaledConsistentOnA.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-scaled-consistent/testQuadMappingScaledConsistentOnB.xml b/tests/serial/mapping-scaled-consistent/testQuadMappingScaledConsistentOnB.xml index 7c30ba0990..9f39e957b9 100644 --- a/tests/serial/mapping-scaled-consistent/testQuadMappingScaledConsistentOnB.xml +++ b/tests/serial/mapping-scaled-consistent/testQuadMappingScaledConsistentOnB.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-scaled-consistent/testTetraOnA.xml b/tests/serial/mapping-scaled-consistent/testTetraOnA.xml index d01997870f..359ac39e8a 100644 --- a/tests/serial/mapping-scaled-consistent/testTetraOnA.xml +++ b/tests/serial/mapping-scaled-consistent/testTetraOnA.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-scaled-consistent/testTetraOnB.xml b/tests/serial/mapping-scaled-consistent/testTetraOnB.xml index a6e41da23a..3f3f39fbbc 100644 --- a/tests/serial/mapping-scaled-consistent/testTetraOnB.xml +++ b/tests/serial/mapping-scaled-consistent/testTetraOnB.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-scaled-consistent/testVolumetricOnA2D.xml b/tests/serial/mapping-scaled-consistent/testVolumetricOnA2D.xml index 1137fa01a4..684f37315e 100644 --- a/tests/serial/mapping-scaled-consistent/testVolumetricOnA2D.xml +++ b/tests/serial/mapping-scaled-consistent/testVolumetricOnA2D.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-scaled-consistent/testVolumetricOnB2D.xml b/tests/serial/mapping-scaled-consistent/testVolumetricOnB2D.xml index c37f2d7c70..0d5a063bd7 100644 --- a/tests/serial/mapping-scaled-consistent/testVolumetricOnB2D.xml +++ b/tests/serial/mapping-scaled-consistent/testVolumetricOnB2D.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-volume/OneTetraConservativeRead.xml b/tests/serial/mapping-volume/OneTetraConservativeRead.xml index 000c71e669..721086d2ac 100644 --- a/tests/serial/mapping-volume/OneTetraConservativeRead.xml +++ b/tests/serial/mapping-volume/OneTetraConservativeRead.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-volume/OneTetraConservativeWrite.xml b/tests/serial/mapping-volume/OneTetraConservativeWrite.xml index 55edef3bd6..4db42d251f 100644 --- a/tests/serial/mapping-volume/OneTetraConservativeWrite.xml +++ b/tests/serial/mapping-volume/OneTetraConservativeWrite.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-volume/OneTetraRead.xml b/tests/serial/mapping-volume/OneTetraRead.xml index 6ad3407944..c687e89e56 100644 --- a/tests/serial/mapping-volume/OneTetraRead.xml +++ b/tests/serial/mapping-volume/OneTetraRead.xml @@ -1,5 +1,5 @@ - + - - + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-volume/OneTetraWrite.xml b/tests/serial/mapping-volume/OneTetraWrite.xml index 41bce8683a..e8f202991d 100644 --- a/tests/serial/mapping-volume/OneTetraWrite.xml +++ b/tests/serial/mapping-volume/OneTetraWrite.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-volume/OneTriangleConservativeRead.xml b/tests/serial/mapping-volume/OneTriangleConservativeRead.xml index eaa04080a3..11721f6bcf 100644 --- a/tests/serial/mapping-volume/OneTriangleConservativeRead.xml +++ b/tests/serial/mapping-volume/OneTriangleConservativeRead.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-volume/OneTriangleConservativeWrite.xml b/tests/serial/mapping-volume/OneTriangleConservativeWrite.xml index d8c1347096..0de72b088f 100644 --- a/tests/serial/mapping-volume/OneTriangleConservativeWrite.xml +++ b/tests/serial/mapping-volume/OneTriangleConservativeWrite.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-volume/OneTriangleRead.xml b/tests/serial/mapping-volume/OneTriangleRead.xml index 8dd8a84fff..de3e2d1965 100644 --- a/tests/serial/mapping-volume/OneTriangleRead.xml +++ b/tests/serial/mapping-volume/OneTriangleRead.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/mapping-volume/OneTriangleWrite.xml b/tests/serial/mapping-volume/OneTriangleWrite.xml index eca7a8369c..7048ab40b9 100644 --- a/tests/serial/mapping-volume/OneTriangleWrite.xml +++ b/tests/serial/mapping-volume/OneTriangleWrite.xml @@ -1,39 +1,37 @@ - - - + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/mesh-requirements/NearestNeighborA.xml b/tests/serial/mesh-requirements/NearestNeighborA.xml index 580e03a9f5..35815ad417 100644 --- a/tests/serial/mesh-requirements/NearestNeighborA.xml +++ b/tests/serial/mesh-requirements/NearestNeighborA.xml @@ -1,35 +1,33 @@ - - - + + - - - + + + - - - + + + - + - - - - + + + + - - - - - - + + + + + + - - - - - - - + + + + + + diff --git a/tests/serial/mesh-requirements/NearestNeighborB.xml b/tests/serial/mesh-requirements/NearestNeighborB.xml index 580e03a9f5..35815ad417 100644 --- a/tests/serial/mesh-requirements/NearestNeighborB.xml +++ b/tests/serial/mesh-requirements/NearestNeighborB.xml @@ -1,35 +1,33 @@ - - - + + - - - + + + - - - + + + - + - - - - + + + + - - - - - - + + + + + + - - - - - - - + + + + + + diff --git a/tests/serial/mesh-requirements/NearestProjection2DA.xml b/tests/serial/mesh-requirements/NearestProjection2DA.xml index 59e74da8e5..444d2fe604 100644 --- a/tests/serial/mesh-requirements/NearestProjection2DA.xml +++ b/tests/serial/mesh-requirements/NearestProjection2DA.xml @@ -1,39 +1,33 @@ - - - + + - - - + + + - - - + + + - + - - - - + + + + - - - - - - + + + + + + - - - - - - - + + + + + + diff --git a/tests/serial/mesh-requirements/NearestProjection2DB.xml b/tests/serial/mesh-requirements/NearestProjection2DB.xml index 59e74da8e5..444d2fe604 100644 --- a/tests/serial/mesh-requirements/NearestProjection2DB.xml +++ b/tests/serial/mesh-requirements/NearestProjection2DB.xml @@ -1,39 +1,33 @@ - - - + + - - - + + + - - - + + + - + - - - - + + + + - - - - - - + + + + + + - - - - - - - + + + + + + diff --git a/tests/serial/multi-coupling/MultiCoupling.xml b/tests/serial/multi-coupling/MultiCoupling.xml index 17abecb069..9eae178783 100644 --- a/tests/serial/multi-coupling/MultiCoupling.xml +++ b/tests/serial/multi-coupling/MultiCoupling.xml @@ -1,156 +1,154 @@ - - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/serial/multi-coupling/MultiCouplingFourSolvers1.xml b/tests/serial/multi-coupling/MultiCouplingFourSolvers1.xml index d64244a18e..4e51741a92 100644 --- a/tests/serial/multi-coupling/MultiCouplingFourSolvers1.xml +++ b/tests/serial/multi-coupling/MultiCouplingFourSolvers1.xml @@ -1,141 +1,127 @@ - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/serial/multi-coupling/MultiCouplingFourSolvers2.xml b/tests/serial/multi-coupling/MultiCouplingFourSolvers2.xml index 210f66572c..0135dfbf9c 100644 --- a/tests/serial/multi-coupling/MultiCouplingFourSolvers2.xml +++ b/tests/serial/multi-coupling/MultiCouplingFourSolvers2.xml @@ -1,142 +1,128 @@ - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/serial/multi-coupling/MultiCouplingThreeSolvers1.xml b/tests/serial/multi-coupling/MultiCouplingThreeSolvers1.xml index 0a32cb1ac3..713486b550 100644 --- a/tests/serial/multi-coupling/MultiCouplingThreeSolvers1.xml +++ b/tests/serial/multi-coupling/MultiCouplingThreeSolvers1.xml @@ -1,94 +1,84 @@ - - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/serial/multi-coupling/MultiCouplingThreeSolvers2.xml b/tests/serial/multi-coupling/MultiCouplingThreeSolvers2.xml index 4e2c45672a..5e61a0773d 100644 --- a/tests/serial/multi-coupling/MultiCouplingThreeSolvers2.xml +++ b/tests/serial/multi-coupling/MultiCouplingThreeSolvers2.xml @@ -1,104 +1,90 @@ - - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/serial/multi-coupling/MultiCouplingThreeSolvers3.xml b/tests/serial/multi-coupling/MultiCouplingThreeSolvers3.xml index a5484c276f..0624565a5e 100644 --- a/tests/serial/multi-coupling/MultiCouplingThreeSolvers3.xml +++ b/tests/serial/multi-coupling/MultiCouplingThreeSolvers3.xml @@ -1,95 +1,89 @@ - - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/serial/multiple-mappings/MultipleReadFromMappings.xml b/tests/serial/multiple-mappings/MultipleReadFromMappings.xml index dc64d10ad8..67998106a5 100644 --- a/tests/serial/multiple-mappings/MultipleReadFromMappings.xml +++ b/tests/serial/multiple-mappings/MultipleReadFromMappings.xml @@ -1,50 +1,44 @@ - - - + + - - - + + + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/multiple-mappings/MultipleReadToMappings.xml b/tests/serial/multiple-mappings/MultipleReadToMappings.xml index 0b098325da..07caf8adc8 100644 --- a/tests/serial/multiple-mappings/MultipleReadToMappings.xml +++ b/tests/serial/multiple-mappings/MultipleReadToMappings.xml @@ -1,59 +1,53 @@ - - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/multiple-mappings/MultipleWriteFromMappings.xml b/tests/serial/multiple-mappings/MultipleWriteFromMappings.xml index a4921bd678..f7bc04dac9 100644 --- a/tests/serial/multiple-mappings/MultipleWriteFromMappings.xml +++ b/tests/serial/multiple-mappings/MultipleWriteFromMappings.xml @@ -1,52 +1,50 @@ - - - + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/multiple-mappings/MultipleWriteFromMappingsAndData.xml b/tests/serial/multiple-mappings/MultipleWriteFromMappingsAndData.xml index a5ec1cfe62..8df9c4188e 100644 --- a/tests/serial/multiple-mappings/MultipleWriteFromMappingsAndData.xml +++ b/tests/serial/multiple-mappings/MultipleWriteFromMappingsAndData.xml @@ -1,61 +1,59 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/multiple-mappings/MultipleWriteToMappings.xml b/tests/serial/multiple-mappings/MultipleWriteToMappings.xml index b4bd99332c..23d8dfc09c 100644 --- a/tests/serial/multiple-mappings/MultipleWriteToMappings.xml +++ b/tests/serial/multiple-mappings/MultipleWriteToMappings.xml @@ -1,63 +1,61 @@ - - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/three-solvers/ThreeSolversExplicitExplicit.xml b/tests/serial/three-solvers/ThreeSolversExplicitExplicit.xml index 2a721f68b4..c5548cf702 100644 --- a/tests/serial/three-solvers/ThreeSolversExplicitExplicit.xml +++ b/tests/serial/three-solvers/ThreeSolversExplicitExplicit.xml @@ -1,62 +1,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/serial/three-solvers/ThreeSolversExplicitImplicit.xml b/tests/serial/three-solvers/ThreeSolversExplicitImplicit.xml index c6e2e9cf5c..f02060c184 100644 --- a/tests/serial/three-solvers/ThreeSolversExplicitImplicit.xml +++ b/tests/serial/three-solvers/ThreeSolversExplicitImplicit.xml @@ -1,80 +1,70 @@ - - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/three-solvers/ThreeSolversFirstParticipant.xml b/tests/serial/three-solvers/ThreeSolversFirstParticipant.xml index bde6b8be71..b269638350 100644 --- a/tests/serial/three-solvers/ThreeSolversFirstParticipant.xml +++ b/tests/serial/three-solvers/ThreeSolversFirstParticipant.xml @@ -1,69 +1,67 @@ - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - + + - - - - - - + + + + + + - - - - - - - + + + + + + diff --git a/tests/serial/three-solvers/ThreeSolversImplicitExplicit.xml b/tests/serial/three-solvers/ThreeSolversImplicitExplicit.xml index 25c9d49241..3e0536d911 100644 --- a/tests/serial/three-solvers/ThreeSolversImplicitExplicit.xml +++ b/tests/serial/three-solvers/ThreeSolversImplicitExplicit.xml @@ -1,80 +1,70 @@ - - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + diff --git a/tests/serial/three-solvers/ThreeSolversParallel.xml b/tests/serial/three-solvers/ThreeSolversParallel.xml index 5d9d4f50c2..4d91062168 100644 --- a/tests/serial/three-solvers/ThreeSolversParallel.xml +++ b/tests/serial/three-solvers/ThreeSolversParallel.xml @@ -1,80 +1,70 @@ - - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + diff --git a/tests/serial/time/explicit/compositional/ReadWriteScalarDataWithSubcycling.xml b/tests/serial/time/explicit/compositional/ReadWriteScalarDataWithSubcycling.xml index 4a1d95d278..36ed9432ea 100644 --- a/tests/serial/time/explicit/compositional/ReadWriteScalarDataWithSubcycling.xml +++ b/tests/serial/time/explicit/compositional/ReadWriteScalarDataWithSubcycling.xml @@ -1,56 +1,54 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - + + + + + + - - - - - - - + + + + + + diff --git a/tests/serial/time/explicit/parallel-coupling/ReadWriteScalarDataWithSubcycling.xml b/tests/serial/time/explicit/parallel-coupling/ReadWriteScalarDataWithSubcycling.xml index ae587f7250..a249f0352c 100644 --- a/tests/serial/time/explicit/parallel-coupling/ReadWriteScalarDataWithSubcycling.xml +++ b/tests/serial/time/explicit/parallel-coupling/ReadWriteScalarDataWithSubcycling.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/time/explicit/serial-coupling/DoNothingWithSubcycling.xml b/tests/serial/time/explicit/serial-coupling/DoNothingWithSubcycling.xml index 0054ec38f5..c040f8f37a 100644 --- a/tests/serial/time/explicit/serial-coupling/DoNothingWithSubcycling.xml +++ b/tests/serial/time/explicit/serial-coupling/DoNothingWithSubcycling.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/time/explicit/serial-coupling/ReadWriteScalarDataFirstParticipant.xml b/tests/serial/time/explicit/serial-coupling/ReadWriteScalarDataFirstParticipant.xml index 6c9d666760..c02e453974 100644 --- a/tests/serial/time/explicit/serial-coupling/ReadWriteScalarDataFirstParticipant.xml +++ b/tests/serial/time/explicit/serial-coupling/ReadWriteScalarDataFirstParticipant.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/time/explicit/serial-coupling/ReadWriteScalarDataFirstParticipantInitData.xml b/tests/serial/time/explicit/serial-coupling/ReadWriteScalarDataFirstParticipantInitData.xml index daf95dbfe6..13ccc44afa 100644 --- a/tests/serial/time/explicit/serial-coupling/ReadWriteScalarDataFirstParticipantInitData.xml +++ b/tests/serial/time/explicit/serial-coupling/ReadWriteScalarDataFirstParticipantInitData.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/time/explicit/serial-coupling/ReadWriteScalarDataWithSubcycling.xml b/tests/serial/time/explicit/serial-coupling/ReadWriteScalarDataWithSubcycling.xml index e460b28aa6..d4312e11e1 100644 --- a/tests/serial/time/explicit/serial-coupling/ReadWriteScalarDataWithSubcycling.xml +++ b/tests/serial/time/explicit/serial-coupling/ReadWriteScalarDataWithSubcycling.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/time/explicit/serial-coupling/ReadWriteScalarDataWithWaveform.xml b/tests/serial/time/explicit/serial-coupling/ReadWriteScalarDataWithWaveform.xml index 3e24c0915b..f8f1124e86 100644 --- a/tests/serial/time/explicit/serial-coupling/ReadWriteScalarDataWithWaveform.xml +++ b/tests/serial/time/explicit/serial-coupling/ReadWriteScalarDataWithWaveform.xml @@ -1,50 +1,48 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + diff --git a/tests/serial/time/implicit/multi-coupling/DoNothingWithSubcycling.xml b/tests/serial/time/implicit/multi-coupling/DoNothingWithSubcycling.xml index 13997389ad..e80b4caaab 100644 --- a/tests/serial/time/implicit/multi-coupling/DoNothingWithSubcycling.xml +++ b/tests/serial/time/implicit/multi-coupling/DoNothingWithSubcycling.xml @@ -1,82 +1,80 @@ - - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/tests/serial/time/implicit/multi-coupling/ReadWriteScalarDataWithSubcycling.xml b/tests/serial/time/implicit/multi-coupling/ReadWriteScalarDataWithSubcycling.xml index 77688c97fc..74b94a552b 100644 --- a/tests/serial/time/implicit/multi-coupling/ReadWriteScalarDataWithSubcycling.xml +++ b/tests/serial/time/implicit/multi-coupling/ReadWriteScalarDataWithSubcycling.xml @@ -1,82 +1,80 @@ - - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/tests/serial/time/implicit/multi-coupling/ReadWriteScalarDataWithWaveformSamplingFirst.xml b/tests/serial/time/implicit/multi-coupling/ReadWriteScalarDataWithWaveformSamplingFirst.xml index 21d33a450e..f991387d3a 100644 --- a/tests/serial/time/implicit/multi-coupling/ReadWriteScalarDataWithWaveformSamplingFirst.xml +++ b/tests/serial/time/implicit/multi-coupling/ReadWriteScalarDataWithWaveformSamplingFirst.xml @@ -1,82 +1,80 @@ - - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithSubcycling.xml b/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithSubcycling.xml index b3537fdca0..1ecb75d520 100644 --- a/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithSubcycling.xml +++ b/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithSubcycling.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSamplingFirst.xml b/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSamplingFirst.xml index 23e3311f0b..705cfdbdcd 100644 --- a/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSamplingFirst.xml +++ b/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSamplingFirst.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSamplingFirstNoInit.xml b/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSamplingFirstNoInit.xml index ebe1f44dc6..bad3e69fce 100644 --- a/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSamplingFirstNoInit.xml +++ b/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSamplingFirstNoInit.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSamplingZero.xml b/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSamplingZero.xml index 0947440c1c..b4e039bff2 100644 --- a/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSamplingZero.xml +++ b/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSamplingZero.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSubcyclingFirst.xml b/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSubcyclingFirst.xml index 23e3311f0b..705cfdbdcd 100644 --- a/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSubcyclingFirst.xml +++ b/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSubcyclingFirst.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSubcyclingMixed.xml b/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSubcyclingMixed.xml index 680802cb41..317253359f 100644 --- a/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSubcyclingMixed.xml +++ b/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSubcyclingMixed.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSubcyclingZero.xml b/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSubcyclingZero.xml index 0947440c1c..b4e039bff2 100644 --- a/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSubcyclingZero.xml +++ b/tests/serial/time/implicit/parallel-coupling/ReadWriteScalarDataWithWaveformSubcyclingZero.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataFirstParticipant.xml b/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataFirstParticipant.xml index 490a3f5633..212a8e8755 100644 --- a/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataFirstParticipant.xml +++ b/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataFirstParticipant.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataFirstParticipantChangingDt.xml b/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataFirstParticipantChangingDt.xml index 4dcde83f69..00af0361c4 100644 --- a/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataFirstParticipantChangingDt.xml +++ b/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataFirstParticipantChangingDt.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataFirstParticipantFixedWindows.xml b/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataFirstParticipantFixedWindows.xml index 2c7821e739..b4c83d9b8c 100644 --- a/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataFirstParticipantFixedWindows.xml +++ b/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataFirstParticipantFixedWindows.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithSubcycling.xml b/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithSubcycling.xml index adf7024b8c..af6854b8d6 100644 --- a/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithSubcycling.xml +++ b/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithSubcycling.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSamplingFirst.xml b/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSamplingFirst.xml index 0ea3cb2645..9b652bd6e5 100644 --- a/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSamplingFirst.xml +++ b/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSamplingFirst.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSamplingFirstNoInit.xml b/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSamplingFirstNoInit.xml index 1cce8369d6..ff29960ac5 100644 --- a/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSamplingFirstNoInit.xml +++ b/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSamplingFirstNoInit.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSamplingZero.xml b/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSamplingZero.xml index c5d4dc2618..074229799a 100644 --- a/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSamplingZero.xml +++ b/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSamplingZero.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSubcyclingFirst.xml b/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSubcyclingFirst.xml index 0ea3cb2645..9b652bd6e5 100644 --- a/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSubcyclingFirst.xml +++ b/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSubcyclingFirst.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSubcyclingMixed.xml b/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSubcyclingMixed.xml index 43552f1229..2a7f1bd678 100644 --- a/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSubcyclingMixed.xml +++ b/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSubcyclingMixed.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSubcyclingZero.xml b/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSubcyclingZero.xml index d473581750..65361eabe8 100644 --- a/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSubcyclingZero.xml +++ b/tests/serial/time/implicit/serial-coupling/ReadWriteScalarDataWithWaveformSubcyclingZero.xml @@ -1,52 +1,50 @@ - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/watch-integral/WatchIntegralScaleAndNoScale.xml b/tests/serial/watch-integral/WatchIntegralScaleAndNoScale.xml index fd4670e0c7..934c3eba71 100644 --- a/tests/serial/watch-integral/WatchIntegralScaleAndNoScale.xml +++ b/tests/serial/watch-integral/WatchIntegralScaleAndNoScale.xml @@ -1,41 +1,39 @@ - - - + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + diff --git a/tests/serial/whitebox/TestConfigurationComsol.xml b/tests/serial/whitebox/TestConfigurationComsol.xml index 42d8575c0d..372af5f092 100644 --- a/tests/serial/whitebox/TestConfigurationComsol.xml +++ b/tests/serial/whitebox/TestConfigurationComsol.xml @@ -1,68 +1,66 @@ - - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/whitebox/TestConfigurationPeano.xml b/tests/serial/whitebox/TestConfigurationPeano.xml index 42d8575c0d..372af5f092 100644 --- a/tests/serial/whitebox/TestConfigurationPeano.xml +++ b/tests/serial/whitebox/TestConfigurationPeano.xml @@ -1,68 +1,66 @@ - - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + diff --git a/tests/serial/whitebox/TestExplicitWithDataScaling.xml b/tests/serial/whitebox/TestExplicitWithDataScaling.xml index f0c3fa9725..189ebfcf6e 100644 --- a/tests/serial/whitebox/TestExplicitWithDataScaling.xml +++ b/tests/serial/whitebox/TestExplicitWithDataScaling.xml @@ -1,42 +1,40 @@ - - - + + - - - + + + - - - + + + - + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + +