From a262055bccb9512528b8088cce2b22f910ff751b Mon Sep 17 00:00:00 2001 From: Edgar Solomonik Date: Wed, 16 Dec 2015 23:21:11 +0100 Subject: [PATCH] Added call to set_abs_default() that should have been in Set::Set, as pointed out by Devin --- src/contraction/contraction.cxx | 2 +- src/interface/set.h | 2 +- src/summation/summation.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/contraction/contraction.cxx b/src/contraction/contraction.cxx index 7af2a733..7f7f5b25 100644 --- a/src/contraction/contraction.cxx +++ b/src/contraction/contraction.cxx @@ -3413,7 +3413,7 @@ namespace CTF_int { mapping * map; spctr * hctr = NULL; spctr ** rec_ctr = NULL; - ASSERT(A->wrld == B->wrld && B->wrld == C->wrld); + ASSERT(A->wrld->cdt.cm == B->wrld->cdt.cm && B->wrld->cdt.cm == C->wrld->cdt.cm); World * wrld = A->wrld; CommData global_comm = wrld->cdt; diff --git a/src/interface/set.h b/src/interface/set.h index 8fedc609..460706fa 100644 --- a/src/interface/set.h +++ b/src/interface/set.h @@ -158,7 +158,7 @@ namespace CTF { Set() : CTF_int::algstrct(sizeof(dtype)){ tmdtype = CTF_int::get_default_mdtype(is_custom_mdtype); - abs = NULL; + set_abs_to_default(); } void set_abs_to_default(){ diff --git a/src/summation/summation.cxx b/src/summation/summation.cxx index 5094af77..c4033e87 100644 --- a/src/summation/summation.cxx +++ b/src/summation/summation.cxx @@ -1969,7 +1969,7 @@ namespace CTF_int { int btopo; int gtopo; - ASSERT(A->wrld == B->wrld); + ASSERT(A->wrld->cdt.cm == B->wrld->cdt.cm); World * wrld = A->wrld; TAU_FSTART(map_tensor_pair);