Commit f3b3f3a8 authored by Jolien Creighton's avatar Jolien Creighton

changes needed to compile with icc without producing warnings

Original: b31fe518ae45d29ffe18f4488ed2808b544970b1
parent fdcb8d07
......@@ -32,6 +32,10 @@
#include <mpi.h>
#ifndef _OPENMP
#define omp ignore
#endif
LALInferenceRunState *init_runstate(ProcessParamsTable *command_line);
void init_sampler(LALInferenceRunState *run_state);
......
......@@ -35,6 +35,11 @@
#define CVS_DATE "$Date$"
#define CVS_NAME_STRING "$Name$"
#ifndef _OPENMP
#define omp ignore
#endif
void ensemble_sampler(struct tagLALInferenceRunState *run_state) {
INT4 mpi_rank, mpi_size;
INT4 walker, nwalkers_per_thread;
......
......@@ -9,6 +9,11 @@
#include "ppe_likelihood.h"
#ifndef _OPENMP
#define omp ignore
#endif
/******************************************************************************/
/* LIKELIHOOD AND PRIOR FUNCTIONS */
/******************************************************************************/
......
......@@ -9,6 +9,10 @@
#include "ppe_models.h"
#include <lal/SinCosLUT.h>
#ifndef _OPENMP
#define omp ignore
#endif
#define SQUARE(x) ( (x) * (x) )
/******************************************************************************/
......
......@@ -353,7 +353,7 @@ number of detectors specified (no. dets = %d)\n", ml, ml, numDets);
if( (numDt = count_csv( fakedt )) != ml*numDets ){
fprintf(stderr, "Error... for %d harmonics the number of sample time steps for fake data must be %d times the \
number of detectors specified (no. dets =\%d)\n", ml, ml, numDets);
number of detectors specified (no. dets =%d)\n", ml, ml, numDets);
exit(0);
}
......@@ -407,7 +407,7 @@ number of detectors specified (no. dets =\%d)\n", ml, ml, numDets);
if ( count != ml*numDets ){
fprintf(stderr, "Error... for %d harmonics the number of input files given must be %d times the number of \
detectors specified (no. dets =\%d)\n", ml, ml, numDets);
detectors specified (no. dets =%d)\n", ml, ml, numDets);
exit(0);
}
}
......
......@@ -103,7 +103,7 @@ ezxml_t ezxml_idx(ezxml_t xml, int idx);
#define ezxml_name(xml) ((xml) ? xml->name : NULL)
/* returns the given tag's character content or empty string if none */
#define ezxml_txt(xml) ((xml) ? xml->txt : (const char *) "")
#define ezxml_txt(xml) ((xml) ? xml->txt : (const char *)"")
/* returns the value of the requested tag attribute, or NULL if not found */
const char *ezxml_attr(ezxml_t xml, const char *attr);
......
......@@ -21,6 +21,11 @@
#include <lal/LALDetCharHvetoUtils.h>
#include <lal/LIGOLwXML.h>
#ifndef _OPENMP
#define omp ignore
#endif
// Program level functions, mostly utility
// Fake a series of triggers
......
......@@ -42,6 +42,11 @@
#include <lal/LALInferenceKDE.h>
#include <lal/LALInferenceClusteredKDE.h>
#ifndef _OPENMP
#define omp ignore
#endif
/**
* Kmeans cluster data, increasing k until the BIC stops increasing.
......
......@@ -21,6 +21,11 @@
#include <lal/LALInferenceGenerateROQ.h>
#ifndef _OPENMP
#define omp ignore
#endif
/* internal function definitions */
/* define function to project model vector onto the training set of models */
......
......@@ -37,6 +37,11 @@
#include <lal/LALInference.h>
#include <lal/LALInferenceKDE.h>
#ifndef _OPENMP
#define omp ignore
#endif
/**
* Allocate, fill, and tune a Gaussian kernel density estimate from
......
......@@ -91,6 +91,10 @@
#include "logaddexp.h"
#ifndef _OPENMP
#define omp ignore
#endif
/* Storage for old GSL error handler. */
static gsl_error_handler_t *old_handler;
......
......@@ -43,6 +43,11 @@
#include "LALSimIMR.h"
#include "LALSimIMRPhenomC_internals.c" /* This is ugly, but allows us to reuse internal PhenomC functions without making those functions XLAL */
#ifndef _OPENMP
#define omp ignore
#endif
/**************************** PhenomP internal function prototypes *****************************/
/* PhenomC parameters for modified ringdown: Uses final spin formula of Barausse & Rezzolla, Astrophys.J.Lett.704:L40-L44, 2009 */
......
......@@ -33,6 +33,10 @@
#include <stdio.h>
#include <stdbool.h>
#ifndef _OPENMP
#define omp ignore
#endif
typedef struct tagLALSimInspiralSF2Orientation
{
REAL8 thetaJ, psiJ;
......
......@@ -35,6 +35,11 @@
#include <lal/XLALError.h>
#include "LALSimInspiralPNCoefficients.c"
#ifndef _OPENMP
#define omp ignore
#endif
/* This function allows SWIG to wrap the TaylorF2 phasing coefficients
* for use in external Python code
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment