Skip to content

Commit 427c21b

Browse files
authored
Changes to lift the dependence of turb on star_data (#739)
1 parent 05a0e06 commit 427c21b

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

install

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,6 @@ do_one_parallel rates
351351
do_one_parallel neu
352352
do_one_parallel net
353353

354-
do_one star_data
355-
do_one turb
356-
357354
if [ ! -r data/ionization_data ]
358355
then
359356
do_input_data ionization
@@ -365,8 +362,11 @@ then
365362
do_input_data atm
366363
fi
367364
do_one atm
365+
do_one turb
368366

369367
do_one sample
368+
369+
do_one star_data
370370
do_one_parallel gyre
371371
do_one adipls
372372
do_one_parallel star

turb/private/tdc.f90

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ module tdc
3030
use num_lib
3131
use utils_lib
3232
use auto_diff
33-
use star_data_def
3433
use tdc_support
3534

3635
implicit none

turb/private/tdc_support.f90

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ module tdc_support
3030
use num_lib
3131
use utils_lib
3232
use auto_diff
33-
use star_data_def
3433

3534
implicit none
3635

@@ -423,9 +422,9 @@ end function safe_tanh
423422
type(auto_diff_real_tdc) function convert(K_in) result(K)
424423
type(auto_diff_real_star_order1), intent(in) :: K_in
425424
K%val = K_in%val
426-
K%d1Array(1:auto_diff_star_num_vars) = K_in%d1Array(1:auto_diff_star_num_vars)
425+
K%d1Array(1:SIZE(K_in%d1Array)) = K_in%d1Array
427426
K%d1val1 = 0d0
428-
K%d1val1_d1Array(1:auto_diff_star_num_vars) = 0d0
427+
K%d1val1_d1Array(1:SIZE(K_in%d1Array)) = 0d0
429428
end function convert
430429

431430
!> The TDC newton solver needs higher-order partial derivatives than
@@ -442,7 +441,7 @@ end function convert
442441
type(auto_diff_real_star_order1) function unconvert(K_in) result(K)
443442
type(auto_diff_real_tdc), intent(in) :: K_in
444443
K%val = K_in%val
445-
K%d1Array(1:auto_diff_star_num_vars) = K_in%d1Array(1:auto_diff_star_num_vars)
444+
K%d1Array = K_in%d1Array(1:SIZE(K%d1Array))
446445
end function unconvert
447446

448447
!> Q is the residual in the TDC equation, namely:

utils/makefile_header

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ LOAD_MESA_NUMERICS_INT = $(addprefix -l,$(LIBS_MESA_NUMERICS))
262262
LOAD_MESA_NUMERICS_EXT = $(LOAD_MATRIX_EXT) $(LOAD_HDF5)
263263
LOAD_MESA_NUMERICS = $(LOAD_MESA_NUMERICS_INT) $(LOAD_MESA_NUMERICS_EXT)
264264

265-
LIBS_MESA_MICRO = star_data net eos kap rates neu chem $(LIBS_MESA_NUMERICS)
265+
LIBS_MESA_MICRO = net eos kap rates neu chem $(LIBS_MESA_NUMERICS)
266266
LOAD_MESA_MICRO_INT = $(addprefix -l,$(LIBS_MESA_MICRO))
267267
LOAD_MESA_MICRO_EXT = $(LOAD_MESA_NUMERICS_EXT)
268268
LOAD_MESA_MICRO = $(LOAD_MESA_MICRO_INT) $(LOAD_MESA_MICRO_EXT)
@@ -272,7 +272,7 @@ LOAD_MESA_MACRO_INT = $(addprefix -l,$(LIBS_MESA_MACRO))
272272
LOAD_MESA_MACRO_EXT = $(LOAD_MESA_MICRO_EXT)
273273
LOAD_MESA_MACRO = $(LOAD_MESA_MACRO_INT) $(LOAD_MESA_MACRO_EXT)
274274

275-
LIBS_MESA_STAR_SUPPORT = $(LIBS_GYRE) $(LIBS_MESA_MACRO)
275+
LIBS_MESA_STAR_SUPPORT = star_data $(LIBS_GYRE) $(LIBS_MESA_MACRO)
276276
LOAD_MESA_STAR_SUPPORT_INT = $(addprefix -l,$(LIBS_MESA_STAR_SUPPORT))
277277
LOAD_MESA_STAR_SUPPORT_EXT = $(LOAD_MESA_MACRO_EXT) $(LD_FLAGS)
278278
LOAD_MESA_STAR_SUPPORT = $(LOAD_MESA_STAR_SUPPORT_INT) $(LOAD_MESA_STAR_SUPPORT_EXT)

0 commit comments

Comments
 (0)