Aquila-Consortium/libsharp2
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

missing stuff from last commit

Browse source
This commit is contained in:
Martin Reinecke 2012-07-04 14:01:43 +02:00
parent 71d5ed4d7c
commit 39cf1ee90b
15 changed files with 30 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libsharp/oracle.inc
View file

@ -2,7 +2,7 @@ static const int maxtr = 6;
static const int nv_opt[6][2][3] = {
{{4,2,-1},{2,1,-1}},
{{4,2,-1},{2,1,-1}},
{{5,2,-1},{5,2,-1}},
{{5,2,-1},{5,1,-1}},
{{5,2,-1},{5,2,-1}},
{{5,2,-1},{5,2,-1}},
{{5,2,-1},{5,2,-1}}

2
libsharp/planck.make
View file

@ -8,7 +8,7 @@ FULL_INCLUDE+= -I$(SD)
HDR_$(PKG):=$(SD)/*.h
LIB_$(PKG):=$(LIBDIR)/libsharp.a
BIN:=sharp_test sharp_acctest sharp_test_mpi sharp_bench
LIBOBJ:=ylmgen_c.o sharp.o sharp_geomhelpers.o sharp_almhelpers.o sharp_core.o
LIBOBJ:=sharp_ylmgen_c.o sharp.o sharp_announce.o sharp_geomhelpers.o sharp_almhelpers.o sharp_core.o
ALLOBJ:=$(LIBOBJ) sharp_test.o sharp_acctest.o sharp_test_mpi.o sharp_bench.o
LIBOBJ:=$(LIBOBJ:%=$(OD)/%)
ALLOBJ:=$(ALLOBJ:%=$(OD)/%)

4
libsharp/sharp.c
View file

@ -31,11 +31,11 @@
#include <math.h>
#include "ls_fft.h"
#include "ylmgen_c.h"
#include "sharp_ylmgen_c.h"
#include "sharp.h"
#include "c_utils.h"
#include "sharp_core.h"
#include "vec_utils.h"
#include "sharp_vecutil.h"
#include "walltime_c.h"
typedef complex double dcmplx;

3
libsharp/sharp_acctest.c
View file

@ -38,6 +38,7 @@
#include "sharp_geomhelpers.h"
#include "sharp_almhelpers.h"
#include "c_utils.h"
#include "sharp_announce.h"
#include "sharp_core.h"
typedef complex double dcmplx;
@ -183,7 +184,7 @@ int main(void)
#ifdef USE_MPI
MPI_Init(NULL,NULL);
#endif
module_startup_c("sharp_acctest",1,1,"",1);
sharp_module_startup("sharp_acctest",1,1,"",1);
int lmax=127;

3
libsharp/sharp_bench.c
View file

@ -36,6 +36,7 @@
#include "sharp_geomhelpers.h"
#include "sharp_almhelpers.h"
#include "c_utils.h"
#include "sharp_announce.h"
#include "sharp_core.h"
typedef complex double dcmplx;
@ -94,7 +95,7 @@ int main(void)
#ifdef USE_MPI
MPI_Init(NULL,NULL);
#endif
module_startup_c("sharp_bench",1,1,"",1);
sharp_module_startup("sharp_bench",1,1,"",1);
printf("Benchmarking SHTs.\n\n");
FILE *fp=fopen("oracle.inc","w");

8
libsharp/sharp_complex_hacks.h
View file

@ -22,19 +22,19 @@
* (DLR).
*/
/* \file complex_hacks.h
/* \file sharp_complex_hacks.h
* support for converting vector types and complex numbers
*
* Copyright (C) 2012 Max-Planck-Society
* Author: Martin Reinecke
*/
#ifndef COMPLEX_HACKS_H
#define COMPLEX_HACKS_H
#ifndef SHARP_COMPLEX_HACKS_H
#define SHARP_COMPLEX_HACKS_H
#include <math.h>
#include <complex.h>
#include "vecsupport.h"
#include "sharp_vecsupport.h"
#define UNSAFE_CODE

6
libsharp/sharp_core.c
View file

@ -32,9 +32,9 @@
#include <complex.h>
#include <math.h>
#include <string.h>
#include "vecsupport.h"
#include "complex_hacks.h"
#include "ylmgen_c.h"
#include "sharp_vecsupport.h"
#include "sharp_complex_hacks.h"
#include "sharp_ylmgen_c.h"
#include "sharp.h"
#include "sharp_core.h"
#include "c_utils.h"

2
libsharp/sharp_core.h
View file

@ -33,7 +33,7 @@
#define PLANCK_SHARP_CORE_H
#include "sharp.h"
#include "ylmgen_c.h"
#include "sharp_ylmgen_c.h"
#ifdef __cplusplus
extern "C" {

3
libsharp/sharp_test.c
View file

@ -59,6 +59,7 @@
#include "sharp_geomhelpers.h"
#include "sharp_almhelpers.h"
#include "c_utils.h"
#include "sharp_announce.h"
#include "sharp_core.h"
typedef complex double dcmplx;
@ -188,7 +189,7 @@ int main(int argc, char **argv)
#ifdef USE_MPI
MPI_Init(NULL,NULL);
#endif
module_startup_c("sharp_test",argc,7,
sharp_module_startup("sharp_test",argc,7,
"<healpix|ecp|gauss> <lmax> <nside|nphi> <niter> <spin> <ntrans>",1);
int lmax=atoi(argv[2]);

8
libsharp/sharp_vecsupport.h
View file

@ -22,18 +22,18 @@
* (DLR).
*/
/* \file vecsupport.h
/* \file sharp_vecsupport.h
* Convenience functions for vector arithmetics
*
* Copyright (C) 2012 Max-Planck-Society
* Author: Martin Reinecke
*/
#ifndef VECSUPPORT_H
#define VECSUPPORT_H
#ifndef SHARP_VECSUPPORT_H
#define SHARP_VECSUPPORT_H
#include <math.h>
#include "vec_utils.h"
#include "sharp_vecutil.h"
typedef double Ts;

6
libsharp/sharp_vecutil.h
View file

@ -22,15 +22,15 @@
* (DLR).
*/
/*! \file vec_utils.h
/*! \file sharp_vecutil.h
* Functionality related to vector instruction support
*
* Copyright (C) 2012 Max-Planck-Society
* \author Martin Reinecke
*/
#ifndef PLANCK_VEC_UTILS_H
#define PLANCK_VEC_UTILS_H
#ifndef SHARP_VECUTIL_H
#define SHARP_VECUTIL_H
#if (defined (__AVX__) && (!defined (DISABLE_AVX)) && (!defined (DISABLE_SSE2)))
#define VLEN 4

2
libsharp/sharp_ylmgen_c.c
View file

@ -31,7 +31,7 @@
#include <math.h>
#include <stdlib.h>
#include "ylmgen_c.h"
#include "sharp_ylmgen_c.h"
#include "c_utils.h"
void Ylmgen_init (Ylmgen_C *gen, int l_max, int m_max, int spin)

6
libsharp/sharp_ylmgen_c.h
View file

@ -22,15 +22,15 @@
* (DLR).
*/
/*! \file ylmgen_c.h
/*! \file sharp_ylmgen_c.h
* Code for efficient calculation of Y_lm(phi=0,theta)
*
* Copyright (C) 2005-2012 Max-Planck-Society
* \author Martin Reinecke
*/
#ifndef PLANCK_YLMGEN_C_H
#define PLANCK_YLMGEN_C_H
#ifndef SHARP_YLMGEN_C_H
#define SHARP_YLMGEN_C_H
#ifdef __cplusplus
extern "C" {