Merge branch 'refs/heads/Ver.2.0_alpha' into Ver.2.0_w_PVR

Makefile.in

@@ -85,45 +85,6 @@ $(MAKE_MOD_DEP): $(MHDDIR)/module_dependency/make_module_dependency.f90
 	mkdir -p $(BUILDDIR)/utilities
 	$(F90_LOCAL) $< -o $@
 
-depends: $(MAKE_MOD_DEP)
-	@echo "# Construct dependencies"; \
-	cd $(MHDDIR) ; \
-		$(GMAKE) \
-		GMAKE="$(GMAKE)" \
-		MAKEDIR="$(MAKEDIR)" \
-		BUILDDIR="$(BUILDDIR)" \
-		INSTDIR="$(INSTDIR)" \
-		MHDDIR="$(MHDDIR)" \
-		MPICHDIR="$(MPICHDIR)" \
-		MPICHLIBDIR="$(MPICHLIBDIR)" \
-		MPILIBS="$(MPILIBS)" \
-		MPICHBINDIR="$(MPICHBINDIR)" \
-		MPICHINCDIR="$(MPICHINCDIR)" \
-		MPIRUN="$(MPIRUN)" \
-		BLAS_LIBS="$(BLAS_LIBS)" \
-		ZLIB_CFLAGS="$(ZLIB_CFLAGS)"   \
-		ZLIB_LIBS="$(ZLIB_LIBS)"       \
-		PNG_CFLAGS="$(PNG_CFLAGS)"   \
-		PNG_LIBS="$(PNG_LIBS)"       \
-		FFTW3_CFLAGS="$(FFTW3_CFLAGS)" \
-		FFTW3_LIBS="$(FFTW3_LIBS)" \
-		HDF5_FFLAGS="$(HDF5_FFLAGS)" \
-		HDF5_LDFLAGS="$(HDF5_LDFLAGS)" \
-		HDF5_FLIBS="$(HDF5_FLIBS)" \
-		OPTFLAGS="$(OPTFLAGS)" \
-		F90OPTFLAGS="$(F90OPTFLAGS)" \
-		OPENMP_FCFLAGS="$(OPENMP_FCFLAGS)" \
-		OPENMP_CFLAGS="$(OPENMP_CFLAGS)" \
-		F90LIB="$(F90LIB)" \
-		MPIF90="$(MPIF90)" \
-		MPICC="$(MPICC)"   \
-		CC="$(CC)" \
-		AR="$(AR)" \
-		RANLIB="$(RANLIB)" \
-		MAKE_MOD_DEP="$(MAKE_MOD_DEP)" \
-		XL_FORTRAN="$(XL_FORTRAN)" \
-		depends
-
 makemake: $(MAKE_MOD_DEP)
 	echo "# Construct Makefile"; \
 	cd $(MHDDIR) ; \

src/C_libraries/BASE/Makefile

@@ -29,11 +29,8 @@ mod_list:
 	@echo  $(OBJ_BASE_C)   >> $(MAKENAME)
 	@echo   >> $(MAKENAME)
 
-
-module:
-
 depends:
-	@echo 'Construct dependencies in C_libraries/BASE'
+	@echo 'Construct compile list in C_libraries/BASE'
 	@echo '#' > $(MAKENAME).tmp
 	@for sources in $(SRC_BASE_C) ; do \
 		( \

src/C_libraries/Makefile

@@ -68,21 +68,10 @@ mod_list:
 	done
 
 
-module:
-	@for dir in $(SUBDIRS); do \
-		( cd $${dir};  \
-		echo 'copy compile commands for ' $$dir ; \
-		$(GMAKE) \
-		GMAKE='$(GMAKE)' \
-		MAKENAME='$(MAKENAME)' \
-		module \
-		) \
-	done
-
 depends:
 	@for dir in $(SUBDIRS); do \
 		( cd $${dir};  \
-		echo 'generate dependencies for ' $$dir ; \
+		echo 'generate compile list for ' $$dir ; \
 		$(GMAKE) \
 		GMAKE='$(GMAKE)' \
 		MAKE_MOD_DEP='$(MAKE_MOD_DEP)' \

src/External_libs/FFTPACK5.1D/Makefile

@@ -45,7 +45,5 @@ depends:
 	@echo '$(MOD_FFTPACK): $$(FFTPACK_DIR)/$(SRC_FFTPACK)' >> $(MAKENAME).depends
 	@echo '	' '$$(F90) -c $$(FFTPACKFLAG) $$<' >> $(MAKENAME).depends
 
-module:
-
 clean:
 	rm -f *.o *.mod *~ *.par *.diag *.a

src/External_libs/Makefile

@@ -61,20 +61,6 @@ mod_list:
 		) \
 	done
 
-
-module:
-	@for dir in $(SUBDIRS) ; do \
-		( \
-		echo 'generate compile commands for ' $$dir ; \
-		cd $${dir};  \
-		$(GMAKE) \
-		GMAKE='$(GMAKE)' \
-		MAKEDIR='$(MAKEDIR)' \
-		MAKENAME='$(MAKENAME)' \
-		module; \
-		) \
-	done
-
 depends:
 	@for dir in $(SUBDIRS) ; do \
 		( \

src/Fortran_libraries/MHD_src/IO/Makefile

@@ -24,8 +24,5 @@ mod_list:
 	@echo  $(MOD_MHD_IO) >> $(MAKENAME)
 	@echo '#' >> $(MAKENAME)
 
-
-module:
-
 depends:
 	@$(MAKE_MOD_DEP) $(MAKENAME).depends '$$(MHD_IO_DIR)' $(SOURCES)

src/Fortran_libraries/MHD_src/Makefile

@@ -68,22 +68,10 @@ mod_list:
 		) \
 	done
 
-
-module:
-	@for dir in $(SUBDIRS); do \
-		( echo 'generate compile list for ' $$dir ; \
-		cd $${dir};  \
-		$(GMAKE) \
-		GMAKE='$(GMAKE)' \
-		MAKENAME='$(MAKENAME)' \
-		module; \
-		) \
-	done
-
 depends:
 	@for dir in $(SUBDIRS); do \
 		( \
-		echo 'generate dependencies for ' $$dir ; \
+		echo 'generate compile list for ' $$dir ; \
 		cd $${dir};  \
 		$(GMAKE) \
 		GMAKE='$(GMAKE)' \

src/Fortran_libraries/MHD_src/radial_FDM/Makefile

@@ -24,9 +24,6 @@ mod_list:
 	@echo $(MOD_SPH_MHD_FDM) >> $(MAKENAME)
 	@echo '#' >> $(MAKENAME)
 
-
-module:
-
 depends:
 	@$(MAKE_MOD_DEP) $(MAKENAME).depends '$$(MHD_FDM_DIR)' $(SOURCES)
 

src/Fortran_libraries/MHD_src/sph_MHD/Makefile

@@ -24,9 +24,6 @@ mod_list:
 	@echo $(MOD_SPH_MHD) >> $(MAKENAME)
 	@echo '#' >> $(MAKENAME)
 
-
-module:
-
 depends:
 	@$(MAKE_MOD_DEP) $(MAKENAME).depends '$$(MHD_SPH_DIR)' $(SOURCES)
 

src/Fortran_libraries/Makefile

@@ -94,22 +94,10 @@ mod_list:
 		) \
 	done
 
-
-module:
-	@for dir in $(SUBDIRS); do \
-		( cd $${dir};  \
-		echo 'generate compile list for ' $$dir ; \
-		$(GMAKE) \
-		GMAKE='$(GMAKE)' \
-		MAKENAME='$(MAKENAME)' \
-		module; \
-		) \
-	done
-
 depends:
 	@for dir in $(SUBDIRS); do \
 		( cd $${dir};  \
-		echo 'generate dependencies for ' $$dir ; \
+		echo 'generate compile list for ' $$dir ; \
 		$(GMAKE) \
 		GMAKE='$(GMAKE)' \
 		MAKE_MOD_DEP='$(MAKE_MOD_DEP)' \

src/Fortran_libraries/PARALLEL_src/COMM_src/Makefile

@@ -24,9 +24,6 @@ mod_list:
 	@echo  $(MOD_COMM) >> $(MAKENAME)
 	@echo  '#'  >> $(MAKENAME)
 
-
-module:
-
 depends:
 	@$(MAKE_MOD_DEP) $(MAKENAME).depends '$$(COMMDIR)' $(SOURCES)
 

src/Fortran_libraries/PARALLEL_src/CONST_SPH_GRID/Makefile

@@ -29,9 +29,6 @@ mod_list:
 	@echo  $(MOD_SPH_GRID)   >> $(MAKENAME)
 	@echo  '#'  >> $(MAKENAME)
 
-
-module:
-
 depends:
 	@$(MAKE_MOD_DEP) $(MAKENAME).depends '$$(SPH_GRID_SRCDIR)' $(SOURCES)
 

src/Fortran_libraries/PARALLEL_src/MPI_IO/Makefile

@@ -24,9 +24,6 @@ mod_list:
 	@echo  $(MOD_MPI_IO) >> $(MAKENAME)
 	@echo  '#'  >> $(MAKENAME)
 
-
-module:
-
 depends:
 	@$(MAKE_MOD_DEP) $(MAKENAME).depends '$$(MPI_IO_DIR)' $(SOURCES)
 

src/Fortran_libraries/PARALLEL_src/MPI_ZLIB_IO/Makefile

@@ -24,9 +24,6 @@ mod_list:
 	@echo  $(MOD_MPI_ZLIB_IO) >> $(MAKENAME)
 	@echo  '#'  >> $(MAKENAME)
 
-
-module:
-
 depends:
 	@$(MAKE_MOD_DEP) $(MAKENAME).depends '$$(MPI_ZLIB_IO_DIR)' $(SOURCES)
 

src/Fortran_libraries/PARALLEL_src/Makefile

@@ -70,22 +70,10 @@ mod_list:
 		) \
 	done
 
-
-module:
-	@for dir in $(SUBDIRS); do \
-		( cd $${dir};  \
-		echo 'generate compile list for ' $$dir ; \
-		$(GMAKE) \
-		GMAKE='$(GMAKE)' \
-		MAKENAME='$(MAKENAME)' \
-		module; \
-		) \
-	done
-
 depends:
 	@for dir in $(SUBDIRS); do \
 		( cd $${dir};  \
-		echo 'generate dependencies for ' $$dir ; \
+		echo 'generate compile list for ' $$dir ; \
 		$(GMAKE) \
 		GMAKE='$(GMAKE)' \
 		MAKE_MOD_DEP='$(MAKE_MOD_DEP)' \

src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/Makefile

@@ -24,9 +24,6 @@ mod_list:
 	@echo  $(MOD_COMM_SPH) >> $(MAKENAME)
 	@echo  '#'  >> $(MAKENAME)
 
-
-module:
-
 depends:
 	@$(MAKE_MOD_DEP) $(MAKENAME).depends '$$(SPH_COMMDIR)' $(SOURCES)
 

src/Fortran_libraries/SERIAL_src/BASE/Makefile

@@ -25,8 +25,6 @@ mod_list:
 	@echo  '#'  >> $(MAKENAME)
 
 
-module:
-
 depends:
 	@$(MAKE_MOD_DEP) $(MAKENAME).depends '$$(BASEDIR)' $(SOURCES)
 

src/Fortran_libraries/SERIAL_src/FFT_wrapper/Makefile

@@ -25,9 +25,6 @@ mod_list:
 	@echo $(MOD_FFT_WRAP) >> $(MAKENAME)
 	@echo  '#' >> $(MAKENAME)
 
-
-module:
-
 depends:
 	@$(MAKE_MOD_DEP) $(MAKENAME).depends '$$(FFT_WRAP_DIR)' $(SOURCES)
 

src/Fortran_libraries/SERIAL_src/Fields/Makefile

@@ -24,9 +24,6 @@ mod_list:
 	@echo  $(MOD_FIELDS) >> $(MAKENAME)
 	@echo  '#'  >> $(MAKENAME)
 
-
-module:
-
 depends:
 	@$(MAKE_MOD_DEP) $(MAKENAME).depends '$$(FIELDIR)' $(SOURCES)
 

src/Fortran_libraries/SERIAL_src/Fortran2003/Makefile

@@ -24,9 +24,6 @@ mod_list:
 	@echo  $(MOD_F2003) >> $(MAKENAME)
 	@echo  '#'  >> $(MAKENAME)
 
-
-module:
-
 depends:
 	@$(MAKE_MOD_DEP) $(MAKENAME).depends '$$(F2003DIR)' $(SOURCES)
 

src/Fortran_libraries/SERIAL_src/IO/Makefile

@@ -22,8 +22,6 @@ mod_list:
 	@echo  MOD_IO=  \\ >> $(MAKENAME)
 	@echo  $(MOD_IO)   >> $(MAKENAME)
 
-module:
-
 depends:
 	@$(MAKE_MOD_DEP) $(MAKENAME).depends '$$(IO_DIR)' $(SOURCES)
 

src/Fortran_libraries/SERIAL_src/IO_ZLIB/Makefile

@@ -22,9 +22,6 @@ mod_list:
 	@echo  MOD_ZLIB_IO=  \\ >> $(MAKENAME)
 	@echo  $(MOD_ZLIB_IO)   >> $(MAKENAME)
 
-
-module:
-
 depends:
 	@$(MAKE_MOD_DEP) $(MAKENAME).depends '$$(ZLIB_IO_DIR)' $(SOURCES)
 

src/Fortran_libraries/SERIAL_src/Makefile

@@ -84,22 +84,10 @@ mod_list:
 		) \
 	done
 
-
-module:
-	@for dir in $(SUBDIRS); do \
-		( cd $${dir};  \
-		echo 'generate compile list for ' $$dir ; \
-		$(GMAKE) \
-		GMAKE='$(GMAKE)' \
-		MAKENAME='$(MAKENAME)' \
-		module; \
-		) \
-	done
-
 depends:
 	@for dir in $(SUBDIRS); do \
 		( cd $${dir};  \
-		echo 'generate dependencies for ' $$dir ; \
+		echo 'generate compile list for ' $$dir ; \
 		$(GMAKE) \
 		GMAKE='$(GMAKE)' \
 		MAKE_MOD_DEP='$(MAKE_MOD_DEP)' \

src/Fortran_libraries/SERIAL_src/SPH_SPECTR_src/Makefile

@@ -23,9 +23,6 @@ mod_list:
 	@echo  $(MOD_SPH_SPECTR) >> $(MAKENAME)
 	@echo  '#'  >> $(MAKENAME)
 
-
-module:
-
 depends:
 	@$(MAKE_MOD_DEP) $(MAKENAME).depends '$$(SPH_SPECTR_DIR)' $(SOURCES)
 

src/Fortran_libraries/SERIAL_src/gauss_integration/Makefile

@@ -24,9 +24,6 @@ mod_list:
 	@echo  $(MOD_GAUSS) >> $(MAKENAME)
 	@echo  '#'  >> $(MAKENAME)
 
-
-module:
-
 depends:
 	@$(MAKE_MOD_DEP) $(MAKENAME).depends '$$(GAUSSDIR)' $(SOURCES)
 

src/Fortran_libraries/SERIAL_src/spherical_harmonics/Makefile

@@ -23,9 +23,6 @@ mod_list:
 	@echo $(MOD_SPH) >> $(MAKENAME)
 	@echo  '#' >> $(MAKENAME)
 
-
-module:
-
 depends:
 	@$(MAKE_MOD_DEP) $(MAKENAME).depends '$$(SPH_DIR)' $(SOURCES)
 

src/Fortran_libraries/SOLVER_src/Makefile

@@ -67,22 +67,10 @@ mod_list:
 		) \
 	done
 
-module:
-	@echo '' >> $(MAKENAME)
-	@for dir in $(SUBDIRS); do \
-		( cd $${dir};  \
-		echo 'generate compile list for ' $$dir ; \
-		$(GMAKE) \
-		GMAKE='$(GMAKE)' \
-		MAKENAME='$(MAKENAME)' \
-		module; \
-		) \
-	done
-
 depends:
 	@for dir in $(SUBDIRS); do \
 		( cd $${dir};  \
-		echo 'generate dependencies for ' $$dir ; \
+		echo 'generate compile list for ' $$dir ; \
 		$(GMAKE) \
 		GMAKE='$(GMAKE)' \
 		MAKE_MOD_DEP='$(MAKE_MOD_DEP)' \