diff --git a/apps/cpu/CouetteFlow/cflow.cpp b/apps/cpu/CouetteFlow/cflow.cpp index 4297d3ac14b67a41f0bf764e823d457e212806e0..e81c3bb008948814d79577311498dbfd5f1a76f2 100644 --- a/apps/cpu/CouetteFlow/cflow.cpp +++ b/apps/cpu/CouetteFlow/cflow.cpp @@ -1,7 +1,8 @@ #include <iostream> #include <string> -#include <VirtualFluids.h> +#include "VirtualFluids.h" +#include "NonNewtonianFluids/NonNewtonianFluids.h" using namespace std; diff --git a/apps/cpu/FallingSphere/FallingSphere.cpp b/apps/cpu/FallingSphere/FallingSphere.cpp index 0935d578640f8930b69a4b7ba64e28fa0fcc753b..ba837fcf15b32a65983b633c768aea6250a976a7 100644 --- a/apps/cpu/FallingSphere/FallingSphere.cpp +++ b/apps/cpu/FallingSphere/FallingSphere.cpp @@ -4,9 +4,7 @@ #include "VirtualFluids.h" -#include "LiggghtsCouplingSimulationObserver.h" -#include "LiggghtsCouplingWrapper.h" -#include "IBcumulantK17LBMKernel.h" +#include "LiggghtsCoupling/LiggghtsCoupling.h" using namespace std; diff --git a/apps/cpu/HerschelBulkleyModel/hbflow.cpp b/apps/cpu/HerschelBulkleyModel/hbflow.cpp index a8cf213475677b55ff4e81ceaaf80b4c4d050ea5..83686a88495ef5fc2a3ce8529453f2d59d30dab7 100644 --- a/apps/cpu/HerschelBulkleyModel/hbflow.cpp +++ b/apps/cpu/HerschelBulkleyModel/hbflow.cpp @@ -1,7 +1,8 @@ #include <iostream> #include <string> -#include <VirtualFluids.h> +#include "VirtualFluids.h" +#include "NonNewtonianFluids/NonNewtonianFluids.h" using namespace std; diff --git a/apps/cpu/HerschelBulkleySphere/hbsphere.cpp b/apps/cpu/HerschelBulkleySphere/hbsphere.cpp index 2b4e96aaa1e195072eb3eb56783952e4ccd49722..221b106123b5fadffcf60427481800ef0d673b76 100644 --- a/apps/cpu/HerschelBulkleySphere/hbsphere.cpp +++ b/apps/cpu/HerschelBulkleySphere/hbsphere.cpp @@ -1,7 +1,8 @@ #include <iostream> #include <string> -#include <VirtualFluids.h> +#include "VirtualFluids.h" +#include "NonNewtonianFluids/NonNewtonianFluids.h" using namespace std; diff --git a/apps/cpu/JetBreakup/JetBreakup.cpp b/apps/cpu/JetBreakup/JetBreakup.cpp index b0b25bb07aac72e0db07f92b0d8aefa281938811..f4b74ca379edaf8840cb6875ca0ff9fc7f296509 100644 --- a/apps/cpu/JetBreakup/JetBreakup.cpp +++ b/apps/cpu/JetBreakup/JetBreakup.cpp @@ -3,6 +3,7 @@ #include <string> #include "VirtualFluids.h" +#include "MultiphaseFlow/MultiphaseFlow.h" using namespace std; diff --git a/apps/cpu/LiggghtsApp/LiggghtsApp.cpp b/apps/cpu/LiggghtsApp/LiggghtsApp.cpp index e9116295dd531257cae28e8703327b4e1c32a594..969243a0516871033c9c4d001d92468dc0164e8c 100644 --- a/apps/cpu/LiggghtsApp/LiggghtsApp.cpp +++ b/apps/cpu/LiggghtsApp/LiggghtsApp.cpp @@ -10,9 +10,7 @@ //#include "modify.h" //#include "fix_lb_coupling_onetoone.h" -#include "LiggghtsCouplingSimulationObserver.h" -#include "LiggghtsCouplingWrapper.h" -#include "IBcumulantK17LBMKernel.h" +#include "LiggghtsCoupling/LiggghtsCoupling.h" using namespace std; diff --git a/apps/cpu/Multiphase/Multiphase.cpp b/apps/cpu/Multiphase/Multiphase.cpp index 4c30d97e5a9c97125b1d91c260cef1639fbf7a3e..79d969dd93c5bd87b0d327f5275d2c6b9a8a1448 100644 --- a/apps/cpu/Multiphase/Multiphase.cpp +++ b/apps/cpu/Multiphase/Multiphase.cpp @@ -3,6 +3,7 @@ #include <memory> #include "VirtualFluids.h" +#include "MultiphaseFlow/MultiphaseFlow.h" using namespace std; diff --git a/apps/cpu/MultiphaseDropletTest/droplet.cpp b/apps/cpu/MultiphaseDropletTest/droplet.cpp index a5658a8f39055201e15619fb4dd18a6955576374..eaa3e550f873113bf2ffdeba4ed8a962ccae5046 100644 --- a/apps/cpu/MultiphaseDropletTest/droplet.cpp +++ b/apps/cpu/MultiphaseDropletTest/droplet.cpp @@ -8,6 +8,7 @@ #endif #include "VirtualFluids.h" +#include "MultiphaseFlow/MultiphaseFlow.h" using namespace std; diff --git a/apps/cpu/Nozzle/nozzle.cpp b/apps/cpu/Nozzle/nozzle.cpp index e9ccb0e2868a190a1f5b3cf38be9abc557b37808..babee1900c0bd9bb10bca3bccd790e83d25d14b8 100644 --- a/apps/cpu/Nozzle/nozzle.cpp +++ b/apps/cpu/Nozzle/nozzle.cpp @@ -4,12 +4,11 @@ #include "VirtualFluids.h" -#include "LiggghtsCoupling/LiggghtsCouplingSimulationObserver.h" -#include "LiggghtsCoupling/LiggghtsCouplingWrapper.h" -#include "LiggghtsCoupling/IBcumulantK17LBMKernel.h" -#include "MultiphaseFlow/BoundaryConditions/MultiphasePressureBCStrategy.h" -#include "MultiphaseFlow/LBM/MultiphaseSharpInterfaceLBMKernel.h" -#include "MultiphaseFlow/SimulationObservers/WriteSharpInterfaceQuantitiesSimulationObserver.h" +#include "LiggghtsCoupling/LiggghtsCoupling.h" + +#include "MultiphaseFlow/MultiphaseFlow.h" + +#include "NonNewtonianFluids/NonNewtonianFluids.h" using namespace std; diff --git a/apps/cpu/RisingBubble2D/RisingBubble2D.cpp b/apps/cpu/RisingBubble2D/RisingBubble2D.cpp index 72f9f57e7aae2846f4676ca635b7728801c3c79b..c9a28efc4033ceb0be8cbabc4976055f994c1932 100644 --- a/apps/cpu/RisingBubble2D/RisingBubble2D.cpp +++ b/apps/cpu/RisingBubble2D/RisingBubble2D.cpp @@ -8,10 +8,8 @@ #endif #include "VirtualFluids.h" - -#include "LBM/MultiphaseSharpInterfaceLBMKernel.h" -#include "LBM/MultiphaseScaleDistributionLBMKernel.h" -#include "SimulationObservers/WriteSharpInterfaceQuantitiesSimulationObserver.h" +#include "MultiphaseFlow/MultiphaseFlow.h" +#include "NonNewtonianFluids/NonNewtonianFluids.h" using namespace std; diff --git a/apps/cpu/ViskomatXL/viskomat.cpp b/apps/cpu/ViskomatXL/viskomat.cpp index d1a3cc3ee62ee76d19a80ccf0901836efce87460..327f25e599c80b059fe273cfd2a0c526ed4279f7 100644 --- a/apps/cpu/ViskomatXL/viskomat.cpp +++ b/apps/cpu/ViskomatXL/viskomat.cpp @@ -1,7 +1,8 @@ #include <iostream> #include <string> -#include <VirtualFluids.h> +#include "VirtualFluids.h" +#include "NonNewtonianFluids/NonNewtonianFluids.h" using namespace std; diff --git a/apps/cpu/rheometer/rheometer.cpp b/apps/cpu/rheometer/rheometer.cpp index 173299b0edaccf10971cb596c67d81720bdb3264..ca3378bd5d6a4322b66877b25fca89d5ae478aac 100644 --- a/apps/cpu/rheometer/rheometer.cpp +++ b/apps/cpu/rheometer/rheometer.cpp @@ -1,7 +1,8 @@ #include <iostream> #include <string> -#include <VirtualFluids.h> +#include "VirtualFluids.h" +#include "NonNewtonianFluids/NonNewtonianFluids.h" using namespace std; diff --git a/src/cpu/LiggghtsCoupling/LiggghtsCouplingWrapper.cpp b/src/cpu/LiggghtsCoupling/3rdParty/LiggghtsCouplingWrapper.cpp similarity index 100% rename from src/cpu/LiggghtsCoupling/LiggghtsCouplingWrapper.cpp rename to src/cpu/LiggghtsCoupling/3rdParty/LiggghtsCouplingWrapper.cpp diff --git a/src/cpu/LiggghtsCoupling/LiggghtsCouplingWrapper.h b/src/cpu/LiggghtsCoupling/3rdParty/LiggghtsCouplingWrapper.h similarity index 100% rename from src/cpu/LiggghtsCoupling/LiggghtsCouplingWrapper.h rename to src/cpu/LiggghtsCoupling/3rdParty/LiggghtsCouplingWrapper.h diff --git a/src/cpu/LiggghtsCoupling/IBcumulantK17LBMKernel.cpp b/src/cpu/LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.cpp similarity index 100% rename from src/cpu/LiggghtsCoupling/IBcumulantK17LBMKernel.cpp rename to src/cpu/LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.cpp diff --git a/src/cpu/LiggghtsCoupling/IBcumulantK17LBMKernel.h b/src/cpu/LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.h similarity index 100% rename from src/cpu/LiggghtsCoupling/IBcumulantK17LBMKernel.h rename to src/cpu/LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.h diff --git a/src/cpu/LiggghtsCoupling/IBdynamicsParticleData.h b/src/cpu/LiggghtsCoupling/LBM/IBdynamicsParticleData.h similarity index 100% rename from src/cpu/LiggghtsCoupling/IBdynamicsParticleData.h rename to src/cpu/LiggghtsCoupling/LBM/IBdynamicsParticleData.h diff --git a/src/cpu/LiggghtsCoupling/LiggghtsCoupling.h b/src/cpu/LiggghtsCoupling/LiggghtsCoupling.h new file mode 100644 index 0000000000000000000000000000000000000000..88e5be001b5f71f97b4369ab3795ee5e3e972210 --- /dev/null +++ b/src/cpu/LiggghtsCoupling/LiggghtsCoupling.h @@ -0,0 +1,38 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \file MultiphasePressureBCStrategy.h +//! \ingroup BoundarConditions +//! \author Hesameddin Safari +//======================================================================================= + +#pragma once + +#include "LiggghtsCoupling/3rdParty/LiggghtsCouplingWrapper.h" +#include "LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.h" +#include "LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.h" \ No newline at end of file diff --git a/src/cpu/LiggghtsCoupling/LiggghtsCouplingSimulationObserver.cpp b/src/cpu/LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.cpp similarity index 99% rename from src/cpu/LiggghtsCoupling/LiggghtsCouplingSimulationObserver.cpp rename to src/cpu/LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.cpp index a3332aed105cb4371f1e2c19c79d7181b09df952..7b7fafd8a653f9a33559d9f569c6add4fba929f9 100644 --- a/src/cpu/LiggghtsCoupling/LiggghtsCouplingSimulationObserver.cpp +++ b/src/cpu/LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.cpp @@ -2,13 +2,13 @@ #include "GbSphere3D.h" #include "mpi/MPICommunicator.h" #include "SimulationObserver.h" -#include "LiggghtsCouplingWrapper.h" +#include "LiggghtsCoupling/3rdParty/LiggghtsCouplingWrapper.h" #include "Grid3D.h" #include "Block3D.h" #include "LBMKernel.h" #include "DistributionArray3D.h" #include "DataSet3D.h" -#include "IBcumulantK17LBMKernel.h" +#include "LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.h" #include "LBMUnitConverter.h" #include "fix_lb_coupling_onetoone.h" diff --git a/src/cpu/LiggghtsCoupling/LiggghtsCouplingSimulationObserver.h b/src/cpu/LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.h similarity index 100% rename from src/cpu/LiggghtsCoupling/LiggghtsCouplingSimulationObserver.h rename to src/cpu/LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.h diff --git a/src/cpu/MultiphaseFlow/MultiphaseFlow.h b/src/cpu/MultiphaseFlow/MultiphaseFlow.h new file mode 100644 index 0000000000000000000000000000000000000000..469a819060f7a06ce6e914ace68cb44f6b83dca1 --- /dev/null +++ b/src/cpu/MultiphaseFlow/MultiphaseFlow.h @@ -0,0 +1,28 @@ +#pragma once + +#include "MultiphaseFlow/BoundaryConditions/MultiphaseNoSlipBCStrategy.h" +#include "MultiphaseFlow/BoundaryConditions/MultiphaseNonReflectingOutflowBCStrategy.h" +#include "MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.h" +#include "MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBCStrategy.h" +#include "MultiphaseFlow/BoundaryConditions/MultiphaseSlipBCStrategy.h" +#include "MultiphaseFlow/BoundaryConditions/MultiphasePressureBCStrategy.h" + +#include "MultiphaseFlow/LBM/MultiphaseCumulantLBMKernel.h" +#include "MultiphaseFlow/LBM/MultiphasePressureFilterCompressibleAirLBMKernel.h" +#include "MultiphaseFlow/LBM/MultiphasePressureFilterLBMKernel.h" +#include "MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.h" +#include "MultiphaseFlow/LBM/MultiphaseScratchCumulantLBMKernel.h" +#include "MultiphaseFlow/LBM/MultiphaseSharpInterfaceLBMKernel.h" +#include "MultiphaseFlow/LBM/MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.h" +#include "MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsCumulantLBMKernel.h" +#include "MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsPressureFilterLBMKernel.h" +#include "MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel.h" + +#include "MultiphaseFlow/SimulationObservers/WriteMultiphaseQuantitiesSimulationObserver.h" +#include "MultiphaseFlow/SimulationObservers/WriteSharpInterfaceQuantitiesSimulationObserver.h" + +#include "MultiphaseFlow/Visitors/MultiphaseSetKernelBlockVisitor.h" +#include "MultiphaseFlow/Visitors/MultiphaseBoundaryConditionsBlockVisitor.h" +#include "MultiphaseFlow/Visitors/MultiphaseInitDistributionsBlockVisitor.h" +#include "MultiphaseFlow/Visitors/MultiphaseVelocityFormInitDistributionsBlockVisitor.h" + diff --git a/src/cpu/NonNewtonianFluids/NonNewtonianFluids.h b/src/cpu/NonNewtonianFluids/NonNewtonianFluids.h new file mode 100644 index 0000000000000000000000000000000000000000..169082259b203b195b7fc636d84cdd4029ce6ccf --- /dev/null +++ b/src/cpu/NonNewtonianFluids/NonNewtonianFluids.h @@ -0,0 +1,24 @@ +#pragma once + +#include "NonNewtonianFluids/BoundaryConditions/ThixotropyDensityBCStrategy.h" +#include "NonNewtonianFluids/BoundaryConditions/ThixotropyNoSlipBCStrategy.h" +#include "NonNewtonianFluids/BoundaryConditions/ThixotropyVelocityBCStrategy.h" +#include "NonNewtonianFluids/BoundaryConditions/ThixotropyNonReflectingOutflowBCStrategy.h" +#include "NonNewtonianFluids/BoundaryConditions/ThixotropyVelocityWithDensityBCStrategy.h" +#include "NonNewtonianFluids/BoundaryConditions/RheologyNoSlipBCStrategy.h" +#include "NonNewtonianFluids/BoundaryConditions/RheologyBinghamModelNoSlipBCStrategy.h" +#include "NonNewtonianFluids/BoundaryConditions/RheologyHerschelBulkleyModelNoSlipBCStrategy.h" +#include "NonNewtonianFluids/BoundaryConditions/RheologyPowellEyringModelNoSlipBCStrategy.h" +#include "NonNewtonianFluids/BoundaryConditions/RheologyBinghamModelVelocityBCStrategy.h" + +#include "NonNewtonianFluids/SimulationObservers/CalculateTorqueSimulationObserver.h" +#include "NonNewtonianFluids/SimulationObservers/WriteThixotropyQuantitiesSimulationObserver.h" + +#include "NonNewtonianFluids/LBM/ThixotropyLBMKernel.h" +#include "NonNewtonianFluids/LBM/ThixotropyExpLBMKernel.h" +#include "NonNewtonianFluids/LBM/RheologyBinghamModelLBMKernel.h" +#include "NonNewtonianFluids/LBM/RheologyHerschelBulkleyModelLBMKernel.h" +#include "NonNewtonianFluids/LBM/RheologyInterpolationProcessor.h" +#include "NonNewtonianFluids/LBM/Rheology.h" +#include "NonNewtonianFluids/LBM/RheologyK17LBMKernel.h" +#include "NonNewtonianFluids/LBM/RheologyPowellEyringModelLBMKernel.h" diff --git a/src/cpu/VirtualFluids.h b/src/cpu/VirtualFluids.h index df9bfb364e6a8c7478b1dff097e0f030627540eb..6fa9b30bfc0e650f289d00a2970bdff545c71359 100644 --- a/src/cpu/VirtualFluids.h +++ b/src/cpu/VirtualFluids.h @@ -133,22 +133,9 @@ #include <BoundaryConditions/SimpleVelocityBCStrategy.h> #include <BoundaryConditions/SimpleSlipBCStrategy.h> -#include <NonNewtonianFluids/BoundaryConditions/ThixotropyDensityBCStrategy.h> -#include <NonNewtonianFluids/BoundaryConditions/ThixotropyNoSlipBCStrategy.h> -#include <NonNewtonianFluids/BoundaryConditions/ThixotropyVelocityBCStrategy.h> -#include <NonNewtonianFluids/BoundaryConditions/ThixotropyNonReflectingOutflowBCStrategy.h> -#include <NonNewtonianFluids/BoundaryConditions/ThixotropyVelocityWithDensityBCStrategy.h> -#include <NonNewtonianFluids/BoundaryConditions/RheologyNoSlipBCStrategy.h> -#include <NonNewtonianFluids/BoundaryConditions/RheologyBinghamModelNoSlipBCStrategy.h> -#include <NonNewtonianFluids/BoundaryConditions/RheologyHerschelBulkleyModelNoSlipBCStrategy.h> -#include <NonNewtonianFluids/BoundaryConditions/RheologyPowellEyringModelNoSlipBCStrategy.h> -#include <NonNewtonianFluids/BoundaryConditions/RheologyBinghamModelVelocityBCStrategy.h> - -#include <MultiphaseFlow/BoundaryConditions/MultiphaseNoSlipBCStrategy.h> -#include <MultiphaseFlow/BoundaryConditions/MultiphaseNonReflectingOutflowBCStrategy.h> -#include <MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.h> -#include <MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBCStrategy.h> -#include <MultiphaseFlow/BoundaryConditions/MultiphaseSlipBCStrategy.h> + + + #include <Connectors/Block3DConnector.h> //#include <Connectors/Block3DConnectorFactory.h> @@ -186,7 +173,7 @@ #include <SimulationObservers/AdjustForcingSimulationObserver.h> #include <SimulationObservers/CalculateForcesSimulationObserver.h> -#include <NonNewtonianFluids/SimulationObservers/CalculateTorqueSimulationObserver.h> + #include <SimulationObservers/WriteMacroscopicQuantitiesSimulationObserver.h> #include <SimulationObservers/WriteMQFromSelectionSimulationObserver.h> #include <SimulationObservers/WriteBoundaryConditionsSimulationObserver.h> @@ -216,8 +203,8 @@ #include <SimulationObservers/MPIIOMigrationSimulationObserver.h> #include <SimulationObservers/MPIIORestartSimulationObserver.h> #include <SimulationObservers/MicrophoneArraySimulationObserver.h> -#include <NonNewtonianFluids/SimulationObservers/WriteThixotropyQuantitiesSimulationObserver.h> -#include <MultiphaseFlow/SimulationObservers/WriteMultiphaseQuantitiesSimulationObserver.h> + + #include <TimeDependentBCSimulationObserver.h> #include <IntegrateValuesHelper.h> @@ -242,26 +229,13 @@ #include <LBM/LBMSystem.h> #include <LBM/LBMUnitConverter.h> #include <LBM/BGKLBMKernel.h> -#include <NonNewtonianFluids/LBM/ThixotropyLBMKernel.h> -#include <NonNewtonianFluids/LBM/ThixotropyExpLBMKernel.h> + #include <LBM/CumulantLBMKernel.h> #include <LBM/CumulantK17LBMKernel.h> //#include <LBM/RheologyModelLBMKernel.h> //#include <LBM/RheologyModelLBMKernel2.h> -#include <NonNewtonianFluids/LBM/RheologyBinghamModelLBMKernel.h> -#include <NonNewtonianFluids/LBM/RheologyHerschelBulkleyModelLBMKernel.h> -#include <NonNewtonianFluids/LBM/RheologyInterpolationProcessor.h> -#include <NonNewtonianFluids/LBM/Rheology.h> -#include <NonNewtonianFluids/LBM/RheologyK17LBMKernel.h> -#include <NonNewtonianFluids/LBM/RheologyPowellEyringModelLBMKernel.h> -#include <MultiphaseFlow/LBM/MultiphaseCumulantLBMKernel.h> -#include <MultiphaseFlow/LBM/MultiphaseScratchCumulantLBMKernel.h> -#include <MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsCumulantLBMKernel.h> -#include <MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel.h> -#include <MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsPressureFilterLBMKernel.h> -#include <MultiphaseFlow/LBM/MultiphasePressureFilterLBMKernel.h> -#include <MultiphaseFlow/LBM/MultiphasePressureFilterCompressibleAirLBMKernel.h> -#include <MultiphaseFlow/LBM/MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.h> + + @@ -350,10 +324,7 @@ #include <CheckRatioBlockVisitor.h> #include <SpongeLayerBlockVisitor.h> #include <ZoltanPartitioningGridVisitor.h> -#include <MultiphaseFlow/Visitors/MultiphaseSetKernelBlockVisitor.h> -#include <MultiphaseFlow/Visitors/MultiphaseBoundaryConditionsBlockVisitor.h> -#include <MultiphaseFlow/Visitors/MultiphaseInitDistributionsBlockVisitor.h> -#include <MultiphaseFlow/Visitors/MultiphaseVelocityFormInitDistributionsBlockVisitor.h> + #include <Visitors/SetInterpolationConnectorsBlockVisitor.h> #include <RefineAroundGbObjectHelper.h>