diff --git a/Makefile b/Makefile index 0581afa17e57133858bfc748cb81c681fb987621..1b5b41ee08e6a82497f4ac241a2eeda5b2ed5db6 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # Author: wfg #DEFAULT COMPILERS IN PATH, LIBS will be modified in Makefile.libs -CC:=g++ +CC:=g++-6 AR:=ar MPICC:=mpic++ LIBS:= diff --git a/buildDataMan.sh b/buildDataMan.sh index d629be60a9760fe40e599e863b59d300dc3ab3b5..e230ec601a2251f07e5b22aabfa70fccbc2a3d61 100755 --- a/buildDataMan.sh +++ b/buildDataMan.sh @@ -5,7 +5,7 @@ # Created on: Feb 9, 2017 # Author: wfg -DATAMAN_LOCATION=/home/wfg/Applications/DataMan +DATAMAN_LOCATION=/Users/w4g/Dropbox/lib/DataMan echo "######################################################################################" echo "Start building ADIOS ./lib/libadios.a ./libadios_nompi.a with DataMan library" echo "######################################################################################" diff --git a/examples/hello/datamanReader/Makefile b/examples/hello/datamanReader/Makefile index e88977553e5a44efa72e777c9c7f1e37ffc2d70e..e0f1266e5f1cd9afb4c6ea15f6db68598884f79a 100644 --- a/examples/hello/datamanReader/Makefile +++ b/examples/hello/datamanReader/Makefile @@ -28,16 +28,16 @@ CFLAGS=-Wall -O0 -g -Wpedantic -std=c++11 #SYSTEM LIBS LIB+= -lpthread -LIB_NOMPI+= -lpthread +LIB_NOMPI+= -ldl -lpthread all: mpi nompi mpi: $(ADIOS_LIB) $(ADIOS_HFiles) - $(MPICC) $(CFLAGS) $(INC) -DHAVE_MPI -DHAVE_DATAMAN $(BASE_NAME).cpp -o $(BASE_NAME).exe $(LIB) -lpthread + $(MPICC) $(CFLAGS) $(INC) -DHAVE_MPI -DHAVE_DATAMAN $(BASE_NAME).cpp -o $(BASE_NAME).exe $(LIB) nompi: $(ADIOS_NOMPI_LIB) $(NoMPI_HFiles) - $(CC) $(CFLAGS) $(INC) -DHAVE_DATAMAN $(BASE_NAME)_nompi.cpp -o $(BASE_NAME)_nompi.exe $(LIB_NOMPI) -lpthread + $(CC) $(CFLAGS) $(INC) -DHAVE_DATAMAN $(BASE_NAME)_nompi.cpp -o $(BASE_NAME)_nompi.exe $(LIB_NOMPI) clean: rm *.exe; diff --git a/include/engine/dataman/DataManWriter.h b/include/engine/dataman/DataManWriter.h index b5d2c91576d8d98632d4da22934f5a5acfbd6326..85b9a20a0c321550c08c1824fdf4f6742c7dbc81 100644 --- a/include/engine/dataman/DataManWriter.h +++ b/include/engine/dataman/DataManWriter.h @@ -110,7 +110,6 @@ private: m_WrittenVariables.insert( variable.m_Name ); DataManager dataManager; - dataManager.add_stream( "0", "0", 1, 1, 1, "0" ); //This part will go away, this is just to monitor variables per rank std::cout << "I am hooked to the DataMan library\n";