Skip to content

Commit 5bb1fc2

Browse files
committed
Merge branch 'getsval' into 'main'
Uprev parafeed tag to v1.1.2 See merge request ardg/libra!105
2 parents 5360148 + 0f6129b commit 5bb1fc2

File tree

9 files changed

+4
-877
lines changed

9 files changed

+4
-877
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ set(LIBRA_CASACORE_GIT_REPOSITORY "https://github.com/preshanth/casacore.git")#"
3737
set(LIBRA_CASACORE_GIT_TAG "fix_regex_v3.5.0")#"2e121e67bf881ac7f309604447a4b0d481913902")#
3838

3939
set(LIBRA_PARAFEED_GIT_REPOSITORY "https://github.com/sanbee/parafeed.git")
40-
set(LIBRA_PARAFEED_GIT_TAG "v1.1.1")
40+
set(LIBRA_PARAFEED_GIT_TAG "v1.1.2")
4141

4242
set(LIBRA_SAKURA_GIT_REPOSITORY "https://github.com/tnakazato/sakura.git")
4343
set(LIBRA_SAKURA_GIT_TAG "libsakura-5.1.3")

apps/src/Coyote/coyote_cl_interface.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
*/
3232
#include <cl.h> // C++ized version
3333
#include <clinteract.h>
34-
#include <clgetBaseCode.h>
3534

3635
#include <coyote.h>
3736

apps/src/Hummbee/hummbee_cl_interface.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
//
3232
#include <cl.h> // C++ized version
3333
#include <clinteract.h>
34-
3534
#ifdef CONTACT_USE_MPI
3635
# include <mpi.h>
3736
#endif

apps/src/MSSplit/mssplit_cl_interface.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ int main(int argc, char **argv)
9696
{
9797
MSNBuf=OutMSBuf=fieldStr=timeStr=spwStr=baselineStr=
9898
uvdistStr=taqlStr=scanStr=arrayStr=polnStr=
99-
stateObsModeStr=observationStr="";
100-
fieldStr=spwStr="";
99+
stateObsModeStr=observationStr=fieldStr="";
100+
spwStr="*";
101101
deepCopy=0;
102102

103103
bool interactive = true;

apps/src/RoadRunner/roadrunner_cl_interface.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
//
3131
#include <cl.h> // C++ized version
3232
#include <clinteract.h>
33-
#include <clgetBaseCode.h>
3433

3534
#ifdef ROADRUNNER_USE_MPI
3635
# include <mpi.h>

apps/src/examples/dataiter.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
#include <cl.h> // C++ized version
3434
#include <clinteract.h>
35-
#include <clgetBaseCode.h>
3635
//
3736
//================================================================================
3837
//

src/synthesis/TransformMachines2/Utils.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1726,7 +1726,7 @@ namespace casa
17261726
std::string unit_p = freq.getFullUnit().getName();
17271727
std::string errUnit("");
17281728
if (unit_p.find("Hz") == std::string::npos) errUnit=unit_p;
1729-
if (unit.find("Hz") == std::string::npos) errUnit=unit;
1729+
if (unit.find("Hz") == std::string::npos) errUnit="[internal software bug] "+unit;
17301730
if (errUnit != "")
17311731
throw(AipsError(errUnit+string(" is not a valid unit for frequency")));
17321732

src/synthesis/TransformMachines2/test/tAWPFTM.cc

Lines changed: 0 additions & 272 deletions
This file was deleted.

0 commit comments

Comments
 (0)