grid: Move coset into grid_common.h

cp2k · Sep 30, 2020 · 178577b · 178577b
1 parent dbf7a77
commit 178577b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/src/grid/common/grid_common.h b/src/grid/common/grid_common.h
@@ -39,6 +39,19 @@ static const double fac[] = {
     0.30488834461171386050E+30, 0.88417619937397019545E+31,
     0.26525285981219105864E+33};
 
+/*******************************************************************************
+ * \brief Maps three angular momentum components to a single zero based index.
+ * \author Ole Schuett
+ ******************************************************************************/
+static inline int coset(int lx, int ly, int lz) {
+  const int l = lx + ly + lz;
+  if (l == 0) {
+    return 0;
+  } else {
+    return ncoset[l - 1] + ((l - lx) * (l - lx + 1)) / 2 + lz;
+  }
+}
+
 /*******************************************************************************
  * \brief Minimum and maximum for integers (missing from the C standard)
  * \author Ole Schuett

diff --git a/src/grid/ref/grid_ref_prepare_pab.c b/src/grid/ref/grid_ref_prepare_pab.c
@@ -13,19 +13,6 @@
 #include "../common/grid_constants.h"
 #include "grid_ref_prepare_pab.h"
 
-/*******************************************************************************
- * \brief Returns block size changes due to transformation grid_ref_prepare_pab.
- * \author Ole Schuett
- ******************************************************************************/
-int coset(int lx, int ly, int lz) {
-  const int l = lx + ly + lz;
-  if (l == 0) {
-    return 0;
-  } else {
-    return ncoset[l - 1] + ((l - lx) * (l - lx + 1)) / 2 + lz;
-  }
-}
-
 /*******************************************************************************
  * \brief Implementation of function GRID_FUNC_AB, ie. identity transformation.
  * \author Ole Schuett

diff --git a/src/grid/ref/grid_ref_prepare_pab.h b/src/grid/ref/grid_ref_prepare_pab.h
@@ -7,12 +7,6 @@
 #ifndef GRID_REF_PREPARE_PAB_H
 #define GRID_REF_PREPARE_PAB_H
 
-/*******************************************************************************
- * \brief Maps three angular momentum components to a single zero based index.
- * \author Ole Schuett
- ******************************************************************************/
-int coset(int lx, int ly, int lz);
-
 /*******************************************************************************
  * \brief Returns block size changes due to transformation grid_prepare_pab.
  * \author Ole Schuett