Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attempt at python f2py wrapping #627

Draft
wants to merge 20 commits into
base: develop
Choose a base branch
from
+3,919 −0
Draft

Attempt at python f2py wrapping #627

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
25c7f4b
initialise python
SimonBiggs Aug 25, 2020
f4d98f4
fix end of line on pre-commit-confoig
SimonBiggs Aug 25, 2020
2ebec9f
convert egsnrc.mortran --> egsnrc.f
SimonBiggs Aug 25, 2020
b41c11e
successfully building egsnrc.so
SimonBiggs Aug 25, 2020
df83dd5
add __pycache__ to .gitignore
SimonBiggs Aug 25, 2020
be1a229
new line in .gitignore
SimonBiggs Aug 25, 2020
71e18fd
add in a basic ausgab function
SimonBiggs Aug 25, 2020
cce20a1
make ausgab a stub
SimonBiggs Aug 25, 2020
b119eb2
start by copying in tutor1.mortran
SimonBiggs Aug 25, 2020
e0d04e2
successfully building with tutor1 code included
SimonBiggs Aug 25, 2020
982e1b2
Python can see the fortran functions
SimonBiggs Aug 25, 2020
c6fa638
pyegsnrc --> egsnrc
SimonBiggs Aug 25, 2020
6ebc027
ignore dist files
SimonBiggs Aug 25, 2020
84cf12d
support jupyter notebooks
SimonBiggs Sep 1, 2020
100d5ab
remove import hello world, begin notebook
SimonBiggs Sep 1, 2020
11a22b6
force usage of tutor_data for now
SimonBiggs Sep 1, 2020
2c885f1
force ucode = tutor1
SimonBiggs Sep 1, 2020
201e5aa
failed attempts to pretend to have user_code=tutor1
SimonBiggs Sep 1, 2020
38c5892
egs init running! ...finally
SimonBiggs Sep 1, 2020
40b5ba8
remove excess user_code overwrites
SimonBiggs Sep 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
successfully building egsnrc.so
  • Loading branch information
@SimonBiggs
SimonBiggs committed Aug 25, 2020
commit b41c11eb30630bfcad18628b3f9c3172ea6b35a3
0 HEN_HOUSE/python/fortran/.gitignore → HEN_HOUSE/python/.gitignore
View file
Open in desktop
File renamed without changes.
12 changes: 9 additions & 3 deletions HEN_HOUSE/python/fortran/Makefile → HEN_HOUSE/python/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
###############################################################################
#
# Copyright (C) 2020 Simon Biggs
# Copyright (C) 2015 National Research Council Canada
#
# This file is part of EGSnrc.
Expand Down Expand Up @@ -27,7 +28,9 @@

include $(EGS_CONFIG)

all: egsnrc.f
export PYTHON_BUILD = cpython-37m-x86_64-linux-gnu

all: pyegsnrc/egsnrc.$(PYTHON_BUILD).so

SOURCES = \
$(EGS_SOURCEDIR)egsnrc.macros \
Expand All @@ -36,7 +39,10 @@ SOURCES = \
$(RANDOM).mortran \
$(EGS_SOURCEDIR)nrcaux.mortran \
$(MACHINE_MORTRAN) \
$(EGS_SOURCEDIR)egs_utilities.mortran \
$(EGS_SOURCEDIR)egsnrc.mortran

egsnrc.f :
$(MORTRAN_EXE) -s -d $(MORTRAN_DATA) -f $(SOURCES) $< -o7 $@ -o8 egsnrc.mortlst
pyegsnrc/egsnrc.%.so :
$(MORTRAN_EXE) -s -d $(MORTRAN_DATA) -f $(SOURCES) $< -o7 ./pyegsnrc/egsnrc.f -o8 egsnrc.mortlst
poetry run python -m numpy.f2py -c ./pyegsnrc/egsnrc.f -m egsnrc
mv egsnrc.$(PYTHON_BUILD).so $@