cleanup

Makefile.am

@@ -16,7 +16,6 @@ src_sharp = \
   libsharp/sharp_ylmgen_c.c \
   libsharp/sharp_announce.h \
   libsharp/sharp_complex_hacks.h \
-  libsharp/sharp_core.h \
   libsharp/sharp_internal.h \
   libsharp/sharp_legendre_roots.h \
   libsharp/sharp_vecsupport.h \

libsharp/sharp.c

@@ -35,7 +35,6 @@
 #include "sharp_ylmgen_c.h"
 #include "sharp_internal.h"
 #include "c_utils.h"
-#include "sharp_core.h"
 #include "walltime_c.h"
 #include "sharp_almhelpers.h"
 #include "sharp_geomhelpers.h"
@@ -960,9 +959,6 @@ void sharp_set_chunksize_min(int new_chunksize_min)
 void sharp_set_nchunks_max(int new_nchunks_max)
   { nchunks_max=new_nchunks_max; }
 
-int sharp_get_nv_max (void)
-{ return 6; }
-
 #ifdef USE_MPI
 #include "sharp_mpi.c"
 

libsharp/sharp_announce.c

@@ -40,7 +40,7 @@
 #endif
 
 #include "sharp_announce.h"
-#include "sharp_core.h"
+#include "sharp_internal.h"
 
 static void OpenMP_status(void)
   {

libsharp/sharp_core.c

@@ -35,7 +35,7 @@
 #include "sharp_vecsupport.h"
 #include "sharp_complex_hacks.h"
 #include "sharp.h"
-#include "sharp_core.h"
+#include "sharp_internal.h"
 #include "c_utils.h"
 
 typedef complex double dcmplx;

libsharp/sharp_core.h

@@ -1,53 +0,0 @@
-/*
- *  This file is part of libsharp.
- *
- *  libsharp is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  libsharp is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with libsharp; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-/*
- *  libsharp is being developed at the Max-Planck-Institut fuer Astrophysik
- *  and financially supported by the Deutsches Zentrum fuer Luft- und Raumfahrt
- *  (DLR).
- */
-
-/*! \file sharp_core.h
- *  Interface for the computational core
- *
- *  Copyright (C) 2012-2013 Max-Planck-Society
- *  \author Martin Reinecke
- */
-
-#ifndef PLANCK_SHARP_CORE_H
-#define PLANCK_SHARP_CORE_H
-
-#include "sharp_internal.h"
-#include "sharp_ylmgen_c.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void inner_loop (sharp_job *job, const int *ispair,const double *cth,
-  const double *sth, int llim, int ulim, sharp_Ylmgen_C *gen, int mi,
-  const int *mlim);
-
-int sharp_veclen(void);
-int sharp_max_nvec(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

libsharp/sharp_internal.h

@@ -38,6 +38,7 @@
 
 #include <complex.h>
 #include "sharp.h"
+#include "sharp_ylmgen_c.h"
 
 #define SHARP_MAXTRANS 100
 
@@ -59,8 +60,13 @@ typedef struct
   unsigned long long opcnt;
   } sharp_job;
 
-int sharp_get_nv_max (void);
-int sharp_nv_oracle (sharp_jobtype type, int spin);
 int sharp_get_mlim (int lmax, int spin, double sth, double cth);
 
+void inner_loop (sharp_job *job, const int *ispair,const double *cth,
+  const double *sth, int llim, int ulim, sharp_Ylmgen_C *gen, int mi,
+  const int *mlim);
+
+int sharp_veclen(void);
+int sharp_max_nvec(void);
+
 #endif

libsharp/sharp_testsuite.c

@@ -589,7 +589,7 @@ static void sharp_test (int argc, const char **argv)
     }
 
   if (mytask==0)
-    printf("%-12s %-10s %2d %d %2d %3d %6d %6d %6d %6d %2d %.2e %7.2f %.2e %7.2f"
+    printf("%-12s %-10s %2d %d %2d %3d %6d %6d %6d %6d %.2e %7.2f %.2e %7.2f"
            " %9.2f %6.2f %.2e %.2e\n",
       getenv("HOST"),argv[2],spin,sharp_veclen(),nomp,ntasks,lmax,mmax,gpar1,gpar2,
       t_a2m,1e-9*op_a2m/t_a2m,t_m2a,1e-9*op_m2a/t_m2a,tmem/(1<<20),