diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0517eb3406ac1118e56dcac50ce6c044d1930b6b..6be118640b10b7cf4c4e8730c32ee7697a8d4507 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -193,9 +193,9 @@ sanity_stage: - valgrind --leak-check=full --log-file=valgrind.log ./test_ParticleDescriptor - grep "0 errors from 0 contexts" valgrind.log - echo "Running memory sanity check for output classes" - - chmod +x test_outputs + - chmod +x test_cluster_outputs - rm valgrind.log - - valgrind --leak-check=full --log-file=valgrind.log ./test_outputs + - valgrind --leak-check=full --log-file=valgrind.log ./test_cluster_outputs - grep "0 errors from 0 contexts" valgrind.log - rm -rf c_OCLU_24 @@ -295,8 +295,8 @@ testing_stage: - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_OCLU --html=pycompare_48.html - cd ../testing - echo "Checking consistency of HDF5 output" - - chmod u+x test_outputs - - ./test_outputs + - chmod u+x test_cluster_outputs + - ./test_cluster_outputs - export FFILE=../../test_data/cluster/OCLU_24 - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_OCLU_24 - rm -rf c_OCLU_24 diff --git a/build/Makefile b/build/Makefile index 10f9d355d7f4072decd2e46c4e9ef78865cd4827..938b3357f44cd1781a804305ac6247914d34c799 100644 --- a/build/Makefile +++ b/build/Makefile @@ -29,8 +29,8 @@ NP_SPHERE_BINS=sphere/np_sphere NP_TRAPPING_SRCS=../src/trapping/np_trapping.cpp ../src/trapping/cfrfme.cpp ../src/trapping/clffft.cpp NP_TRAPPING_OBJS=../src/trapping/np_trapping.o ../src/trapping/cfrfme.o ../src/trapping/clffft.o NP_TRAPPING_BINS=trapping/np_trapping -NP_TESTING_OBJS=../src/testing/test_outputs.o ../src/testing/test_ParticleDescriptor.o ../src/testing/test_TEDF.o ../src/testing/test_TTMS.o -NP_TESTING_BINS=testing/test_outputs testing/test_ParticleDescriptor testing/test_TEDF testing/test_TTMS +NP_TESTING_OBJS=../src/testing/test_cluster_outputs.o ../src/testing/test_ParticleDescriptor.o ../src/testing/test_TEDF.o ../src/testing/test_TTMS.o +NP_TESTING_BINS=testing/test_cluster_outputs testing/test_ParticleDescriptor testing/test_TEDF testing/test_TTMS all: $(NPTM_LIB) $(FORTRAN_BINS) $(NP_CLUSTER_BINS) $(NP_INCLUSION_BINS) $(NP_SPHERE_BINS) $(NP_TRAPPING_BINS) $(NP_TESTING_BINS) @@ -83,8 +83,8 @@ trapping/np_trapping: $(NPTM_LIB) $(NP_TRAPPING_OBJS) testing/test_ParticleDescriptor: $(NPTM_LIB) ../src/testing/test_ParticleDescriptor.o $(CXX) $(CXXFLAGS) ../src/testing/test_ParticleDescriptor.o -o $@ $(CXXLDFLAGS) -testing/test_outputs: $(NPTM_LIB) ../src/testing/test_outputs.o - $(CXX) $(CXXFLAGS) ../src/testing/test_outputs.o -o $@ $(CXXLDFLAGS) +testing/test_cluster_outputs: $(NPTM_LIB) ../src/testing/test_cluster_outputs.o + $(CXX) $(CXXFLAGS) ../src/testing/test_cluster_outputs.o -o $@ $(CXXLDFLAGS) testing/test_TEDF: $(NPTM_LIB) ../src/testing/test_TEDF.o $(CXX) $(CXXFLAGS) ../src/testing/test_TEDF.o -o $@ $(CXXLDFLAGS) diff --git a/src/testing/test_outputs.cpp b/src/testing/test_cluster_outputs.cpp similarity index 100% rename from src/testing/test_outputs.cpp rename to src/testing/test_cluster_outputs.cpp