Skip to content

Make the use of some null functions more consistent #907

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
VincentVanlaer wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Make the use of some null functions more consistent #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
623823b
pgplot: remove decorator null functions
VincentVanlaer Dec 23, 2025
899b638
binary: remove unused null_binary_controls from tests
VincentVanlaer Dec 23, 2025
8db1e19
kap: make other hooks init more consistent
VincentVanlaer Dec 23, 2025
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
1 change: 0 additions & 1 deletion binary/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ SRCS := \
other/mod_other_e2.f90 \
other/mod_other_pgbinary_plots.f90 \
other/mod_other_tidal_deformation_switch_function.f90 \
other/pgbinary_decorator.f90

ifeq ($(WITH_PGSTAR),yes)
SRCS += \
Expand Down
38 changes: 19 additions & 19 deletions binary/defaults/pgbinary.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@


! Enables calling a subroutine to add extra information to a plot
! see ``$MESA_DIR/binary/other/pgbinary_decorator.f90``
! see ``$MESA_DIR/binary/public/binary_pgbinary.f90``

! ::

Expand Down Expand Up @@ -426,7 +426,7 @@
History_Track1_fname = ''

! Enables calling a subroutine to add extra information to a plot
! see ``$MESA_DIR/binary/other/pgbinary_decorator.f90``
! see ``$MESA_DIR/binary/public/binary_pgbinary.f90``

! ::

Expand Down Expand Up @@ -512,7 +512,7 @@
History_Track2_fname = ''

! Enables calling a subroutine to add extra information to a plot
! see ``$MESA_DIR/binary/other/pgbinary_decorator.f90``
! see ``$MESA_DIR/binary/public/binary_pgbinary.f90``

! ::

Expand Down Expand Up @@ -598,7 +598,7 @@
History_Track3_fname = ''

! Enables calling a subroutine to add extra information to a plot
! see ``$MESA_DIR/binary/other/pgbinary_decorator.f90``
! see ``$MESA_DIR/binary/public/binary_pgbinary.f90``

! ::

Expand Down Expand Up @@ -684,7 +684,7 @@
History_Track4_fname = ''

! Enables calling a subroutine to add extra information to a plot
! see ``$MESA_DIR/binary/other/pgbinary_decorator.f90``
! see ``$MESA_DIR/binary/public/binary_pgbinary.f90``

! ::

Expand Down Expand Up @@ -770,7 +770,7 @@
History_Track5_fname = ''

! Enables calling a subroutine to add extra information to a plot
! see ``$MESA_DIR/binary/other/pgbinary_decorator.f90``
! see ``$MESA_DIR/binary/public/binary_pgbinary.f90``

! ::

Expand Down Expand Up @@ -856,7 +856,7 @@
History_Track6_fname = ''

! Enables calling a subroutine to add extra information to a plot
! see ``$MESA_DIR/binary/other/pgbinary_decorator.f90``
! see ``$MESA_DIR/binary/public/binary_pgbinary.f90``

! ::

Expand Down Expand Up @@ -942,7 +942,7 @@
History_Track7_fname = ''

! Enables calling a subroutine to add extra information to a plot
! see ``$MESA_DIR/binary/other/pgbinary_decorator.f90``
! see ``$MESA_DIR/binary/public/binary_pgbinary.f90``

! ::

Expand Down Expand Up @@ -1028,7 +1028,7 @@
History_Track8_fname = ''

! Enables calling a subroutine to add extra information to a plot
! see ``$MESA_DIR/binary/other/pgbinary_decorator.f90``
! see ``$MESA_DIR/binary/public/binary_pgbinary.f90``

! ::

Expand Down Expand Up @@ -1114,7 +1114,7 @@
History_Track9_fname = ''

! Enables calling a subroutine to add extra information to a plot
! see ``$MESA_DIR/binary/other/pgbinary_decorator.f90``
! see ``$MESA_DIR/binary/public/binary_pgbinary.f90``

! ::

Expand Down Expand Up @@ -1206,7 +1206,7 @@
History_Panels1_dymin(1) = -1

! Enables calling a subroutine to add extra information to a plot
! see ``$MESA_DIR/binary/other/pgbinary_decorator.f90``
! see ``$MESA_DIR/binary/public/binary_pgbinary.f90``

! ::

Expand Down Expand Up @@ -1285,7 +1285,7 @@
History_Panels2_points_name(:) = ''

! Enables calling a subroutine to add extra information to a plot
! see ``$MESA_DIR/binary/other/pgbinary_decorator.f90``
! see ``$MESA_DIR/binary/public/binary_pgbinary.f90``

! ::

Expand Down Expand Up @@ -1364,7 +1364,7 @@
History_Panels3_points_name(:) = ''

! Enables calling a subroutine to add extra information to a plot
! see ``$MESA_DIR/binary/other/pgbinary_decorator.f90``
! see ``$MESA_DIR/binary/public/binary_pgbinary.f90``

! ::

Expand Down Expand Up @@ -1443,7 +1443,7 @@
History_Panels4_points_name(:) = ''

! Enables calling a subroutine to add extra information to a plot
! see ``$MESA_DIR/binary/other/pgbinary_decorator.f90``
! see ``$MESA_DIR/binary/public/binary_pgbinary.f90``

! ::

Expand Down Expand Up @@ -1530,7 +1530,7 @@
History_Panels5_points_name(:) = ''

! Enables calling a subroutine to add extra information to a plot
! see ``$MESA_DIR/binary/other/pgbinary_decorator.f90``
! see ``$MESA_DIR/binary/public/binary_pgbinary.f90``

! ::

Expand Down Expand Up @@ -1608,7 +1608,7 @@
History_Panels6_points_name(:) = ''

! Enables calling a subroutine to add extra information to a plot
! see ``$MESA_DIR/binary/other/pgbinary_decorator.f90``
! see ``$MESA_DIR/binary/public/binary_pgbinary.f90``

! ::

Expand Down Expand Up @@ -1687,7 +1687,7 @@
History_Panels7_points_name(:) = ''

! Enables calling a subroutine to add extra information to a plot
! see ``$MESA_DIR/binary/other/pgbinary_decorator.f90``
! see ``$MESA_DIR/binary/public/binary_pgbinary.f90``

! ::

Expand Down Expand Up @@ -1766,7 +1766,7 @@
History_Panels8_points_name(:) = ''

! Enables calling a subroutine to add extra information to a plot
! see ``$MESA_DIR/binary/other/pgbinary_decorator.f90``
! see ``$MESA_DIR/binary/public/binary_pgbinary.f90``

! ::

Expand Down Expand Up @@ -1845,7 +1845,7 @@
History_Panels9_points_name(:) = ''

! Enables calling a subroutine to add extra information to a plot
! see ``$MESA_DIR/binary/other/pgbinary_decorator.f90``
! see ``$MESA_DIR/binary/public/binary_pgbinary.f90``

! ::

Expand Down
47 changes: 0 additions & 47 deletions binary/other/pgbinary_decorator.f90
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions kap/public/kap_lib.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ subroutine kap_setup_hooks(handle, ierr)
use kap_def, only : Kap_General_Info, get_kap_ptr
use other_elect_cond_opacity
use other_compton_opacity
use other_radiative_opacity
integer, intent(in) :: handle
integer, intent(out):: ierr

Expand All @@ -147,6 +148,7 @@ subroutine kap_setup_hooks(handle, ierr)

rq% other_elect_cond_opacity => null_other_elect_cond_opacity
rq% other_compton_opacity => null_other_compton_opacity
rq% other_radiative_opacity => null_other_radiative_opacity

end subroutine kap_setup_hooks

Expand Down
2 changes: 0 additions & 2 deletions star/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ SRCS := \

ifeq ($(WITH_PGSTAR),yes)
SRCS += \
other/pgstar_decorator.f90 \
private/pgstar_ctrls_io.f90 \
private/pgstar_colors.f90 \
private/pgstar_support.f90 \
Expand Down Expand Up @@ -236,7 +235,6 @@ MODULES += pgstar_abundance.mod \
pgstar_color_magnitude.mod \
pgstar_colors.mod \
pgstar_ctrls_io.mod \
pgstar_decorator.mod \
pgstar_dpg_dnu.mod \
pgstar_dynamo.mod \
pgstar_grid.mod \
Expand Down
2 changes: 1 addition & 1 deletion star/dev_cases_TDC_Pulsation/dev_TDC_Cepheid_6M/inlist_pgstar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ Mixing_file_aspect_ratio = -1 ! negative means use same value as for window
HR_fname = '' ! file name for extra HR data

! Enables calling a subroutine to add extra information to a plot
! see `$MESA_DIR/star/other/pgstar_decorator.f90`
! see `$MESA_DIR/star_data/public/star_pgstar.f90`
HR_use_decorator = .false.


Expand Down
6 changes: 0 additions & 6 deletions star/dev_cases_TDC_Pulsation/dev_TDC_Cepheid_6M/src/run_star_extras.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,12 +552,6 @@ subroutine my_before_struct_burn_mix(id, dt, res)
res = keep_going
end subroutine my_before_struct_burn_mix

subroutine null_binary_controls(id, binary_id, ierr)
integer, intent(in) :: id, binary_id
integer, intent(out) :: ierr
ierr = 0
end subroutine null_binary_controls

! returns either keep_going or terminate.
integer function extras_finish_step(id)
use run_star_support
Expand Down
6 changes: 0 additions & 6 deletions star/dev_cases_test_TDC/dev_TDC_through_ppisn/src/run_star_extras.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1422,12 +1422,6 @@ subroutine my_before_struct_burn_mix(id, dt, res)
res = keep_going
end subroutine my_before_struct_burn_mix

subroutine null_binary_controls(id, binary_id, ierr)
integer, intent(in) :: id, binary_id
integer, intent(out) :: ierr
ierr = 0
end subroutine null_binary_controls

! returns either keep_going or terminate.
integer function extras_finish_step(id)
use run_star_support
Expand Down
83 changes: 0 additions & 83 deletions star/other/pgstar_decorator.f90
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion star/private/init.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,6 @@ subroutine set_starting_star_data(s, ierr)
use other_photo_read, only: default_other_photo_read
use other_set_pgstar_controls, only: default_other_set_pgstar_controls
use other_kap
use pgstar_decorator
use star_utils, only: init_random

type (star_info), pointer :: s
Expand Down
2 changes: 1 addition & 1 deletion star/test_suite/12M_pre_ms_to_core_collapse/inlist_pgstar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ Mixing_file_aspect_ratio = -1 ! negative means use same value as for window
HR_fname = '' ! file name for extra HR data

! Enables calling a subroutine to add extra information to a plot
! see `$MESA_DIR/star/other/pgstar_decorator.f90`
! see `$MESA_DIR/star_data/public/star_pgstar.f90`
HR_use_decorator = .false.


Expand Down
Loading