Skip to content
Snippets Groups Projects
Commit de857d4e authored by Sven Marcus's avatar Sven Marcus
Browse files

Use deploy template for vf wheel deploy

parent 5548a022
No related branches found
No related tags found
1 merge request!6Proper Python simulation tests
...@@ -498,7 +498,7 @@ clang-tidy: ...@@ -498,7 +498,7 @@ clang-tidy:
vf_to_phoenix: vf_to_phoenix:
extends: .deploy_template extends: .deploy_template
stage: deploy stage: deploy
needs: ["gcc_9_python"] needs: ["gcc_9_python", "gcc_9_unit_tests", "gcc_9_python_bindings_test"]
when: manual when: manual
...@@ -517,6 +517,7 @@ vf_to_phoenix: ...@@ -517,6 +517,7 @@ vf_to_phoenix:
############################################################################### ###############################################################################
vf_wheel_to_jupyterhub: vf_wheel_to_jupyterhub:
extends: .deploy_template
stage: deploy stage: deploy
only: ["schedules"] only: ["schedules"]
...@@ -529,17 +530,6 @@ vf_wheel_to_jupyterhub: ...@@ -529,17 +530,6 @@ vf_wheel_to_jupyterhub:
REMOTE_USER: "jupyter_host" REMOTE_USER: "jupyter_host"
jupyter_host: "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: script:
- ansible-playbook -i ansible/hosts.cfg -u $REMOTE_USER ansible/playbook_jupyter_update.yml - ansible-playbook -i ansible/hosts.cfg -u $REMOTE_USER ansible/playbook_jupyter_update.yml
......
...@@ -27,10 +27,9 @@ int main() ...@@ -27,10 +27,9 @@ int main()
const auto communicator = MPICommunicator::getInstance(); const auto communicator = MPICommunicator::getInstance();
const auto kernel = std::make_shared<CompressibleCumulant4thOrderViscosityLBMKernel>(); const auto kernel = std::make_shared<CompressibleCumulant4thOrderViscosityLBMKernel>();
kernel->setBCProcessor(std::make_shared<BCProcessor>());
kernel->setForcingX1(1e-6 * lbmUnitConverter->getFactorForceWToLb()); kernel->setForcingX1(1e-6 * lbmUnitConverter->getFactorForceWToLb());
BoundaryConditionsBlockVisitor boundaryConditionsBlockVisitor{};
auto grid = std::make_shared<Grid3D>(); auto grid = std::make_shared<Grid3D>();
grid->setDeltaX(deltaX); grid->setDeltaX(deltaX);
grid->setPeriodicX1(true); grid->setPeriodicX1(true);
...@@ -49,8 +48,6 @@ int main() ...@@ -49,8 +48,6 @@ int main()
ppblocks->process(0); ppblocks->process(0);
ppblocks.reset(); ppblocks.reset();
kernel->setBCProcessor(std::make_shared<BCProcessor>());
const auto metisVisitor(std::make_shared<MetisPartitioningGridVisitor>(communicator, const auto metisVisitor(std::make_shared<MetisPartitioningGridVisitor>(communicator,
MetisPartitioningGridVisitor::LevelBased, MetisPartitioningGridVisitor::LevelBased,
D3Q27System::B)); D3Q27System::B));
...@@ -93,6 +90,7 @@ int main() ...@@ -93,6 +90,7 @@ int main()
InitDistributionsBlockVisitor initVisitor{}; InitDistributionsBlockVisitor initVisitor{};
BoundaryConditionsBlockVisitor boundaryConditionsBlockVisitor{};
grid->accept(initVisitor); grid->accept(initVisitor);
grid->accept(setConnsVisitor); grid->accept(setConnsVisitor);
grid->accept(boundaryConditionsBlockVisitor); grid->accept(boundaryConditionsBlockVisitor);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment