Merge branch 'ft--opt-dislloop' into development

src/Makefile

@@ -1,9 +1,9 @@
- 
 FC=ifort
 FFLAGS=-mcmodel=large -g -O0 -stand f08 -fpe0 -traceback -check bounds,uninit -warn all -implicitnone -no-wrap-margin
-#FFLAGS=-mcmodel=large -Ofast
+#FFLAGS=-mcmodel=large -Ofast -no-wrap-margin
 MODES=mode_create.o mode_merge.o mode_convert.o
-OBJECTS=main.o elements.o io.o subroutines.o functions.o atoms.o call_mode.o box.o $(MODES)
+OPTIONS=opt_disl.o
+OBJECTS=main.o elements.o io.o subroutines.o functions.o atoms.o call_mode.o box.o call_option.o $(MODES) $(OPTIONS)
 
 .SUFFIXES:
 .SUFFIXES: .c .f .f90 .F90 .o
@@ -19,16 +19,25 @@ clean:
 	$(RM) cacmb  *.o 
 
 testfuncs: testfuncs.o functions.o subroutines.o
-	$(FC) testfuncs.o functions.o subroutines.o elements.o -o $@
+	$(FC) testfuncs.o functions.o subroutines.o box.o elements.o -o $@
 
 .PHONY: cleantest
 cleantest:
 	$(RM) testfuncs testfuncs.o
 
+.PHONY: test
+test: testfuncs
+	./testfuncs
+
+.PHONY: install
+install: cacmb
+	cp ./cacmb /usr/local/bin
+
 $(OBJECTS) : parameters.o
-atoms.o subroutines.o testfuncs.o : functions.o
-main.o io.o build_subroutines.o: elements.o 
+atoms.o subroutines.o testfuncs.o box.o : functions.o
+main.o io.o $(MODES) $(OPTIONS) : elements.o 
 call_mode.o : $(MODES)
+call_option.o : $(OPTIONS)
 $(MODES) io.o: atoms.o box.o
 $(MODES) main.o : io.o
-testfuncs.o elements.o mode_create.o: subroutines.o
+testfuncs.o elements.o mode_create.o opt_disl.o: subroutines.o