Resolve merge conflicts

2021-01-13 09:42:57 -07:00
parent a25c77e512 9ff011728c
commit 2c92737cd5
541 changed files with 9281 additions and 7264 deletions
--- a/src/comm_tiled.cpp
+++ b/src/comm_tiled.cpp
@ -232,7 +232,7 @@ void CommTiled::setup()
    cutghost[1] = cut * length1;
    length2 = h_inv[2];
    cutghost[2] = cut * length2;
-    if (mode == Comm::MULTI){
+    if (mode == Comm::MULTI) {
      for (i = 1; i <= ntypes; i++) {
        cutghostmulti[i][0] *= length0;
        cutghostmulti[i][1] *= length1;