mirror of https://gitlab.com/scemama/EZFIO.git
Merge branch 'master' into master
This commit is contained in:
commit
54d64397ae
4
Makefile
4
Makefile
|
@ -30,10 +30,12 @@ include make.config
|
||||||
default: make.config
|
default: make.config
|
||||||
cd src && $(MAKE)
|
cd src && $(MAKE)
|
||||||
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
- bash -c "[[ -f lib/libezfio.a ]] && rm $$PWD/lib/*"
|
- bash -c "[[ -f lib/libezfio.a ]] && rm $$PWD/lib/*"
|
||||||
- bash -c "[[ -f Python/ezfio.py ]] && rm $$PWD/Python/*"
|
- bash -c "[[ -f Python/ezfio.py ]] && rm $$PWD/Python/*"
|
||||||
- bash -c "[[ -f Ocaml/ezfio.ml ]] && rm $$PWD/Ocaml/*"
|
- bash -c "[[ -f Ocaml/ezfio.ml ]] && rm $$PWD/Ocaml/*"
|
||||||
|
- bash -c "[[ -f Bash/ezfio.sh ]] && rm $$PWD/Bash/*"
|
||||||
- $(MAKE) -C $$PWD/src veryclean
|
- $(MAKE) -C $$PWD/src veryclean
|
||||||
|
|
||||||
archive: distclean
|
archive: distclean
|
||||||
|
@ -44,7 +46,7 @@ archive: distclean
|
||||||
rm -rf EZFIO
|
rm -rf EZFIO
|
||||||
|
|
||||||
make.config:
|
make.config:
|
||||||
python configure.py
|
./configure.py
|
||||||
|
|
||||||
veryclean:
|
veryclean:
|
||||||
$(MAKE) -C src veryclean
|
$(MAKE) -C src veryclean
|
||||||
|
|
|
@ -186,7 +186,7 @@ Create a file named ``create_input.py`` with:
|
||||||
|
|
||||||
.. code-block:: python
|
.. code-block:: python
|
||||||
|
|
||||||
#!/usr/bin/python
|
#!/usr/bin/python2
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
EZFIO = "./EZFIO" # Put here the absolute path to the EZFIO directory
|
EZFIO = "./EZFIO" # Put here the absolute path to the EZFIO directory
|
||||||
|
@ -229,7 +229,7 @@ Execute the script:
|
||||||
|
|
||||||
.. code-block:: bash
|
.. code-block:: bash
|
||||||
|
|
||||||
$ python create_input.py
|
$ python2 create_input.py
|
||||||
18.0
|
18.0
|
||||||
|
|
||||||
The printed mass is correct, and a new directory (``Water``) was created with our data:
|
The printed mass is correct, and a new directory (``Water``) was created with our data:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python2
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python2
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
include version
|
include version
|
||||||
|
|
||||||
rule build_generated_ninja
|
rule build_generated_ninja
|
||||||
command = python configure.py
|
command = python2 configure.py
|
||||||
description = Creating generated.ninja
|
description = Creating generated.ninja
|
||||||
|
|
||||||
rule run_ninja
|
rule run_ninja
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python2
|
||||||
|
|
||||||
import os,sys
|
import os,sys
|
||||||
|
|
||||||
|
@ -26,6 +26,7 @@ d_default = {
|
||||||
"FCFLAGS" : '-O2',
|
"FCFLAGS" : '-O2',
|
||||||
"RANLIB" : 'ranlib',
|
"RANLIB" : 'ranlib',
|
||||||
"AR" : 'ar',
|
"AR" : 'ar',
|
||||||
|
"BUILD_SYSTEM" : 'make',
|
||||||
"NINJA" : 'ninja',
|
"NINJA" : 'ninja',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -116,11 +117,11 @@ rule build_libezfio_irp_a
|
||||||
description = Building libezfio_irp.a
|
description = Building libezfio_irp.a
|
||||||
|
|
||||||
rule build_python
|
rule build_python
|
||||||
command = cd src ; python create_python.py
|
command = cd src ; python2 create_python.py
|
||||||
description = Building Python module
|
description = Building Python module
|
||||||
|
|
||||||
rule build_ocaml
|
rule build_ocaml
|
||||||
command = cd src ; python create_ocaml.py
|
command = cd src ; python2 create_ocaml.py
|
||||||
description = Building Ocaml module
|
description = Building Ocaml module
|
||||||
|
|
||||||
build {irpf90_files}: compile_irpf90 | {irpf90_sources} {CONFIG_FILES}
|
build {irpf90_files}: compile_irpf90 | {irpf90_sources} {CONFIG_FILES}
|
||||||
|
|
|
@ -51,10 +51,11 @@ static: ../lib/libezfio.a ../lib/libezfio_irp.a
|
||||||
$(AR) dv ../lib/libezfio_irp.a irp_stack.irp.o
|
$(AR) dv ../lib/libezfio_irp.a irp_stack.irp.o
|
||||||
$(RANLIB) ../lib/libezfio_irp.a
|
$(RANLIB) ../lib/libezfio_irp.a
|
||||||
|
|
||||||
../Python/ezfio.py:
|
|
||||||
python create_python.py
|
|
||||||
|
|
||||||
../Ocaml/ezfio.ml:
|
../Python/ezfio.py: ../lib/libezfio.a
|
||||||
python create_ocaml.py
|
python2 create_python.py
|
||||||
|
|
||||||
|
../Ocaml/ezfio.ml: ../lib/libezfio.a
|
||||||
|
python2 create_ocaml.py
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python2
|
||||||
# EZFIO is an automatic generator of I/O libraries
|
# EZFIO is an automatic generator of I/O libraries
|
||||||
# Copyright (C) 2009 Anthony SCEMAMA, CNRS
|
# Copyright (C) 2009 Anthony SCEMAMA, CNRS
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/bash
|
#!/usr/bin/env python2
|
||||||
# EZFIO is an automatic generator of I/O libraries
|
# EZFIO is an automatic generator of I/O libraries
|
||||||
# Copyright (C) 2009 Anthony SCEMAMA, CNRS
|
# Copyright (C) 2009 Anthony SCEMAMA, CNRS
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python2
|
||||||
# EZFIO is an automatic generator of I/O libraries
|
# EZFIO is an automatic generator of I/O libraries
|
||||||
# Copyright (C) 2009 Anthony SCEMAMA, CNRS
|
# Copyright (C) 2009 Anthony SCEMAMA, CNRS
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/python
|
#!/usr/bin/env python2
|
||||||
# EZFIO is an automatic generator of I/O libraries
|
# EZFIO is an automatic generator of I/O libraries
|
||||||
# Copyright (C) 2009 Anthony SCEMAMA, CNRS
|
# Copyright (C) 2009 Anthony SCEMAMA, CNRS
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/python
|
#!/usr/bin/env python2
|
||||||
# EZFIO is an automatic generator of I/O libraries
|
# EZFIO is an automatic generator of I/O libraries
|
||||||
# Copyright (C) 2009 Anthony SCEMAMA, CNRS
|
# Copyright (C) 2009 Anthony SCEMAMA, CNRS
|
||||||
#
|
#
|
||||||
|
|
|
@ -159,7 +159,7 @@ subroutine ezfio_set_file(filename_in)
|
||||||
call ezfio_mkdir(trim(libezfio_filename)//'/ezfio')
|
call ezfio_mkdir(trim(libezfio_filename)//'/ezfio')
|
||||||
call system('LANG= date > '//trim(libezfio_filename)//'/ezfio/creation')
|
call system('LANG= date > '//trim(libezfio_filename)//'/ezfio/creation')
|
||||||
call system('echo $USER > '//trim(libezfio_filename)//'/ezfio/user')
|
call system('echo $USER > '//trim(libezfio_filename)//'/ezfio/user')
|
||||||
BEGIN_SHELL [ /usr/bin/python ]
|
BEGIN_SHELL [ /usr/bin/env python2 ]
|
||||||
import os
|
import os
|
||||||
command = "'echo %s > '//trim(libezfio_filename)//'/ezfio/library'"
|
command = "'echo %s > '//trim(libezfio_filename)//'/ezfio/library'"
|
||||||
cwd = os.getcwd()
|
cwd = os.getcwd()
|
||||||
|
@ -178,7 +178,7 @@ subroutine ezfio_finish()
|
||||||
! Close all open buffers
|
! Close all open buffers
|
||||||
END_DOC
|
END_DOC
|
||||||
close(libezfio_iunit)
|
close(libezfio_iunit)
|
||||||
BEGIN_SHELL [ /usr/bin/python ]
|
BEGIN_SHELL [ /usr/bin/env python2 ]
|
||||||
import os
|
import os
|
||||||
from zlib import crc32
|
from zlib import crc32
|
||||||
print ' call irp_finalize_%s'%(str(abs(crc32(os.getcwd()))))
|
print ' call irp_finalize_%s'%(str(abs(crc32(os.getcwd()))))
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
! 31062 Toulouse Cedex 4
|
! 31062 Toulouse Cedex 4
|
||||||
! scemama@irsamc.ups-tlse.fr
|
! scemama@irsamc.ups-tlse.fr
|
||||||
|
|
||||||
BEGIN_SHELL [ /usr/bin/python ]
|
BEGIN_SHELL [ /usr/bin/env python2 ]
|
||||||
import groups
|
import groups
|
||||||
END_SHELL
|
END_SHELL
|
||||||
|
|
||||||
|
|
|
@ -111,7 +111,7 @@ subroutine libezfio_closez(filename,mode)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
BEGIN_SHELL [ /usr/bin/python ]
|
BEGIN_SHELL [ /usr/bin/env python2 ]
|
||||||
from f_types import format, t_short
|
from f_types import format, t_short
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/python
|
#!/usr/bin/env python2
|
||||||
# EZFIO is an automatic generator of I/O libraries
|
# EZFIO is an automatic generator of I/O libraries
|
||||||
# Copyright (C) 2009 Anthony SCEMAMA, CNRS
|
# Copyright (C) 2009 Anthony SCEMAMA, CNRS
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/python
|
#!/usr/bin/env python2
|
||||||
# EZFIO is an automatic generator of I/O libraries
|
# EZFIO is an automatic generator of I/O libraries
|
||||||
# Copyright (C) 2009 Anthony SCEMAMA, CNRS
|
# Copyright (C) 2009 Anthony SCEMAMA, CNRS
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in New Issue