File tree Expand file tree Collapse file tree 4 files changed +8
-10
lines changed Expand file tree Collapse file tree 4 files changed +8
-10
lines changed Original file line number Diff line number Diff line change @@ -351,9 +351,6 @@ do_one_parallel rates
351
351
do_one_parallel neu
352
352
do_one_parallel net
353
353
354
- do_one star_data
355
- do_one turb
356
-
357
354
if [ ! -r data/ionization_data ]
358
355
then
359
356
do_input_data ionization
@@ -365,8 +362,11 @@ then
365
362
do_input_data atm
366
363
fi
367
364
do_one atm
365
+ do_one turb
368
366
369
367
do_one sample
368
+
369
+ do_one star_data
370
370
do_one_parallel gyre
371
371
do_one adipls
372
372
do_one_parallel star
Original file line number Diff line number Diff line change @@ -30,7 +30,6 @@ module tdc
30
30
use num_lib
31
31
use utils_lib
32
32
use auto_diff
33
- use star_data_def
34
33
use tdc_support
35
34
36
35
implicit none
Original file line number Diff line number Diff line change @@ -30,7 +30,6 @@ module tdc_support
30
30
use num_lib
31
31
use utils_lib
32
32
use auto_diff
33
- use star_data_def
34
33
35
34
implicit none
36
35
@@ -423,9 +422,9 @@ end function safe_tanh
423
422
type (auto_diff_real_tdc) function convert(K_in) result(K)
424
423
type (auto_diff_real_star_order1), intent (in ) :: K_in
425
424
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
427
426
K% d1val1 = 0d0
428
- K% d1val1_d1Array(1 :auto_diff_star_num_vars ) = 0d0
427
+ K% d1val1_d1Array(1 :SIZE (K_in % d1Array) ) = 0d0
429
428
end function convert
430
429
431
430
! > The TDC newton solver needs higher-order partial derivatives than
@@ -442,7 +441,7 @@ end function convert
442
441
type (auto_diff_real_star_order1) function unconvert(K_in) result(K)
443
442
type (auto_diff_real_tdc), intent (in ) :: K_in
444
443
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) )
446
445
end function unconvert
447
446
448
447
! > Q is the residual in the TDC equation, namely:
Original file line number Diff line number Diff line change @@ -262,7 +262,7 @@ LOAD_MESA_NUMERICS_INT = $(addprefix -l,$(LIBS_MESA_NUMERICS))
262
262
LOAD_MESA_NUMERICS_EXT = $(LOAD_MATRIX_EXT) $(LOAD_HDF5)
263
263
LOAD_MESA_NUMERICS = $(LOAD_MESA_NUMERICS_INT) $(LOAD_MESA_NUMERICS_EXT)
264
264
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)
266
266
LOAD_MESA_MICRO_INT = $(addprefix -l,$(LIBS_MESA_MICRO))
267
267
LOAD_MESA_MICRO_EXT = $(LOAD_MESA_NUMERICS_EXT)
268
268
LOAD_MESA_MICRO = $(LOAD_MESA_MICRO_INT) $(LOAD_MESA_MICRO_EXT)
@@ -272,7 +272,7 @@ LOAD_MESA_MACRO_INT = $(addprefix -l,$(LIBS_MESA_MACRO))
272
272
LOAD_MESA_MACRO_EXT = $(LOAD_MESA_MICRO_EXT)
273
273
LOAD_MESA_MACRO = $(LOAD_MESA_MACRO_INT) $(LOAD_MESA_MACRO_EXT)
274
274
275
- LIBS_MESA_STAR_SUPPORT = $(LIBS_GYRE) $(LIBS_MESA_MACRO)
275
+ LIBS_MESA_STAR_SUPPORT = star_data $(LIBS_GYRE) $(LIBS_MESA_MACRO)
276
276
LOAD_MESA_STAR_SUPPORT_INT = $(addprefix -l,$(LIBS_MESA_STAR_SUPPORT))
277
277
LOAD_MESA_STAR_SUPPORT_EXT = $(LOAD_MESA_MACRO_EXT) $(LD_FLAGS)
278
278
LOAD_MESA_STAR_SUPPORT = $(LOAD_MESA_STAR_SUPPORT_INT) $(LOAD_MESA_STAR_SUPPORT_EXT)
You can’t perform that action at this time.
0 commit comments