From c7aaf922e872c455547e3c4c753e15b8a89c854c Mon Sep 17 00:00:00 2001 From: Alex James Wright Date: Sun, 28 Mar 2021 22:34:54 +0100 Subject: [PATCH] #39 Tests passing in new format --- Tests/CPU/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/CPU/Makefile b/Tests/CPU/Makefile index 02ec1e25..057918ee 100644 --- a/Tests/CPU/Makefile +++ b/Tests/CPU/Makefile @@ -57,7 +57,7 @@ INC_PARAMS = $(foreach d, $(INC_DIRS), -I$d) # Flags passed to the preprocessor. # Set Google Test's header directory as a system directory, such that # the compiler doesn't generate warnings in Google Test headers. -CPPFLAGS = -isystem $(GTEST_DIR)/include -Wall -std=c++11 +CPPFLAGS = -isystem $(GTEST_DIR)/include # Flags passed to the C++ compiler. # c++11 is required for the vector looping srmhd @@ -394,7 +394,7 @@ test_REGIME : wenoUpwinds.o srmhd.o test_REGIME.o REGIME.o initFunc.o RK2.o rkS # serial HDF5 tests -test_hdf5_rk2.o : $(TEST_DIR)/test_hdf5_rk2.cc $(INC_BASE_DIR)/RK2.h \ +test_hdf5_rk2.o : $(TEST_DIR)/test_hdf5_rk2.cc $(INC_BASE_DIR)/TimeIntegrators/RK2.h \ $(INC_BASE_DIR)/Physics/twoFluidEMHD.h $(INC_BASE_DIR)/Simulation/simulation.h $(INC_BASE_DIR)/Simulation/simData.h $(GTEST_HEADERS) $(HD5_CC) $(HDF5_FLAGS) $(MPI_FLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $(TEST_DIR)/test_hdf5_rk2.cc $(INC_PARAMS) -I$(RTFIND_INC_DIR) @@ -409,7 +409,7 @@ test_hdf5_rk2 : wenoUpwinds.o test_hdf5_rk2.o srmhd.o srrmhd.o fluxVectorSplitti main.o : $(TEST_DIR)/main.cpp $(INC_BASE_DIR)/Simulation/parallelEnv.h $(MPI_CC) $(MPI_FLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $(TEST_DIR)/main.cpp $(INC_PARAMS) -parallelEnv.o : $(MODULE_DIR)/Sinulation/parallelEnv.cc $(INC_BASE_DIR)/Simulation/parallelEnv.h +parallelEnv.o : $(MODULE_DIR)/Simulation/parallelEnv.cc $(INC_BASE_DIR)/Simulation/parallelEnv.h $(MPI_CC) $(MPI_FLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $(MODULE_DIR)/Simulation/parallelEnv.cc $(INC_PARAMS) parallelBoundaryConds.o : $(MODULE_DIR)/BoundaryConditions/parallelBoundaryConds.cc $(INC_BASE_DIR)/BoundaryConditions/parallelBoundaryConds.h