From 24fbc7b415ee1b1b88ea08b2d36c0afb3f874a36 Mon Sep 17 00:00:00 2001
From: niikonst <niikonst@blogin2.usr.hlrn.de>
Date: Sat, 2 Apr 2022 22:47:40 +0200
Subject: [PATCH] fix rising bubble sutup
---
apps/cpu/RisingBubble2D/RisingBubble2D.cpp | 4 ----
1 file changed, 4 deletions(-)
diff --git a/apps/cpu/RisingBubble2D/RisingBubble2D.cpp b/apps/cpu/RisingBubble2D/RisingBubble2D.cpp
index 9001b64f0..536936d66 100644
--- a/apps/cpu/RisingBubble2D/RisingBubble2D.cpp
+++ b/apps/cpu/RisingBubble2D/RisingBubble2D.cpp
@@ -196,11 +196,7 @@ void run(string configname)
SPtr<UbScheduler> rSch(new UbScheduler(cpStep, cpStart));
SPtr<MPIIORestartCoProcessor> rcp(new MPIIORestartCoProcessor(grid, rSch, pathname, comm));
//SPtr<MPIIOMigrationCoProcessor> rcp(new MPIIOMigrationCoProcessor(grid, rSch, metisVisitor, pathname, comm));
-<<<<<<< HEAD
//SPtr<MPIIOMigrationBECoProcessor> rcp(new MPIIOMigrationBECoProcessor(grid, rSch, pathname, comm));
-=======
- //SPtr<MPIIOMigrationBECoProcessor> rcp(new MPIIOMigrationBECoProcessor(grid, rSch, metisVisitor, pathname, comm));
->>>>>>> 2d5b026e0450341bc450d1ab0085bd1940db01c7
// rcp->setNu(nuLB);
// rcp->setNuLG(nuL, nuG);
//rcp->setDensityRatio(densityRatio);
--
GitLab