Skip to content

Cleanup SSE/BSE interfaces #1068

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

Open
rieder wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Cleanup SSE/BSE interfaces #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2211a20
Standardise class names, keep compatibility
rieder Aug 22, 2024
d6f9811
Update Makefile to use standardised name
rieder Aug 22, 2024
f0adf67
update BSE interface for style
rieder Aug 22, 2024
7b4f819
Cleanup fortran interface, remove old code
rieder Aug 22, 2024
1b6365f
update sse/bse tests
rieder Aug 22, 2024
9f66ae0
pass sse/bse tests through Black
rieder Aug 22, 2024
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
2 changes: 1 addition & 1 deletion src/amuse/community/bse/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ bse_worker: worker_code.f90 interface.o $(BSEOBJ)
$(MPIFC) $(FFLAGS) $(FS_FLAGS) $(LDFLAGS) $^ -o $@ $(FS_LIBS) $(LIBS)

worker_code.f90: interface.py
$(CODE_GENERATOR) --type=f90 interface.py BSEInterface -o $@
$(CODE_GENERATOR) --type=f90 interface.py BseInterface -o $@

.f.o: $<
$(FORTRAN) -c $(F77FLAGS) $(FFLAGS) -o $@ $<
15 changes: 2 additions & 13 deletions src/amuse/community/bse/interface.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ subroutine initialize(z_in,
real*8 mxns_in, pts1_in, pts2_in, pts3_in
real*8 sigma_in, beta_in, xi_in, acc2_in
real*8 epsnov_in, eddfac_in, gamma_in
CHARACTER*8 label(14)
character*8 label(14)
integer status
include 'src/const_bse.h'
common /SSE_init/ z, zpars
Expand Down Expand Up @@ -61,7 +61,7 @@ subroutine initialize(z_in,
*
* Set the collision matrix.
*
CALL instar
call instar
*
label(1) = 'INITIAL '
label(2) = 'KW CHNGE'
Expand Down Expand Up @@ -145,15 +145,6 @@ subroutine evolve_binary(type1,type2,initial_mass1,initial_mass2,
! dtp = 0.0d0
! dtp = age+1

c call evolv2(type1,type2,initial_mass1,initial_mass2,
c & mass1, mass2, radius1, radius2, luminosity1, luminosity2,
c & core_mass1, core_mass2, core_radius1, core_radius2,
c & envelope_mass1, envelope_mass2, envelope_radius1,
c & envelope_radius2, spin1, spin2, epoch1, epoch2,
c & MS_lifetime1, MS_lifetime2, age, end_time,
c & dtp,z,zpars,
c & orbital_period, eccentricity)

call evolv2(kstar,mass0,mass,rad,lum,massc,radc,
& menv,renv,ospin,epoch,tms,
& age, end_time,dtp,z,zpars,
Expand Down Expand Up @@ -193,8 +184,6 @@ subroutine get_time_step(type1, type2, initial_mass1,
& initial_mass2, mass1, mass2, MS_lifetime1,
& MS_lifetime2, epoch1, epoch2, age, time_step)

cf2py intent(out) dt
cf2py intent(in) kw, mass, age, mt, tm, epoch
implicit none
integer type1, type2
real*8 initial_mass1, initial_mass2, mass1, mass2
Expand Down
796 changes: 471 additions & 325 deletions src/amuse/community/bse/interface.py
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/amuse/community/sse/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ sse_worker: worker_code.f90 interface.o $(OBJ)
$(MPIF90) $(FCFLAGS) $(FS_FLAGS) $(LDFLAGS) $^ -o $@ $(FS_LIBS) $(LIBS)

worker_code.f90: interface.py
$(CODE_GENERATOR) --type=f90 interface.py SSEInterface -o $@
$(CODE_GENERATOR) --type=f90 interface.py SseInterface -o $@

.f.o: $<
$(FORTRAN) -c $(F77FLAGS) $(FCFLAGS) -o $@ $<
Expand Down
Loading