Skip to content

Commit

Permalink
Merge branch 'release/1.2.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
@szaghi
szaghi committed Mar 30, 2016
2 parents b3e0245 + b5d3d2a commit 9e0376d
Show file tree
Hide file tree
Showing 27 changed files with 421 additions and 2,490 deletions.
9 changes: 6 additions & 3 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "src/lib/IR_Precision"]
path = external/IR_Precision
url = https://github.com/szaghi/IR_Precision
[submodule "src/third_party/PENF"]
path = src/third_party/PENF
url = https://github.com/szaghi/PENF
[submodule "src/third_party/BeFoR64"]
path = src/third_party/BeFoR64
url = https://github.com/szaghi/BeFoR64
1 change: 1 addition & 0 deletions doc/README-BeFoR64.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../src/third_party/BeFoR64/doc/README-BeFoR64.md
1 change: 1 addition & 0 deletions doc/README-PENF.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../src/third_party/PENF/doc/README-PENF.md
1 change: 0 additions & 1 deletion external/IR_Precision
Submodule IR_Precision deleted from 97ae15
68 changes: 34 additions & 34 deletions makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ help:

#----------------------------------------------------------------------------------------------------------------------------------
# directory & file
DSRC = ./src/lib/ ./src/test/
DSRC = ./src/lib/ ./src/test/ ./src/third_party/BeFoR64/src/lib/ ./src/third_party/PENF/src/lib/
DEXE = ./
ifeq "$(SHARED)" "yes"
DLIB = ./shared/
Expand Down Expand Up @@ -252,7 +252,7 @@ COTEXT = -e "\033[1;31m Compiling\033[0m\033[1m $(<F)\033[0m"
LITEXT = -e "\033[1;31m Linking library\033[0m\033[1m $@\033[0m"

# linking rules
Lib_VTK_IO : PRINTINFO $(MKDIRS) $(DOBJ)ir_precision.o $(DOBJ)lib_vtk_io.o
Lib_VTK_IO : PRINTINFO $(MKDIRS) $(DOBJ)penf.o $(DOBJ)lib_vtk_io.o
@echo $(LITEXT) | tee -a make.log
@$(MAKELIB) 1>> diagnostic_messages 2>> error_messages

Expand All @@ -262,123 +262,123 @@ $(DEXE)Test_Driver : PRINTINFO $(MKDIRS) $(DOBJ)Test_Driver.o
@$(FC) $(OPTSL) $(DOBJ)*.o $(LIBS) -o $@ 1>> diagnostic_messages 2>> error_messages

# compiling rules
$(DOBJ)ir_precision.o : IR_Precision.f90
$(DOBJ)penf.o : penf.F90
@echo $(COTEXT) | tee -a make.log
@$(FC) $(OPTSC) $< -o $@ 1>> diagnostic_messages 2>> error_messages

$(DOBJ)lib_pack_data.o : Lib_Pack_Data.f90 \
$(DOBJ)ir_precision.o
$(DOBJ)penf.o
@echo $(COTEXT) | tee -a make.log
@$(FC) $(OPTSC) $< -o $@ 1>> diagnostic_messages 2>> error_messages

$(DOBJ)lib_base64.o : Lib_Base64.f90 \
$(DOBJ)ir_precision.o\
$(DOBJ)befor64.o : befor64.F90 \
$(DOBJ)penf.o\
$(DOBJ)lib_pack_data.o
@echo $(COTEXT) | tee -a make.log
@$(FC) $(OPTSC) $< -o $@ 1>> diagnostic_messages 2>> error_messages

$(DOBJ)lib_vtk_io_pvtk_xml.o: Lib_VTK_IO_PVTK_XML.f90 \
$(DOBJ)ir_precision.o \
$(DOBJ)lib_base64.o \
$(DOBJ)penf.o \
$(DOBJ)befor64.o \
$(DOBJ)lib_vtk_io_back_end.o
@echo $(COTEXT) | tee -a make.log
@$(FC) $(OPTSC) $< -o $@ 1>> diagnostic_messages 2>> error_messages

$(DOBJ)lib_vtk_io_end_xml.o: Lib_VTK_IO_END_XML.f90 \
$(DOBJ)ir_precision.o \
$(DOBJ)lib_base64.o \
$(DOBJ)penf.o \
$(DOBJ)befor64.o \
$(DOBJ)lib_vtk_io_back_end.o
@echo $(COTEXT) | tee -a make.log
@$(FC) $(OPTSC) $< -o $@ 1>> diagnostic_messages 2>> error_messages

$(DOBJ)lib_vtk_io_geo.o: Lib_VTK_IO_GEO.f90 \
$(DOBJ)ir_precision.o \
$(DOBJ)penf.o \
$(DOBJ)lib_vtk_io_back_end.o
@echo $(COTEXT) | tee -a make.log
@$(FC) $(OPTSC) $< -o $@ 1>> diagnostic_messages 2>> error_messages

$(DOBJ)lib_vtk_io_ini_xml.o: Lib_VTK_IO_INI_XML.f90 \
$(DOBJ)ir_precision.o \
$(DOBJ)lib_base64.o \
$(DOBJ)penf.o \
$(DOBJ)befor64.o \
$(DOBJ)lib_vtk_io_back_end.o
@echo $(COTEXT) | tee -a make.log
@$(FC) $(OPTSC) $< -o $@ 1>> diagnostic_messages 2>> error_messages

$(DOBJ)lib_vtk_io_fld_xml.o: Lib_VTK_IO_FLD_XML.f90 \
$(DOBJ)ir_precision.o \
$(DOBJ)lib_base64.o \
$(DOBJ)penf.o \
$(DOBJ)befor64.o \
$(DOBJ)lib_vtk_io_back_end.o
@echo $(COTEXT) | tee -a make.log
@$(FC) $(OPTSC) $< -o $@ 1>> diagnostic_messages 2>> error_messages

$(DOBJ)lib_vtk_io_dat_var_xml.o: Lib_VTK_IO_DAT_VAR_XML.f90 \
$(DOBJ)ir_precision.o \
$(DOBJ)lib_base64.o \
$(DOBJ)penf.o \
$(DOBJ)befor64.o \
$(DOBJ)lib_vtk_io_back_end.o
@echo $(COTEXT) | tee -a make.log
@$(FC) $(OPTSC) $< -o $@ 1>> diagnostic_messages 2>> error_messages

$(DOBJ)lib_vtk_io_con_xml.o: Lib_VTK_IO_CON_XML.f90 \
$(DOBJ)ir_precision.o \
$(DOBJ)lib_base64.o \
$(DOBJ)penf.o \
$(DOBJ)befor64.o \
$(DOBJ)lib_vtk_io_back_end.o
@echo $(COTEXT) | tee -a make.log
@$(FC) $(OPTSC) $< -o $@ 1>> diagnostic_messages 2>> error_messages

$(DOBJ)lib_vtk_io_back_end.o: Lib_VTK_IO_Back_End.f90 \
$(DOBJ)ir_precision.o
$(DOBJ)penf.o
@echo $(COTEXT) | tee -a make.log
@$(FC) $(OPTSC) $< -o $@ 1>> diagnostic_messages 2>> error_messages

$(DOBJ)lib_vtk_io_ini.o: Lib_VTK_IO_INI.f90 \
$(DOBJ)ir_precision.o \
$(DOBJ)lib_base64.o \
$(DOBJ)penf.o \
$(DOBJ)befor64.o \
$(DOBJ)lib_vtk_io_back_end.o
@echo $(COTEXT) | tee -a make.log
@$(FC) $(OPTSC) $< -o $@ 1>> diagnostic_messages 2>> error_messages

$(DOBJ)lib_vtk_io_pvd_xml.o: Lib_VTK_IO_PVD_XML.f90 \
$(DOBJ)ir_precision.o \
$(DOBJ)lib_base64.o \
$(DOBJ)penf.o \
$(DOBJ)befor64.o \
$(DOBJ)lib_vtk_io_back_end.o
@echo $(COTEXT) | tee -a make.log
@$(FC) $(OPTSC) $< -o $@ 1>> diagnostic_messages 2>> error_messages

$(DOBJ)lib_vtk_io_geo_xml.o: Lib_VTK_IO_GEO_XML.f90 \
$(DOBJ)ir_precision.o \
$(DOBJ)lib_base64.o \
$(DOBJ)penf.o \
$(DOBJ)befor64.o \
$(DOBJ)lib_vtk_io_back_end.o
@echo $(COTEXT) | tee -a make.log
@$(FC) $(OPTSC) $< -o $@ 1>> diagnostic_messages 2>> error_messages

$(DOBJ)lib_vtk_io_end.o: Lib_VTK_IO_END.f90 \
$(DOBJ)ir_precision.o \
$(DOBJ)penf.o \
$(DOBJ)lib_vtk_io_back_end.o
@echo $(COTEXT) | tee -a make.log
@$(FC) $(OPTSC) $< -o $@ 1>> diagnostic_messages 2>> error_messages

$(DOBJ)lib_vtk_io_con.o: Lib_VTK_IO_CON.f90 \
$(DOBJ)ir_precision.o \
$(DOBJ)penf.o \
$(DOBJ)lib_vtk_io_back_end.o
@echo $(COTEXT) | tee -a make.log
@$(FC) $(OPTSC) $< -o $@ 1>> diagnostic_messages 2>> error_messages

$(DOBJ)lib_vtk_io_dat_var.o: Lib_VTK_IO_DAT_VAR.f90 \
$(DOBJ)ir_precision.o \
$(DOBJ)penf.o \
$(DOBJ)lib_vtk_io_back_end.o
@echo $(COTEXT) | tee -a make.log
@$(FC) $(OPTSC) $< -o $@ 1>> diagnostic_messages 2>> error_messages

$(DOBJ)lib_vtk_io_vtm_xml.o: Lib_VTK_IO_VTM_XML.f90 \
$(DOBJ)ir_precision.o \
$(DOBJ)lib_base64.o \
$(DOBJ)penf.o \
$(DOBJ)befor64.o \
$(DOBJ)lib_vtk_io_back_end.o
@echo $(COTEXT) | tee -a make.log
@$(FC) $(OPTSC) $< -o $@ 1>> diagnostic_messages 2>> error_messages

$(DOBJ)lib_vtk_io.o : Lib_VTK_IO.f90 \
$(DOBJ)ir_precision.o \
$(DOBJ)lib_base64.o \
$(DOBJ)penf.o \
$(DOBJ)befor64.o \
$(DOBJ)lib_vtk_io_back_end.o \
$(DOBJ)lib_vtk_io_ini_xml.o \
$(DOBJ)lib_vtk_io_fld_xml.o \
Expand All @@ -398,7 +398,7 @@ $(DOBJ)lib_vtk_io.o : Lib_VTK_IO.f90 \
@$(FC) $(OPTSC) $< -o $@ 1>> diagnostic_messages 2>> error_messages

$(DOBJ)Test_Driver.o : Test_Driver.f90 \
$(DOBJ)ir_precision.o \
$(DOBJ)penf.o \
$(DOBJ)lib_vtk_io.o
@echo $(COTEXT) | tee -a make.log
@$(FC) $(OPTSC) $< -o $@ 1>> diagnostic_messages 2>> error_messages
Expand Down
1 change: 0 additions & 1 deletion src/lib/IR_Precision.f90
View file

This file was deleted.

Loading

0 comments on commit 9e0376d

Please sign in to comment.