Merging the new branch

BasicSolver/2D-seq/Makefile

@@ -1,5 +1,5 @@
 #=======================================================================================
-# Copyright (C) 2022 NHR@FAU, University Erlangen-Nuremberg.
+# Copyright (C) NHR@FAU, University Erlangen-Nuremberg.
 # All rights reserved.
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.
@@ -18,9 +18,10 @@ include $(MAKE_DIR)/include_$(TAG).mk
 INCLUDES  += -I$(SRC_DIR) -I$(BUILD_DIR)
 
 VPATH     = $(SRC_DIR)
-SRC       = $(wildcard $(SRC_DIR)/*.c)
+SRC       = $(filter-out $(wildcard $(SRC_DIR)/*-*.c),$(wildcard $(SRC_DIR)/*.c))
 ASM       = $(patsubst $(SRC_DIR)/%.c, $(BUILD_DIR)/%.s, $(SRC))
 OBJ       = $(patsubst $(SRC_DIR)/%.c, $(BUILD_DIR)/%.o, $(SRC))
+OBJ      += $(BUILD_DIR)/solver-$(SOLVER).o
 SOURCES   = $(SRC) $(wildcard $(SRC_DIR)/*.h)
 CPPFLAGS := $(CPPFLAGS) $(DEFINES) $(OPTIONS) $(INCLUDES)
 
@@ -39,7 +40,7 @@ $(BUILD_DIR)/%.s:  %.c
 
 .PHONY: clean distclean tags info asm format
 
-clean: vis
+clean:
 	$(info ===>  CLEAN)
 	@rm -rf $(BUILD_DIR)
 	@rm -f tags
@@ -47,11 +48,8 @@ clean: vis
 distclean: clean
 	$(info ===>  DIST CLEAN)
 	@rm -f $(TARGET)
-
-vis:
-	$(info ===>  REMOVING VIZUALISATION FILES)	
-	@rm -f vtk_files/particle*.vtk
-	@rm -f vis_files/particle*.dat
+	@rm -f *.dat
+	@rm -f *.png
 
 info:
 	$(info $(CFLAGS))