From 71b38521c55c83a316eadb58edbc41318d87618c Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Tue, 18 Jun 2024 21:21:20 -0400
Subject: [PATCH] reformat and remove duplicate NP_MULTI_OLD flags

---
 src/OPENMP/npair_skip_omp.h | 40 +++++++++++++------------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/src/OPENMP/npair_skip_omp.h b/src/OPENMP/npair_skip_omp.h
index cdacad3742..ddfdb9f055 100644
--- a/src/OPENMP/npair_skip_omp.h
+++ b/src/OPENMP/npair_skip_omp.h
@@ -19,74 +19,62 @@
 
 NPairStyle(skip/omp,
            NPairSkip,
-           NP_SKIP | NP_HALF | NP_FULL |
-           NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD |
+           NP_SKIP | NP_HALF | NP_FULL | NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD |
            NP_NEWTON | NP_NEWTOFF | NP_ORTHO | NP_TRI | NP_OMP);
 
 NPairStyle(skip/half/respa/omp,
            NPairSkipRespa,
-           NP_SKIP | NP_RESPA | NP_HALF | NP_FULL |
-           NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD |
+           NP_SKIP | NP_RESPA | NP_HALF | NP_FULL | NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD |
            NP_NEWTON | NP_NEWTOFF | NP_ORTHO | NP_TRI | NP_OMP);
 
 NPairStyle(skip/half/size/omp,
            NPairSkipSize,
-           NP_SKIP | NP_SIZE | NP_HALF | NP_FULL |
-           NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD |
+           NP_SKIP | NP_SIZE | NP_HALF | NP_FULL | NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD |
            NP_NEWTON | NP_NEWTOFF | NP_ORTHO | NP_TRI | NP_OMP);
 
 NPairStyle(skip/size/off2on/omp,
            NPairSkipSizeOff2on,
-           NP_SKIP | NP_SIZE | NP_OFF2ON | NP_HALF |
-           NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD | NP_MULTI_OLD |
+           NP_SKIP | NP_SIZE | NP_OFF2ON | NP_HALF | NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD |
            NP_NEWTON | NP_NEWTOFF | NP_ORTHO | NP_TRI | NP_OMP);
 
 NPairStyle(skip/size/off2on/oneside/omp,
            NPairSkipSizeOff2onOneside,
-           NP_SKIP | NP_SIZE | NP_OFF2ON | NP_ONESIDE | NP_HALF |
-           NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD | NP_NEWTON | NP_NEWTOFF |
-           NP_ORTHO | NP_TRI | NP_OMP);
+           NP_SKIP | NP_SIZE | NP_OFF2ON | NP_ONESIDE | NP_HALF | NP_NSQ | NP_BIN | NP_MULTI |
+           NP_MULTI_OLD | NP_NEWTON | NP_NEWTOFF | NP_ORTHO | NP_TRI | NP_OMP);
 
 NPairStyle(skip/ghost/omp,
            NPairSkip,
-           NP_SKIP | NP_HALF | NP_FULL |
-           NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD |
+           NP_SKIP | NP_HALF | NP_FULL | NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD |
            NP_NEWTON | NP_NEWTOFF | NP_ORTHO | NP_TRI | NP_OMP | NP_GHOST);
 
 NPairStyle(skip/trim/omp,
            NPairSkipTrim,
-           NP_SKIP | NP_HALF | NP_FULL |
-           NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD |
+           NP_SKIP | NP_HALF | NP_FULL | NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD |
            NP_NEWTON | NP_NEWTOFF | NP_ORTHO | NP_TRI | NP_TRIM | NP_OMP);
 
 NPairStyle(skip/trim/half/respa/omp,
            NPairSkipTrimRespa,
-           NP_SKIP | NP_RESPA | NP_HALF | NP_FULL |
-           NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD |
+           NP_SKIP | NP_RESPA | NP_HALF | NP_FULL | NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD |
            NP_NEWTON | NP_NEWTOFF | NP_ORTHO | NP_TRI | NP_TRIM | NP_OMP);
 
 NPairStyle(skip/trim/half/size/omp,
            NPairSkipTrimSize,
-           NP_SKIP | NP_SIZE | NP_HALF | NP_FULL |
-           NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD |
+           NP_SKIP | NP_SIZE | NP_HALF | NP_FULL | NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD |
            NP_NEWTON | NP_NEWTOFF | NP_ORTHO | NP_TRI | NP_TRIM | NP_OMP);
 
 NPairStyle(skip/trim/size/off2on/omp,
            NPairSkipTrimSizeOff2on,
-           NP_SKIP | NP_SIZE | NP_OFF2ON | NP_HALF |
-           NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD | NP_MULTI_OLD |
+           NP_SKIP | NP_SIZE | NP_OFF2ON | NP_HALF | NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD |
            NP_NEWTON | NP_NEWTOFF | NP_ORTHO | NP_TRI | NP_TRIM | NP_OMP);
 
 NPairStyle(skip/trim/size/off2on/oneside/omp,
            NPairSkipTrimSizeOff2onOneside,
-           NP_SKIP | NP_SIZE | NP_OFF2ON | NP_ONESIDE | NP_HALF |
-           NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD | NP_NEWTON | NP_NEWTOFF |
-           NP_ORTHO | NP_TRI | NP_TRIM | NP_OMP);
+           NP_SKIP | NP_SIZE | NP_OFF2ON | NP_ONESIDE | NP_HALF | NP_NSQ | NP_BIN | NP_MULTI |
+           NP_MULTI_OLD | NP_NEWTON | NP_NEWTOFF | NP_ORTHO | NP_TRI | NP_TRIM | NP_OMP);
 
 NPairStyle(skip/trim/ghost/omp,
            NPairSkipTrim,
-           NP_SKIP | NP_HALF | NP_FULL |
-           NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD |
+           NP_SKIP | NP_HALF | NP_FULL | NP_NSQ | NP_BIN | NP_MULTI | NP_MULTI_OLD |
            NP_NEWTON | NP_NEWTOFF | NP_ORTHO | NP_TRI | NP_TRIM | NP_OMP | NP_GHOST);
 // clang-format off
 #endif