Make other routines self contained (#550)

Make other routines self-contained

This should make teaching easier as it is now just one thing that needs copying

Closes #374

Author: rjfarmer

.gitignore

@@ -15,6 +15,7 @@ build.log
 /lib/
 /include/
 *.pyc
+*/other/*.mod
 
 ## Debugging/Profiling
 gmon.out

binary/other/mod_other_accreted_material_j.f90

@@ -24,8 +24,7 @@
 ! ***********************************************************************
 
       module mod_other_accreted_material_j
-          use binary_def, only : binary_info, binary_ptr
-
+          
       ! NOTE: remember to set true:
       ! use_other_accreted_material_j = .true.
 
@@ -114,6 +113,7 @@ module mod_other_accreted_material_j
       contains
 
       subroutine null_other_accreted_material_j(binary_id, ierr)
+         use binary_def, only : binary_info, binary_ptr
          use const_def, only: dp
          integer, intent(in) :: binary_id
          integer, intent(out) :: ierr

binary/other/mod_other_adjust_mdots.f90

@@ -24,7 +24,6 @@
 ! ***********************************************************************
 
       module mod_other_adjust_mdots
-          use binary_def, only : binary_info, binary_ptr
 
       ! NOTE: remember to set true:
       ! use_other_adjust_mdots = .true.
@@ -111,6 +110,7 @@ module mod_other_adjust_mdots
       contains
 
       subroutine null_other_adjust_mdots(binary_id, ierr)
+         use binary_def, only : binary_info, binary_ptr
          use const_def, only: dp
          integer, intent(in) :: binary_id
          integer, intent(out) :: ierr

binary/other/mod_other_binary_ce.f90

@@ -24,8 +24,6 @@
 ! ***********************************************************************
 
       module mod_other_binary_ce
-          use star_def
-          use binary_def, only : binary_info, binary_ptr
 
       ! NOTE: remember to set true:
       ! use_other_CE_rlo_mdot = .true.
@@ -115,6 +113,8 @@ module mod_other_binary_ce
 
       subroutine null_other_CE_init(binary_id, restart, ierr)
          use const_def, only: dp
+         use star_def
+         use binary_def, only : binary_info, binary_ptr
          integer, intent(in) :: binary_id
          logical, intent(in) :: restart
          integer, intent(out) :: ierr
@@ -130,6 +130,8 @@ end subroutine null_other_CE_init
 
       subroutine null_other_CE_rlo_mdot(binary_id, mdot, ierr)
          use const_def, only: dp
+         use star_def
+         use binary_def, only : binary_info, binary_ptr
          integer, intent(in) :: binary_id
          real(dp), intent(out) :: mdot
          integer, intent(out) :: ierr
@@ -146,6 +148,8 @@ end subroutine null_other_CE_rlo_mdot
 
       integer function null_other_CE_binary_evolve_step(binary_id)
          use const_def, only: dp
+         use star_def
+         use binary_def, only : binary_info, binary_ptr
          integer, intent(in) :: binary_id
          integer :: ierr
          type (binary_info), pointer :: b
@@ -160,6 +164,8 @@ integer function null_other_CE_binary_evolve_step(binary_id)
       end function null_other_CE_binary_evolve_step
 
       integer function null_other_CE_binary_finish_step(binary_id)
+         use star_def
+         use binary_def, only : binary_info, binary_ptr
          integer, intent(in) :: binary_id
          integer :: ierr
          type (binary_info), pointer :: b

binary/other/mod_other_binary_edot.f90

@@ -24,7 +24,6 @@
 ! ***********************************************************************
 
       module mod_other_binary_edot
-          use binary_def, only : binary_info, binary_ptr
 
       ! NOTE: remember to set one of:
       ! use_other_edot_tidal = .true.
@@ -116,6 +115,7 @@ module mod_other_binary_edot
 
       subroutine null_other_edot_tidal(binary_id, ierr)
          use const_def, only: dp
+         use binary_def, only : binary_info, binary_ptr
          integer, intent(in) :: binary_id
          integer, intent(out) :: ierr
          type (binary_info), pointer :: b
@@ -129,6 +129,7 @@ subroutine null_other_edot_tidal(binary_id, ierr)
       end subroutine null_other_edot_tidal
 
       subroutine null_other_edot_enhance(binary_id, ierr)
+         use binary_def, only : binary_info, binary_ptr
          integer, intent(in) :: binary_id
          integer, intent(out) :: ierr
          type (binary_info), pointer :: b
@@ -142,6 +143,7 @@ subroutine null_other_edot_enhance(binary_id, ierr)
       end subroutine null_other_edot_enhance
 
       subroutine null_other_extra_edot(binary_id, ierr)
+         use binary_def, only : binary_info, binary_ptr
          integer, intent(in) :: binary_id
          integer, intent(out) :: ierr
          type (binary_info), pointer :: b

binary/other/mod_other_binary_extras.f90

@@ -24,8 +24,6 @@
 ! ***********************************************************************
 
    module mod_other_binary_extras
-      use binary_def
-      use const_def
 
 
       implicit none
@@ -36,6 +34,8 @@ module mod_other_binary_extras
       contains
 
       integer function null_extras_binary_startup(binary_id,restart,ierr)
+         use binary_def
+         use const_def
          type (binary_info), pointer :: b
          integer, intent(in) :: binary_id
          integer, intent(out) :: ierr
@@ -50,6 +50,8 @@ integer function null_extras_binary_startup(binary_id,restart,ierr)
       end function  null_extras_binary_startup
 
       integer function null_extras_binary_start_step(binary_id,ierr)
+         use binary_def
+         use const_def
          type (binary_info), pointer :: b
          integer, intent(in) :: binary_id
          integer, intent(out) :: ierr
@@ -64,6 +66,8 @@ end function  null_extras_binary_start_step
 
       !Return either keep_going, retry or terminate
       integer function null_extras_binary_check_model(binary_id)
+         use binary_def
+         use const_def
          type (binary_info), pointer :: b
          integer, intent(in) :: binary_id
          integer :: ierr
@@ -79,6 +83,8 @@ end function null_extras_binary_check_model
       ! returns either keep_going or terminate.
       ! note: cannot request retry; extras_binary_check_model can do that.
       integer function null_extras_binary_finish_step(binary_id)
+         use binary_def
+         use const_def
          type (binary_info), pointer :: b
          integer, intent(in) :: binary_id
          integer :: ierr
@@ -93,6 +99,8 @@ end function null_extras_binary_finish_step
 
 
       subroutine null_extras_binary_after_evolve(binary_id, ierr)
+         use binary_def
+         use const_def
          type (binary_info), pointer :: b
          integer, intent(in) :: binary_id
          integer, intent(out) :: ierr
@@ -104,6 +112,8 @@ subroutine null_extras_binary_after_evolve(binary_id, ierr)
       end subroutine null_extras_binary_after_evolve
 
       integer function null_how_many_extra_binary_history_columns(binary_id)
+         use binary_def
+         use const_def
          integer, intent(in) :: binary_id
          type (binary_info), pointer :: b
          integer :: ierr
@@ -118,6 +128,8 @@ integer function null_how_many_extra_binary_history_columns(binary_id)
       end function null_how_many_extra_binary_history_columns
 
       subroutine null_data_for_extra_binary_history_columns(binary_id, n, names, vals, ierr)
+         use binary_def
+         use const_def
          integer, intent(in) :: binary_id
          integer, intent(in) :: n
          character (len=maxlen_binary_history_column_name) :: names(n)
@@ -135,13 +147,17 @@ end subroutine null_data_for_extra_binary_history_columns
 
 
       integer function null_how_many_extra_binary_history_header_items(binary_id)
+         use binary_def
+         use const_def
          use binary_def, only: binary_info
          integer, intent(in) :: binary_id
          null_how_many_extra_binary_history_header_items = 0
       end function null_how_many_extra_binary_history_header_items
 
       subroutine null_data_for_extra_binary_history_header_items( &
            binary_id, n, names, vals, ierr)
+         use binary_def
+         use const_def
          type (binary_info), pointer :: b
          integer, intent(in) :: binary_id, n
          character (len=maxlen_binary_history_column_name) :: names(n)

binary/other/mod_other_binary_jdot.f90

@@ -24,7 +24,6 @@
 ! ***********************************************************************
 
       module mod_other_binary_jdot
-          use binary_def, only : binary_info, binary_ptr
 
       ! NOTE: remember to set one of:
       ! use_other_jdot_mb = .true.
@@ -107,6 +106,7 @@ module mod_other_binary_jdot
       contains
 
       subroutine null_other_jdot_mb(binary_id, ierr)
+         use binary_def, only : binary_info, binary_ptr
          integer, intent(in) :: binary_id
          integer, intent(out) :: ierr
          type (binary_info), pointer :: b
@@ -120,6 +120,7 @@ subroutine null_other_jdot_mb(binary_id, ierr)
       end subroutine null_other_jdot_mb
 
       subroutine null_other_jdot_gr(binary_id, ierr)
+         use binary_def, only : binary_info, binary_ptr
          integer, intent(in) :: binary_id
          integer, intent(out) :: ierr
          type (binary_info), pointer :: b
@@ -133,6 +134,7 @@ subroutine null_other_jdot_gr(binary_id, ierr)
       end subroutine null_other_jdot_gr
 
       subroutine null_other_jdot_ml(binary_id, ierr)
+         use binary_def, only : binary_info, binary_ptr
          integer, intent(in) :: binary_id
          integer, intent(out) :: ierr
          type (binary_info), pointer :: b
@@ -146,6 +148,7 @@ subroutine null_other_jdot_ml(binary_id, ierr)
       end subroutine null_other_jdot_ml
 
       subroutine null_other_extra_jdot(binary_id, ierr)
+         use binary_def, only : binary_info, binary_ptr
          integer, intent(in) :: binary_id
          integer, intent(out) :: ierr
          type (binary_info), pointer :: b
@@ -159,6 +162,7 @@ subroutine null_other_extra_jdot(binary_id, ierr)
       end subroutine null_other_extra_jdot
 
       subroutine null_other_jdot_ls(binary_id, ierr)
+         use binary_def, only : binary_info, binary_ptr
          integer, intent(in) :: binary_id
          integer, intent(out) :: ierr
          type (binary_info), pointer :: b
@@ -172,6 +176,7 @@ subroutine null_other_jdot_ls(binary_id, ierr)
       end subroutine null_other_jdot_ls
 
       subroutine null_other_jdot_missing_wind(binary_id, ierr)
+         use binary_def, only : binary_info, binary_ptr
          integer, intent(in) :: binary_id
          integer, intent(out) :: ierr
          type (binary_info), pointer :: b

binary/other/mod_other_binary_photo_read.f90

@@ -25,8 +25,6 @@
 
       module mod_other_binary_photo_read
 
-      use binary_def
-
       implicit none
 
       ! note: there is no flag "use_other_binary_photo_read".
@@ -37,6 +35,7 @@ module mod_other_binary_photo_read
 
 
       subroutine default_other_binary_photo_read(binary_id, iounit, ierr)
+         use binary_def
          integer, intent(in) :: binary_id, iounit
          integer, intent(out) :: ierr
          ierr = 0

binary/other/mod_other_binary_photo_write.f90

@@ -25,7 +25,6 @@
 
       module mod_other_binary_photo_write
 
-      use binary_def
 
       implicit none
 
@@ -37,6 +36,7 @@ module mod_other_binary_photo_write
 
 
       subroutine default_other_binary_photo_write(binary_id, iounit)
+         use binary_def
          integer, intent(in) :: binary_id, iounit
          !write(iounit) stuff
       end subroutine default_other_binary_photo_write

binary/other/mod_other_binary_wind_transfer.f90

@@ -24,7 +24,6 @@
 ! ***********************************************************************
 
       module mod_other_binary_wind_transfer
-          use binary_def, only : binary_info, binary_ptr
 
       ! NOTE: remember to set true:
       ! use_other_binary_wind_transfer = .true.
@@ -147,6 +146,7 @@ module mod_other_binary_wind_transfer
       contains
 
       subroutine null_other_binary_wind_transfer(binary_id, s_i, ierr)
+         use binary_def, only : binary_info, binary_ptr
          integer, intent(in) :: binary_id, s_i
          integer, intent(out) :: ierr
          type (binary_info), pointer :: b