Skip to content

Commit 37bdf71

Browse files
authored
update SIAB codes (#6462)
1 parent 20871ce commit 37bdf71

File tree

5 files changed

+29
-27
lines changed

5 files changed

+29
-27
lines changed

tools/SIAB/SimulatedAnnealing/backup_old_version/1_Source/Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
55
#===========================================================
66
#Dirac
77
#CPLUSPLUS =CXX -O3 -w -ffast-math -funroll-loops
8-
CPLUSPLUS = /usr/mpi/intel/openmpi-1.4.1/bin/mpicxx
8+
CPLUSPLUS = icpc
99
#CPLUSPLUS_GPROF = g++ -gp
1010
#CPLUSPLUS_MPI = /opt/openmpi/bin/mpicxx -O3 -w
11-
CPLUSPLUS_MPI=/usr/mpi/intel/openmpi-1.4.1/bin/mpicxx
11+
CPLUSPLUS_MPI = mpiicpc
1212
#Einstein
1313
#CPLUSPLUS_MPI = /opt/openmpi-intel9/bin/mpicxx -O3 -w
1414

15-
LIBS=-L/opt/intel/cmkl/10.2.5.035/lib/em64t -i-dynamic -Wl,--start-group -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -Wl,--end-group -openmp -lpthread \
15+
#LIBS=-L/opt/intel/cmkl/10.2.5.035/lib/em64t -i-dynamic -Wl,--start-group -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -Wl,--end-group -openmp -lpthread \
16+
17+
LIBS=-L/opt/intel/cmkl/10.2.5.035/lib/em64t -Wl,--start-group -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -Wl,--end-group
1618

1719
TOOLS_OBJS=src_tools/mathzone.o \
1820
src_tools/matrix.o \

tools/SIAB/SimulatedAnnealing/backup_old_version/1_Source/src_spillage/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ using namespace std;
2424
#include "../src_tools/matrix3.h"
2525
#include "../src_tools/complexmatrix.h"
2626
#include "../src_tools/complexarray.h"
27-
#include "../src_tools/module_external/lapack_connector.h"
27+
#include "../src_tools/lapack_connector.h"
2828
#include "../src_tools/Random.h"
2929
#include "../src_tools/timer.h"// added 2009-4-17
3030
#include "../src_tools/inverse_matrix.h"

tools/SIAB/SimulatedAnnealing/backup_old_version/1_Source/src_tools/complexarray.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,25 @@ class ComplexArray
3535

3636
void zero_out(void);
3737

38-
const int getSize() const
38+
int getSize() const
3939
{ return size;}
4040

41-
const int getDim() const
41+
int getDim() const
4242
{ return dim;}
4343

44-
const int getBound1() const
44+
int getBound1() const
4545
{ return bound1;}
4646

47-
const int getBound2() const
47+
int getBound2() const
4848
{ return bound2;}
4949

50-
const int getBound3() const
50+
int getBound3() const
5151
{ return bound3;}
5252

53-
const int getBound4() const
53+
int getBound4() const
5454
{ return bound4;}
5555

56-
static const int getArrayCount(void)
56+
int getArrayCount(void)
5757
{ return arrayCount;}
5858

5959
private:

tools/SIAB/SimulatedAnnealing/backup_old_version/1_Source/src_tools/intarray.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ class IntArray
4949

5050
void zero_out(void);
5151

52-
const int getSize() const{ return size;}
53-
const int getDim() const{ return dim;}
54-
const int getBound1() const{ return bound1;}
55-
const int getBound2() const{ return bound2;}
56-
const int getBound3() const{ return bound3;}
57-
const int getBound4() const { return bound4;}
58-
const int getBound5() const { return bound5;}
59-
const int getBound6() const { return bound6;}
52+
int getSize() const{ return size;}
53+
int getDim() const{ return dim;}
54+
int getBound1() const{ return bound1;}
55+
int getBound2() const{ return bound2;}
56+
int getBound3() const{ return bound3;}
57+
int getBound4() const { return bound4;}
58+
int getBound5() const { return bound5;}
59+
int getBound6() const { return bound6;}
6060

61-
static const int getArrayCount(void)
61+
int getArrayCount(void)
6262
{ return arrayCount;}
6363

6464
private:

tools/SIAB/SimulatedAnnealing/backup_old_version/1_Source/src_tools/realarray.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,25 @@ class realArray
3535

3636
void zero_out(void);
3737

38-
const int getSize() const
38+
int getSize() const
3939
{ return size;}
4040

41-
const int getDim() const
41+
int getDim() const
4242
{ return dim;}
4343

44-
const int getBound1() const
44+
int getBound1() const
4545
{ return bound1;}
4646

47-
const int getBound2() const
47+
int getBound2() const
4848
{ return bound2;}
4949

50-
const int getBound3() const
50+
int getBound3() const
5151
{ return bound3;}
5252

53-
const int getBound4() const
53+
int getBound4() const
5454
{ return bound4;}
5555

56-
static const int getArrayCount(void)
56+
int getArrayCount(void)
5757
{ return arrayCount;}
5858

5959
private:

0 commit comments

Comments
 (0)