diff --git a/apps/showcases/Lagoon/Lagoon.cpp b/apps/showcases/Lagoon/Lagoon.cpp index 8c6b09d5425065976f8e83ff7dcb58fb9dd72932..d33af3ae4ba3baa255dd43d75ba78c2c0266f497 100644 --- a/apps/showcases/Lagoon/Lagoon.cpp +++ b/apps/showcases/Lagoon/Lagoon.cpp @@ -544,11 +544,9 @@ int main(int argc, char **argv) { } else { WALBERLA_LOG_INFO_ON_ROOT("Using uniform Grid") - timeloop.add() << BeforeFunction(uniformCommunication->getStartCommunicateFunctor(), "Start Communication") + timeloop.add() << BeforeFunction(uniformCommunication->getCommunicateFunctor(), "Communication") << Sweep(boundaryCollection.getSweep(BoundaryCollection_T::ALL), "Boundary Conditions"); - timeloop.add() << Sweep(sweepCollection.streamCollide(SweepCollection_T::INNER), "LBM StreamCollide Inner Frame"); - timeloop.add() << BeforeFunction(uniformCommunication->getWaitFunctor(), "Wait for Communication") - << Sweep(sweepCollection.streamCollide(SweepCollection_T::OUTER), "LBM StreamCollide Outer Frame"); + timeloop.add() << Sweep(sweepCollection.streamCollide(SweepCollection_T::ALL), "LBM StreamCollide"); } #endif ////////////////// diff --git a/apps/showcases/Lagoon/LagoonParameter.prm b/apps/showcases/Lagoon/LagoonParameter.prm index 81f9d1251485815eac060411b516ee53e066167f..f1706eb55370a6ea9cd2685838ebb4855336529d 100644 --- a/apps/showcases/Lagoon/LagoonParameter.prm +++ b/apps/showcases/Lagoon/LagoonParameter.prm @@ -7,7 +7,7 @@ Parameters referenceDensity 1.182; simulationTime 0.3; timeStepsForBenchmarking 1; // if set to zero the timesteps will be calculated from the simulationTime - coarseMeshSize 0.512; // 0.16 0.032 0.512; + coarseMeshSize 0.128; // 0.16 0.032 0.512; relaxationRateOutlet 1.9; SpongeZoneStart 35; @@ -27,12 +27,12 @@ Parameters DomainSetup { meshFile Lagoon.obj; - cellsPerBlock < 8, 8, 8 >; + cellsPerBlock < 32, 32, 32 >; periodic < 0, 1, 1 >; domainSize < 20, 10, 10 >; - refinementLevels 10; + refinementLevels 0; numberProcesses 1; weakScaling false; @@ -67,6 +67,6 @@ Logging { logLevel info; // info progress detail tracing writeDistanceOctree false; - writeSetupForestAndReturn true; + writeSetupForestAndReturn false; writeMeshBoundaries false; } \ No newline at end of file