diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b50dc63d360a90998c0b7aea4aa842bdbc62f77..eecf91647df09b93800b8fd9e796682a38ce8f2a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -431,7 +431,7 @@ clang-tidy: vf_to_phoenix: extends: .deploy_template stage: deploy - needs: ["gcc_9_python"] + needs: ["gcc_9_python", "gcc_9_unit_tests", "gcc_9_python_bindings_test"] variables: SSH_KEY: "$SSH_PRIVATE_KEY" @@ -447,6 +447,7 @@ vf_to_phoenix: - y0054816 vf_wheel_to_jupyterhub: + extends: .deploy_template stage: deploy only: ["schedules"] @@ -459,17 +460,6 @@ vf_wheel_to_jupyterhub: REMOTE_USER: "jupyter_host" jupyter_host: "jupyter_host" - before_script: - - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )' - - apt-get install -y rsync - - mkdir -p ~/.ssh - - chmod 700 ~/.ssh - - eval $(ssh-agent -s) - - echo "$SSH_KEY" | tr -d '\r' | ssh-add - - - echo $SSH_KEY >> ansible/private_key - - ssh-keyscan -t rsa $HOST >> ~/.ssh/known_hosts - - pip3 install ansible - script: - ansible-playbook -i ansible/hosts.cfg -u $REMOTE_USER ansible/playbook_jupyter_update.yml diff --git a/apps/cpu/poiseuille_example/poiseuille.cpp b/apps/cpu/poiseuille_example/poiseuille.cpp index 07e5ab8d9f2a5da84f5d1a04f41f9b833016dc72..db9ac4ffb0218e0d0202ea773427d948609aeac5 100644 --- a/apps/cpu/poiseuille_example/poiseuille.cpp +++ b/apps/cpu/poiseuille_example/poiseuille.cpp @@ -27,10 +27,9 @@ int main() const auto communicator = MPICommunicator::getInstance(); const auto kernel = std::make_shared<CompressibleCumulant4thOrderViscosityLBMKernel>(); + kernel->setBCProcessor(std::make_shared<BCProcessor>()); kernel->setForcingX1(1e-6 * lbmUnitConverter->getFactorForceWToLb()); - BoundaryConditionsBlockVisitor boundaryConditionsBlockVisitor{}; - auto grid = std::make_shared<Grid3D>(); grid->setDeltaX(deltaX); grid->setPeriodicX1(true); @@ -49,8 +48,6 @@ int main() ppblocks->process(0); ppblocks.reset(); - kernel->setBCProcessor(std::make_shared<BCProcessor>()); - const auto metisVisitor(std::make_shared<MetisPartitioningGridVisitor>(communicator, MetisPartitioningGridVisitor::LevelBased, D3Q27System::B)); @@ -93,6 +90,7 @@ int main() InitDistributionsBlockVisitor initVisitor{}; + BoundaryConditionsBlockVisitor boundaryConditionsBlockVisitor{}; grid->accept(initVisitor); grid->accept(setConnsVisitor); grid->accept(boundaryConditionsBlockVisitor);