Commit 8136acf0 authored by Miroslav Shaltev's avatar Miroslav Shaltev
Browse files

prepare to continue work on openmp

parent f9d30562
......@@ -408,7 +408,6 @@ bool FCFStatNomadEvaluator::eval_x( NOMAD::Eval_Point & x, const NOMAD::Double
}
if (MFCSearch->FirstPoint(s)) {
printf("AAAAAAAAAAAAAAAAAAAAAa CHECK s: %d\n",s);
MFCSearch->FirstPoint(s,FALSE);
}
else {
......
......@@ -2436,7 +2436,7 @@ INT4 FStatNomad::get_FC2F(ExPoint *p) {
}
FstatQuantities Fstat_what = FSTATQ_2F;
FstatResults *tFstat = NULL;
PrintPoint(1,p,"get_FC2F:",true);
// PrintPoint(1,p,"get_FC2F:",true);
//printf("%d dADRESS: tFstat: %x, cPoint: %x, Fstat_in_vec->data[0]: %x\n",omp_get_thread_num(),&tFstat,&cPoint,&Fstat_in_vec->data[0]);
#pragma omp critical
XLALComputeFstat(&tFstat,Fstat_in_vec->data[0],&cPoint,1,Fstat_what);
......
/* LALAppsBuildInfoHeader.h: generated by Makefile */
#define _CONFIGURE_ARGS ""
#define _CONFIGURE_DATE ""
#define _BUILD_DATE "2017-01-02T13:34:21+0200"
#define _BUILD_DATE "2017-01-02T19:08:28+0200"
......@@ -35,8 +35,8 @@ extern "C" {
#endif
/* VCS information */
#define CWSEAOPTIFOL_VCS_ID "045c90415a8ba911f4f267b1966c22f28c0ccef7"
#define CWSEAOPTIFOL_VCS_DATE "2016-11-6 18:00:07 +0000"
#define CWSEAOPTIFOL_VCS_ID "f9d30562b21ba6ab2dec9175e0ea7d1db910afaf"
#define CWSEAOPTIFOL_VCS_DATE "2017-01-2 12:03:44 +0000"
#define CWSEAOPTIFOL_VCS_BRANCH "master"
#define CWSEAOPTIFOL_VCS_TAG "None"
#define CWSEAOPTIFOL_VCS_AUTHOR "Miroslav Shaltev <miroslav.shaltev@shaltev.de>"
......@@ -45,7 +45,7 @@ extern "C" {
#define CWSEAOPTIFOL_VCS_STATUS "UNCLEAN: Modified working tree"
/* VCS header/library mismatch link check function */
#define CWSEAOPTIFOL_VCS_LINK_CHECK CWSEAOPTIFOL_UNCLEAN_045c90415a8ba911f4f267b1966c22f28c0ccef7_VCS_HEADER_LIBRARY_MISMATCH
#define CWSEAOPTIFOL_VCS_LINK_CHECK CWSEAOPTIFOL_UNCLEAN_f9d30562b21ba6ab2dec9175e0ea7d1db910afaf_VCS_HEADER_LIBRARY_MISMATCH
void CWSEAOPTIFOL_VCS_LINK_CHECK(void);
#ifdef __cplusplus
......
......@@ -20,22 +20,22 @@
# Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA
id = "045c90415a8ba911f4f267b1966c22f28c0ccef7"
date = "2016-11-6 18:00:07 +0000"
id = "f9d30562b21ba6ab2dec9175e0ea7d1db910afaf"
date = "2017-01-2 12:03:44 +0000"
branch = "master"
tag = "None"
if tag == "None":
tag = None
author = "Miroslav Shaltev <miroslav.shaltev@shaltev.de>"
builder = "Unknown User <>"
builder = "Miroslav Shaltev <miroslav.shaltev@shaltev.de>"
committer = "Miroslav Shaltev <miroslav.shaltev@shaltev.de>"
status = "UNCLEAN: Modified working tree"
version = id
verbose_msg = """Branch: master
Tag: None
Id: 045c90415a8ba911f4f267b1966c22f28c0ccef7
Id: f9d30562b21ba6ab2dec9175e0ea7d1db910afaf
Builder: Unknown User <>
Builder: Miroslav Shaltev <miroslav.shaltev@shaltev.de>
Repository status: UNCLEAN: Modified working tree"""
import warnings
......@@ -54,9 +54,9 @@ def check_match(foreign_id, onmismatch="raise"):
"""
if onmismatch not in ("raise", "warn"):
raise ValueError(onmismatch + " is an unrecognized value of onmismatch")
if foreign_id == "045c90415a8ba911f4f267b1966c22f28c0ccef7":
if foreign_id == "f9d30562b21ba6ab2dec9175e0ea7d1db910afaf":
return
msg = "Program id (045c90415a8ba911f4f267b1966c22f28c0ccef7) does not match given id (%s)." % foreign_id
msg = "Program id (f9d30562b21ba6ab2dec9175e0ea7d1db910afaf) does not match given id (%s)." % foreign_id
if onmismatch == "raise":
raise VersionMismatchError(msg)
......
Supports Markdown
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