Commit 6719d8d3 authored by Nutaro J J's avatar Nutaro J J
Browse files

Made LAPACK the default linear solver

parent 956e058b

make.inc

+3 −3
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ ADEVS_INCLUDE = -I$(ADEVS_HOME)/include 
# You will need one of the following linear algebra packages installed on

# your system. 



#LUSOLVER = LAPACK

LUSOLVER = SUPERLU

LUSOLVER = LAPACK

#LUSOLVER = SUPERLU

#LUSOLVER = PAR1

#LUSOLVER = PAR2
@@ -80,7 +80,7 @@ endif 
# Edit these if needed. If you are using the GNU C++ compiler, then

# the defaults should be fine.

CXX = g++

CFLAGS = -Wall -O3 -fopenmp

CFLAGS = -Wall -g -fopenmp

CFLAGS += -D$(LUSOLVER) -DLUSOLVER=$(LUSOLVER)

LD = ar

LDFLAGS = -r

src/IEEE_CDF_Data.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ IEEE_CDF_Data::IEEE_CDF_Data(const char* data_file, bool noisy, bool init): 
	line = new char[LINE_LEN];

	buffer = new char[LINE_LEN];

	ifstream fin(data_file);

	if (fin.bad() && fin == 0)

	if (fin.bad() && !fin)

	{

		throw DataFileFormatException("Could not open file");

	}

src/PSSE_Raw_Data.cpp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ PSSE_Raw_Data::PSSE_Raw_Data(const char* data_file, bool noisy): 
	map<unsigned,unsigned> busID_to_index;

	char* line = new char[LINE_LEN];

	ifstream fin(data_file);

	if (fin.bad() && fin == 0)

	if (fin.bad() && !fin)

	{

		throw DataFileFormatException("Could not open file");

	}