Multipole: decorate sphericalharmonic

EinsteinToolkit · Jun 23, 2024 · ab2e3fe · ab2e3fe
1 parent 95a69c4
commit ab2e3fe
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/Multipole/src/make.code.defn b/Multipole/src/make.code.defn
@@ -5,6 +5,6 @@ SRCS = \
   integrate.cxx \
   interpolate.cxx \
   multipole.cc \
-  sphericalharmonic.cc \
+  sphericalharmonic.cxx \
   tests.cc \
   utils.cc
diff --git a/Multipole/src/multipole.cc b/Multipole/src/multipole.cc
@@ -15,7 +15,7 @@
 #include "multipole.hh"
 #include "interpolate.hxx"
 #include "utils.hh"
-#include "sphericalharmonic.hh"
+#include "sphericalharmonic.hxx"
 
 using namespace std;
 

diff --git a/Multipole/src/sphericalharmonic.cc → Multipole/src/sphericalharmonic.cxx b/Multipole/src/sphericalharmonic.cc → Multipole/src/sphericalharmonic.cxx
@@ -1,13 +1,11 @@
+#include "sphericalharmonic.hxx"
+
 #include <math.h>
 #include <assert.h>
 #include <iostream>
 #include <vector>
 #include <loop_device.hxx>
 
-#include "cctk.h"
-#include "cctk_Parameters.h"
-#include "cctk_Arguments.h"
-#include "sphericalharmonic.hh"
 
 static const CCTK_REAL PI = acos(-1.0);
 

diff --git a/Multipole/src/sphericalharmonic.hh → Multipole/src/sphericalharmonic.hxx b/Multipole/src/sphericalharmonic.hh → Multipole/src/sphericalharmonic.hxx
@@ -1,7 +1,9 @@
+#ifndef MULTIPOLE_SPHERICALHARMONIC_HXX
+#define MULTIPOLE_SPHERICALHARMONIC_HXX
 
-#ifndef __sphericalharmonic_h
-#define __sphericalharmonic_h
-#include "cctk.h"
+#include <cctk.h>
+#include <cctk_Parameters.h>
+#include <cctk_Arguments.h>
 
 void Multipole_HarmonicSetup(int s, int l, int m, int array_size,
                              CCTK_REAL const th[], CCTK_REAL const ph[],
@@ -10,7 +12,4 @@ void Multipole_HarmonicSetup(int s, int l, int m, int array_size,
 void Multipole_SphericalHarmonic(int s, int l, int m, CCTK_REAL th,
                                  CCTK_REAL ph, CCTK_REAL *reY, CCTK_REAL *imY);
 
-void Multipole_SphericalHarmonicWeyl(int s, int l, int m, CCTK_REAL th,
-                                     CCTK_REAL ph, CCTK_REAL *reY,
-                                     CCTK_REAL *imY);
-#endif
+#endif // #ifndef MULTIPOLE_SPHERICALHARMONIC_HXX
diff --git a/Multipole/src/tests.cc b/Multipole/src/tests.cc
@@ -10,7 +10,7 @@
 #include "utils.hh"
 #include "integrate.hxx"
 #include "interpolate.hxx"
-#include "sphericalharmonic.hh"
+#include "sphericalharmonic.hxx"
 
 using namespace Multipole;