lxsd / fvn

Download as
Browse Code »

Commit 6164710c3d127f332ae084278e931cb89fea8bf7

Authored by cwaterkeyn
1 parent af246bca40
Exists in master and in 3 other branches geevx, geevx_2020, multi

ChW returned Makefiles to original William versions, no more "sophia" version 

SunStudio project now defined as "Makefile" type
	Make command being : export BTREE="$$(pwd)/.." && make -f Makefile && make -f Makefile install


git-svn-id: https://lxsd.femto-st.fr/svn/fvn@54 b657c933-2333-4658-acf2-d3c7c2708721

Showing 9 changed files with 1 additions and 73 deletions Side-by-side Diff

1 1  
2   -include $(BTREE)/Make.inc #définir dans Make.inc une variable sophia, et prévoir F95FLAGS ad hoc pour compil et modules
  2 +include $(BTREE)/Make.inc
3 3  
4 4  
5   -ifdef SOPHIA
6   -objects = fvnlib_sophia.o
7   -else
8 5 objects = fvnlib.o
9   -endif
10 6 modobjects = $(objects)
11 7  
12 8 library = libfvn$(libext)
13 9  
14 10  
... ... @@ -18,27 +14,9 @@
18 14 ( cd fvn_linear && make && make install )
19 15 ( cd fvn_integ && make && make install )
20 16 ( cd fvn_interpol && make && make install )
21   -ifndef SOPHIA
22 17 ( cd fvn_sparse && make && make install )
23   -endif
24 18 ( cd fvn_fnlib && make && make install )
25 19 ( cd fvn_misc && make && make install )
26   -
27   -submodules:
28   -#builds only modules local to fvn: go to sub-project, build sub-project modules, transfer them back here
29   -#if sub-project depend on another, it is built after, and its proper make searches modules here, not in the install tree
30   - ( cd fvn_common && make modules && mv *.mod .. )
31   - ( cd fvn_linear && make modules F95FLAGS="$(F95FLAGS) -M.." && mv *.mod .. )
32   - ( cd fvn_integ && make modules F95FLAGS="$(F95FLAGS) -M.." && mv *.mod .. )
33   - ( cd fvn_interpol && make modules F95FLAGS="$(F95FLAGS) -M.." && mv *.mod .. )
34   -ifndef SOPHIA
35   - ( cd fvn_sparse && make modules F95FLAGS="$(F95FLAGS) -M.." && mv *.mod .. )
36   -endif
37   - ( cd fvn_fnlib && make modules F95FLAGS="$(F95FLAGS) -M.." && mv *.mod .. )
38   - ( cd fvn_misc && make modules F95FLAGS="$(F95FLAGS) -M.." && mv *.mod .. )
39   -
40   -modules: submodules $(modobjects)
41   - rm -f $(modobjects)
42 20  
43 21 clean:
44 22 rm -f {*.o,*.oo,*.ipo,*.a,*.mod}
... ... @@ -5,12 +5,7 @@
5 5  
6 6 objects = fvn_common.o d1mach.o r1mach.o
7 7  
8   -modobjects = fvn_common.o
9   -
10 8 lib:$(objects)
11   -
12   -modules: $(modobjects)
13   - rm -f $(modobjects)
14 9  
15 10 install:
16 11 cp fvn_common.mod $(BTREE)/modules
... ... @@ -63,12 +63,7 @@
63 63 besjn.o dbesyn.o dbesjn.o beskn.o \
64 64 besin.o dbeskn.o dbesin.o
65 65  
66   -modobjects = fvn_fnlib.o
67   -
68 66 lib:$(objects)
69   -
70   -modules: $(modobjects)
71   - rm -f $(modobjects)
72 67  
73 68 install:
74 69 cp fvn_fnlib.mod $(BTREE)/modules
... ... @@ -2,12 +2,8 @@
2 2 include $(BTREE)/Make.inc
3 3  
4 4 objects = fvn_integ.o
5   -modobjects = fvn_integ.o
6 5  
7 6 all: $(objects)
8   -
9   -modules: $(modobjects)
10   - rm -f $(modobjects)
11 7  
12 8 clean:
13 9 rm -f {*.o,*.oo,*.ipo,*.a,*.mod}
fvn_interpol/Makefile
Diff comments   View file @ 6164710
... ... @@ -2,12 +2,8 @@
2 2 include $(BTREE)/Make.inc
3 3  
4 4 objects = fvn_interpol.o
5   -modobjects = fvn_interpol.o
6 5  
7 6 lib:$(objects)
8   -
9   -modules: $(modobjects)
10   - rm -f $(modobjects)
11 7  
12 8 install:
13 9 cp fvn_interpol.mod $(BTREE)/modules
... ... @@ -2,12 +2,8 @@
2 2 include $(BTREE)/Make.inc
3 3  
4 4 objects = fvn_linear.o
5   -modobjects = fvn_linear.o
6 5  
7 6 lib:$(objects)
8   -
9   -modules: $(modobjects)
10   - rm -f $(modobjects)
11 7  
12 8 install:
13 9 cp fvn_linear.mod $(BTREE)/modules
... ... @@ -2,12 +2,8 @@
2 2 include $(BTREE)/Make.inc
3 3  
4 4 objects = fvn_misc.o
5   -modobjects = fvn_misc.o
6 5  
7 6 lib:$(objects)
8   -
9   -modules: $(modobjects)
10   - rm -f $(modobjects)
11 7  
12 8 install:
13 9 cp fvn_misc.mod $(BTREE)/modules
... ... @@ -2,15 +2,11 @@
2 2 include $(BTREE)/Make.inc
3 3  
4 4 objects = fvn_sparse.o umfpack_wrapper.o
5   -modobjects = fvn_sparse.o
6 5  
7 6 all: suitesparse $(objects)
8 7  
9 8 suitesparse:
10 9 ( cd UMFPACK && make )
11   -
12   -modules: $(modobjects)
13   - rm -f $(modobjects)
14 10  
15 11 clean:
16 12 ( cd AMD && make clean )
fvnlib_sophia.f90
View file @ 6164710
1   -
2   -module fvn
3   -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
4   -!
5   -! fvn : a f95 module replacement for some imsl routines
6   -! it uses lapack for linear algebra
7   -! it uses modified quadpack for integration
8   -!
9   -! William Daniau 2007->today
10   -! william.daniau@femto-st.fr
11   -!
12   -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
13   -use fvn_common
14   -use fvn_linear
15   -use fvn_integ
16   -use fvn_interpol
17   -!use fvn_sparse !ChW : not used in Sophia for the moment
18   -use fvn_fnlib
19   -use fvn_misc
20   -end module fvn