download_codes fixes for bonsai, flash and some fixes for mocassin (b…

…ut that one needs

source update)

src/amuse/community/bonsai2/Makefile

@@ -24,6 +24,7 @@ CODELIB = src/bonsai/runtime/libbonsai_amuse.a
 
 DOWNLOAD_FROM_WEB = $(PYTHON) ./download.py
 
+DOWNLOAD_CODES?=1
 
 all: compile bonsai_worker 
 

src/amuse/community/flash/Makefile

@@ -27,36 +27,15 @@ flash_obj = $(filter-out  $(ignore_obj), $(allflash_obj))
 
 all: flash_worker 
 
-ifdef DOWNLOAD_CODES
 $(CODEDIR)/makefile:
-	make -C . download
-else
-$(CODEDIR)/makefile:
-	@echo ""
-	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@echo ""
-	@echo "DOWNLOAD_CODES is not set. FLASH will not be downloaded and build."
-	@echo "If you do want FLASH, set DOWNLOAD_CODES to 1."
-	@echo "bash> export DOWNLOAD_CODES=1"
-	@echo "csh> setenv DOWNLOAD_CODES 1"
-	@echo "*** Unfortunately due to flash download restrictions;"
-	@echo "*** FLASH CANNOT be download automatically by this makefile"
-	@echo "*** Please register and download flash yourself"
-	@echo "*** You can do so at https://flash.rochester.edu/site/flashcode/coderequest/"
-	@echo ""
-	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@echo ""
-	@make -s --no-print-directory -C . raise_error
-endif
-
-download:
 	@echo ""
 	@echo "*** Unfortunately due to flash download restrictions;"
 	@echo "*** FLASH CANNOT be download automatically by this makefile"
 	@echo "*** Please register and download flash yourself"
 	@echo "*** You can do so at https://flash.rochester.edu/site/flashcode/coderequest/"
 	@echo ""
-	@make -s --no-print-directory -C . raise_error
+	@echo "*** aafter downloading, extract or copy the source to $(CODEDIR) such that a $(CODEDIR)/makefile exists"
+	@exit -1
 
 clean:
 	$(RM) -f *.so *.o *.pyc worker_code.cc worker_code.h #flash.par

src/amuse/community/mocassin/Makefile

@@ -33,8 +33,9 @@ OBJECTS = $(SOURCES:.f90=.o)
 DOWNLOAD_FROM_WEB = $(PYTHON) ./download.py
 PATCH_FILES = $(PYTHON) ./patch_files.py
 
+DOWNLOAD_CODES?=1
 
-FFLAGS   += -Wall -g -I$(CODEDIR)/source
+FFLAGS   += -Wall -g -I$(CODEDIR)/source -fallow-invalid-boz
 LDFLAGS  += -lm $(MUSE_LD_FLAGS)
 
 all: mocassin_worker 
@@ -59,7 +60,7 @@ endif
 
 download:
 	$(RM) -Rf .pc
-	$(DOWNLOAD_FROM_WEB) $(VERSION)
+	$(DOWNLOAD_FROM_WEB) --version $(VERSION)
 	$(PATCH_FILES)
 	make -C $(CODEDIR) clean
 
@@ -79,7 +80,7 @@ $(CODELIB): $(CODEDIR)/makefile
 	echo $(FC)
 	echo $(FORTRAN)
 	make -C $(CODEDIR) clean
-	make -C $(CODEDIR) all
+	make -C $(CODEDIR) all FFLAGS="$(FFLAGS)"
 
 worker_code.f90: interface.py
 	$(CODE_GENERATOR) --type=f90 interface.py MocassinInterface -o $@

src/amuse/community/mocassin/download.py

@@ -30,7 +30,7 @@ def unpack_downloaded_file(self, filename):
             cwd=os.path.join(self.src_directory())
         )
         subprocess.call(
-            ['mv', 'mocassin.{version}'.format(version = self.version), 'mocassin'],
+            ['ln','-s', 'mocassin.{version}'.format(version = self.version), 'mocassin'],
             cwd = os.path.join(self.src_directory())
         )
         print("done")